1882 files changed, 47537 insertions, 18711 deletions

diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 266833a97..2174f27bc 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,7 +9,11 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.5 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
 
 
 ##### include our cmake modules #################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36124f6fe..fd4f5102b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,12 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.5 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
 
 ##### general package setup #####################
@@ -23,6 +28,7 @@ set( PACKAGE tdebase )
 ##### include essential cmake modules ###########
 
 include( FindPkgConfig )
+include( FindThreads )
 include( CheckIncludeFile )
 include( CheckIncludeFiles )
 include( CheckCSourceRuns )
@@ -40,11 +46,6 @@ include( CheckTypeSize )
 include( TDEMacros )
 
 
-##### set version number ########################
-
-tde_set_project_version( )
-
-
 ##### setup install paths #######################
 
 include( TDESetupPaths )
@@ -53,14 +54,8 @@ tde_setup_paths( )
 
 ##### add apidox targets ############
 
-if( "${CMAKE_VERSION}" VERSION_LESS "3.1" )
-  set( CMAKE_ENV "env" )
-else()
-  set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" )
-endif()
-
 add_custom_target( apidox
-  COMMAND ${CMAKE_ENV}
+  COMMAND ${CMAKE_COMMAND} -E env
     "TQTDOCDIR=/usr/share/tqt3/doc/html"
     "DOXDATA=${HTML_INSTALL_DIR}/en/common"
     ${CMAKE_SOURCE_DIR}/admin/doxygen.sh
@@ -97,6 +92,7 @@ option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
 option( WITH_SASL "Enable SASL support" ${WITH_ALL_OPTIONS} )
 option( WITH_LDAP "Enable LDAP support" ${WITH_ALL_OPTIONS} )
 option( WITH_SAMBA "Enable SAMBA support" ${WITH_ALL_OPTIONS} )
+option( WITH_SFTP "Enable SFTP support" ${WITH_ALL_OPTIONS} )
 option( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} )
 option( WITH_XCOMPOSITE "Enable xcomposite support" ${WITH_ALL_OPTIONS} )
 option( WITH_XCURSOR "Enable xcursor support" ${WITH_ALL_OPTIONS} )
@@ -104,7 +100,7 @@ option( WITH_XFIXES "Enable xfixes support" ${WITH_ALL_OPTIONS} )
 option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} )
 option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )
 option( WITH_LIBCONFIG "Enable libconfig support" ${WITH_ALL_OPTIONS} )
-option( WITH_PCRE "Enable pcre regex support" ON )
+option( WITH_PCRE2 "Enable pcre2 regex support" ON )
 option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
 option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
 option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
@@ -124,12 +120,14 @@ option( WITH_TDEHWLIB "Enable TDE hardware library support" ${WITH_ALL_OPTIONS}
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 option( WITH_ELFICON "Enable ELF embedded metadata support" ${WITH_ALL_OPTIONS} )
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+option( WITH_XKB_TRANSLATIONS "Use translations for xkb messages provided by xkeyboard-config" ON )
 
 ##### options comments ##########################
 
 # WITH_SASL         affects tdeioslaves(tdeio_ldap tdeio_smtp tdeio_pop3)
 # WITH_LDAP         affects tdeioslaves(tdeio_ldap)
 # WITH_SAMBA        affects tdeioslaves(tdeio_samba) kcontrol
+# WITH_SFTP         affects tdeioslaves(tdeio_sftp)
 # WITH_OPENEXR      affects tdeioslaves(thumbnail)
 # WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
 # WITH_XCURSOR      affects tdeioslaves(thumbnail), kcontrol(input), kdesktop
@@ -155,10 +153,11 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # WITH_PAM          affects tdm kdesktop kcheckpass
 # WITH_SHADOW       affects tdm kcheckpass
 # WITH_UPOWER       affects ksmserver
-# WITH_LIBCONFIG    affects twin/compot-tde
-# WITH_PCRE         affects twin/compot-tde
+# WITH_LIBCONFIG    affects twin/compton-tde
+# WITH_PCRE2        affects twin/compton-tde
 # WITH_SUDO_TDESU_BACKEND affects tdesu
 # WITH_SUDO_KONSOLE_SUPER_USER_COMMAND affects launching Konsole super user sessions
+# WITH_XKB_TRANSLATIONS affects kxkb
 
 # NOTE: WITH_SHADOW and WITH_PAM shouldn't be set concurrently
 #       WITH_PAM will override WITH_SHADOW
@@ -255,7 +254,7 @@ tde_conditional_add_subdirectory( BUILD_TDEINIT tdeinit )
 tde_conditional_add_subdirectory( BUILD_L10N l10n )
 tde_conditional_add_subdirectory( BUILD_PICS pics )
 tde_conditional_add_subdirectory( BUILD_APPLNK applnk )
-tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq )
 tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
 tde_conditional_add_subdirectory( BUILD_TWIN twin )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 2a470eeb8..640849814 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -50,19 +50,6 @@ if( WITH_USBIDS )
 endif( WITH_USBIDS )
 
 
-##### check for libdl ###########################
-
-set( DL_LIBRARIES dl )
-check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
-if( NOT HAVE_LIBDL )
-  unset( DL_LIBRARIES )
-  check_function_exists( dlopen HAVE_DLOPEN )
-  if( HAVE_DLOPEN )
-    set( HAVE_LIBDL 1 )
-  endif( HAVE_DLOPEN )
-endif( NOT HAVE_LIBDL )
-
-
 # stdint.h (drkonqi)
 if( BUILD_DRKONQI )
   check_include_file( stdint.h HAVE_STDINT_H )
@@ -75,12 +62,6 @@ if( BUILD_TDM OR BUILD_TDEIOSLAVES )
 endif( )
 
 
-# sys/bitypes.h (drkonqi)
-if( BUILD_DRKONQI )
-  check_include_file( sys/bitypes.h HAVE_SYS_BITYPES_H )
-endif( )
-
-
 # sys/ioctl.h (tdeioslave/fish, kcontrol/info)
 if( BUILD_TDEIOSLAVES OR BUILD_KCONTROL )
   check_include_file( sys/ioctl.h HAVE_SYS_IOCTL_H )
@@ -100,7 +81,7 @@ if( BUILD_KSMSERVER OR BUILD_KSPLASHML OR BUILD_TDEIOSLAVES )
 endif( )
 
 # libssh (tdeioslave/sftp)
-if( BUILD_TDEIOSLAVES )
+if( BUILD_TDEIOSLAVES AND WITH_SFTP )
   pkg_search_module( LIBSSH libssh )
   if( NOT LIBSSH_FOUND )
     tde_message_fatal( "LibSSH is required, but was not found on your system" )
@@ -117,7 +98,7 @@ if( BUILD_KCHECKPASS OR BUILD_TDM )
       check_include_file( "security/pam_appl.h" SECURITY_PAM_APPL_H )
     endif( )
     if( HAVE_PAM AND SECURITY_PAM_APPL_H )
-      set( PAM_LIBRARY pam ${DL_LIBRARIES} )
+      set( PAM_LIBRARY pam ${CMAKE_DL_LIBS} )
     else( )
       tde_message_fatal( "pam are requested, but not found on your system" )
     endif( )
@@ -144,7 +125,7 @@ endif( NOT HAVE_CRYPT )
 if( WITH_TDEHWLIB )
   tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${TDE_INCLUDE_DIR}" )
   check_cxx_source_compiles( "
-    #include <kdemacros.h>
+    #include <tdemacros.h>
       #ifndef __TDE_HAVE_TDEHWLIB
       #error tdecore is not build with tdehwlib
       #endif
@@ -159,11 +140,11 @@ if( WITH_TDEHWLIB )
 endif( )
 
 
-# udev (tsak)
-if( BUILD_TSAK )
-  pkg_search_module( UDEV udev )
+# udev (tsak, tdekbdledsync)
+if( BUILD_TSAK OR BUILD_TDEKBDLEDSYNC )
+  pkg_search_module( UDEV libudev )
   if( NOT UDEV_FOUND )
-    tde_message_fatal( "udev is required, but was not found on your system" )
+    tde_message_fatal( "udev library is required, but was not found on your system" )
   endif( )
 endif( )
 
@@ -275,12 +256,12 @@ if( WITH_LIBCONFIG )
 endif( )
 
 
-# pcre (twin/compton-tde)
-if( WITH_PCRE )
-  pkg_search_module( LIBPCRE libpcre )
-  if( NOT LIBPCRE_FOUND )
-    tde_message_fatal( "pcre support is requested, but not found on your system" )
-  endif( NOT LIBPCRE_FOUND )
+# pcre2 (twin/compton-tde)
+if( WITH_PCRE2 )
+  pkg_check_modules( LIBPCRE2 libpcre2-8 libpcre2-posix )
+  if( NOT LIBPCRE2_FOUND )
+    tde_message_fatal( "pcre2 support was requested, but not found on your system" )
+  endif( )
 endif( )
 
 
@@ -507,30 +488,16 @@ endif( )
 if( BUILD_KXKB )
 
   if( NOT X11_XKB_RULES_DIR )
-    pkg_search_module( XKB_CONFIG xkeyboard-config )
-    if( XKB_CONFIG_FOUND )
-      execute_process(
-        COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=xkb_base xkeyboard-config
-        OUTPUT_VARIABLE KB_RULES_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      if( NOT "${KB_RULES_DIR}" STREQUAL "" )
-        string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
-      endif( )
+    pkg_get_variable( KB_RULES_DIR xkeyboard-config xkb_base )
+    if( KB_RULES_DIR )
+      string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
     endif( )
   endif( )
 
   if( NOT X11_XKB_RULES_DIR )
-    pkg_search_module( XKBCOMP xkbcomp )
-    if( XKBCOMP_FOUND )
-      execute_process(
-        COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=xkbconfigdir xkbcomp
-        OUTPUT_VARIABLE KB_RULES_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      if( NOT "${KB_RULES_DIR}" STREQUAL "" )
-        string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
-      endif( )
+    pkg_get_variable( KB_RULES_DIR xkbcomp xkbconfigdir )
+    if( KB_RULES_DIR )
+      string(REGEX REPLACE "/xkb$" "/" X11_XKB_RULES_DIR "${KB_RULES_DIR}" )
     endif( )
   endif( )
 
@@ -552,16 +519,8 @@ if( BUILD_KXKB )
   endif( )
 
   if( NOT X11_XKB_RULES_DIR )
-    execute_process(
-      COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=libdir xkbfile
-      OUTPUT_VARIABLE KB_RULES_LIBDIR
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    execute_process(
-      COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xkbfile
-      OUTPUT_VARIABLE KB_RULES_PREFIX
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
+    pkg_get_variable( KB_RULES_LIBDIR xkbfile libdir)
+    pkg_get_variable( KB_RULES_PREFIX xkbfile prefix)
     if( KB_RULES_LIBDIR AND KB_RULES_PREFIX )
       find_file( RULES_FILE
         NAMES xorg xfree86
@@ -585,6 +544,20 @@ if( BUILD_KXKB )
     message( STATUS "No additional XKb rules directory found" )
   endif( )
 
+  if( WITH_XKB_TRANSLATIONS )
+    if( NOT XKB_CONFIG_LOCALE_DIR )
+      pkg_get_variable( XKB_CONFIG_DATADIR xkeyboard-config datadir )
+      if( XKB_CONFIG_DATADIR )
+        set( XKB_CONFIG_LOCALE_DIR "${XKB_CONFIG_DATADIR}/locale" CACHE INTERNAL "" )
+        message( STATUS "Found xkeybord-config locale dir: ${XKB_CONFIG_LOCALE_DIR}" )
+      endif( )
+    endif( )
+
+    if( NOT XKB_CONFIG_LOCALE_DIR )
+      tde_message_fatal( "Translations for xkb messages were requested but the xkeyboard-config locale directory could not be determined." )
+    endif( )
+  endif( )
+
 endif( )
 
 if( BUILD_KCONTROL OR BUILD_TDM )
@@ -686,4 +659,13 @@ if( BUILD_KCONTROL OR BUILD_TDM )
 
 endif( BUILD_KCONTROL OR BUILD_TDM )
 
+# XInput (kcontrol/input/touchpad.cpp)
+if( BUILD_KCONTROL )
+  pkg_search_module( XINPUT xi )
+  if( NOT XINPUT_FOUND )
+    tde_message_fatal( "XInput is required, but was not found on your system" )
+  endif( )
+endif ( BUILD_KCONTROL )
+
+
 check_include_files( "sys/time.h;sys/loadavg.h" HAVE_SYS_LOADAVG_H )
diff --git a/admin b/admin
-Subproject 3bdc9fd55ff86f033cc1ffab9178d8453fa1ab2
+Subproject 4185112a621d8c5bc88984b117f434c9560e2cc
diff --git a/config.h.cmake b/config.h.cmake
index 3324456f3..1f5aaac61 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,7 +1,7 @@
 #define VERSION "@VERSION@"
 
 // Defined if you have fvisibility and fvisibility-inlines-hidden support.
-#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -61,7 +61,6 @@
 
 // drkonqi
 #cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_SYS_BITYPES_H
 
 // drkonqi, tdeioslave
 #cmakedefine HAVE_SYS_TYPES_H 1
@@ -245,7 +244,9 @@ unsigned long strlcpy(char*, const char*, unsigned long);
 #cmakedefine XLIBDIR "@XLIBDIR@"
 
 // kxkb
+#cmakedefine WITH_XKB_TRANSLATIONS 1
 #cmakedefine X11_XKB_RULES_DIR "@X11_XKB_RULES_DIR@"
+#cmakedefine XKB_CONFIG_LOCALE_DIR "@XKB_CONFIG_LOCALE_DIR@"
 
 // tdm, kcontrol
 #cmakedefine WITH_XRANDR "@WITH_XRANDR@"
diff --git a/configure.in.in b/configure.in.in
index d2829c886..305760d09 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -218,14 +218,8 @@ dnl itself) is taking more that nine minutes (!).  For tdebase only we take
 dnl out that test.  (matz@kde.org)
 m4_define([_AC_CONFIG_UNIQUE], [])dnl
 
-AH_VERBATIM(_osf_stuff, [
-#if !defined(HAVE_SETEUID)
-#define seteuid(_eu) setresuid(-1, _eu, -1)
-#endif
-])
-
 AH_VERBATIM(_broken_xkb, [
-#if defined(__osf__) || defined(__APPLE__)
+#if defined(__APPLE__)
 #define AVOID_XKB                 /* for konsole to avoid XKB and XTEST */
 #endif
 ])
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a8b8de4bc..7b6f76d80 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,12 +1,30 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
+add_subdirectory( man )
 
-tde_auto_add_subdirectories()
+tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
+tde_conditional_add_subdirectory( BUILD_KATE kate )
+tde_conditional_add_subdirectory( BUILD_KCONTROL kcontrol )
+tde_conditional_add_subdirectory( BUILD_KDCOP kdcop )
+tde_conditional_add_subdirectory( BUILD_KONQUEROR keditbookmarks )
+tde_conditional_add_subdirectory( BUILD_KFIND kfind )
+tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
+tde_conditional_add_subdirectory( BUILD_KICKER kicker )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT kjobviewer )
+tde_conditional_add_subdirectory( BUILD_KLIPPER klipper )
+tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit )
+tde_conditional_add_subdirectory( BUILD_KNETATTACH knetattach )
+tde_conditional_add_subdirectory( BUILD_TWIN kompmgr )
+tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
+tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
+tde_conditional_add_subdirectory( BUILD_KPAGER kpager )
+tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml )
+tde_conditional_add_subdirectory( BUILD_KSYSGUARD ksysguard )
+tde_conditional_add_subdirectory( BUILD_KATE kwrite )
+tde_conditional_add_subdirectory( BUILD_KXKB kxkb )
+tde_conditional_add_subdirectory( BUILD_TDEDEBUGDIALOG tdedebugdialog )
+tde_conditional_add_subdirectory( BUILD_KCONTROL tdefontview )
+tde_conditional_add_subdirectory( BUILD_TDEIOSLAVES tdeioslave )
+tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprintfax )
+tde_conditional_add_subdirectory( BUILD_TDESU tdesu )
+tde_conditional_add_subdirectory( BUILD_TDM tdm )
diff --git a/doc/kcontrol/touchpad/CMakeLists.txt b/doc/kcontrol/touchpad/CMakeLists.txt
new file mode 100644
index 000000000..ae8d18599
--- /dev/null
+++ b/doc/kcontrol/touchpad/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION kcontrol/touchpad )
diff --git a/doc/kcontrol/touchpad/index.docbook b/doc/kcontrol/touchpad/index.docbook
new file mode 100644
index 000000000..800090af3
--- /dev/null
+++ b/doc/kcontrol/touchpad/index.docbook
@@ -0,0 +1,402 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<article lang="&language;">
+<title>Touchpad</title>
+
+<articleinfo>
+
+<authorgroup>
+<author>
+<firstname>Philippe</firstname><surname>Mavridis</surname>
+</author>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<copyright>
+<year>2024</year>
+<holder>Philippe Mavridis</holder>
+</copyright>
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>KControl</keyword>
+<keyword>System Settings</keyword>
+<keyword>devices</keyword>
+<keyword>input</keyword>
+<keyword>touchpad</keyword>
+<keyword>clickpad</keyword>
+<keyword>tapping</keyword>
+<keyword>tap-to-click</keyword>
+</keywordset>
+</articleinfo>
+
+<abstract>
+<para>This is the documentation for the &tde; &kcontrol; module which configures the touchpad, if one is detected.</para>
+</abstract>
+
+<sect1 id="touchpad">
+<title>Touchpad</title>
+<para>The module automatically detects the touchpad and provides options for configuring its behaviour. The provided options are grouped into five categories:</para>
+
+<itemizedlist>
+<listitem>
+<para><link linkend="touchpad-behaviour">Behaviour</link></para>
+</listitem>
+<listitem>
+<para><link linkend="touchpad-speed">Speed</link></para>
+</listitem>
+<listitem>
+<para><link linkend="touchpad-tapping">Tapping</link></para>
+</listitem>
+<listitem>
+<para><link linkend="touchpad-scroll-options">Scrolling options</link></para>
+</listitem>
+<listitem>
+<para><link linkend="touchpad-scroll-methods">Scrolling method</link></para>
+</listitem>
+</itemizedlist>
+
+<para>The available options depend on which driver is currently in use. This module supports the modern Libinput driver, as well as the older Synaptics driver. While the Synaptics driver is considered unmaintained, one may choose it over the newer Libinput driver if some feature they need is not supported by the Libinput driver and vice versa. For an overview of features supported by each driver see <link linkend="touchpad-drivers">Driver compatibility</link>.</para>
+
+<sect2 id="touchpad-behaviour">
+<title>Behaviour</title>
+
+<variablelist>
+
+<varlistentry>
+<term><guilabel>Disable touchpad while typing</guilabel></term>
+<listitem><para>
+If this option is checked, the touchpad is disabled while you are typing, so as
+to prevent accidental cursor movement and clicks. The touchpad is enabled again
+after a short while.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Middle button emulation</guilabel></term>
+<listitem><para>
+If this option is enabled, a simultaneous left and right button click is automatically
+transformed into a middle button click. Some devices provide middle mouse button
+emulation but do not allow enabling/disabling that emulation.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</sect2>
+
+<sect2 id="touchpad-speed">
+<title>Speed</title>
+
+<variablelist>
+
+<varlistentry>
+<term><guilabel>Acceleration</guilabel></term>
+<listitem><para>
+With this option you can change the speed that the pointer moves on the screen.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Use adaptive profile</guilabel></term>
+<listitem><para>
+If this option is enabled, the adaptive acceleration profile is used, otherwise
+the flat profile is used.
+</para>
+<para>
+The <guilabel>adaptive</guilabel> profile is the default profile used by the Libinput driver. It takes the current speed of the device into account when deciding on acceleration.
+</para><para>
+The <guilabel>flat</guilabel> profile applies a constant factor to every pointer movement, regardless of the speed of motion, providing 1:1 movement between the
+pointer and the device. Techincally, each delta (dx, dy) results in an accelerated
+delta (dx * factor, dy * factor).
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</sect2>
+
+<sect2 id="touchpad-tapping">
+<title>Tapping</title>
+
+<variablelist>
+
+<varlistentry>
+<term><guilabel>Tap-to-click</guilabel></term>
+<listitem><para>
+This option enables or disables the "tap-to-click" feature (also known as "tapping").
+With this option enabled, a tap on the touchpad is interpreted as a click.
+</para>
+<para>Several other features are also related to tapping, including tap-and-drag and
+multiple finger taps. These features can be configured via the rest of the options
+of this section. This option must be enabled for the rest to work.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Tap-and-drag</guilabel></term>
+<listitem><para>
+This option enables or disables the "tap-and-drag" feature. Tap-and-drag is a short
+tap which is immediately followed by a longer tap, with the finger being then held
+down. This simulates a button press and moving the finger around can thus cause the
+the object under the mouse pointer to be dragged around. When the finger is lifted,
+the dragging is completed.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Tap-and-drag lock</guilabel></term>
+<listitem><para>
+This option modifies the behaviour of the tap-and-drag feature so that lifting
+a finger while dragging will not immediately stop dragging. Therefore, if you place
+the finger down on the touchpad again before a short while has passed, the dragging
+will resume from the place it was left.
+</para>
+<para>
+This option is disabled when the tap-and-drag feature is not enabled.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Two-finger tap</guilabel></term>
+<listitem><para>
+With this option you can choose whether the two-finger tap will invoke a middle click
+or a right click action. The three-finger tap is automatically assigned the other
+action.</para>
+<para>
+The default for this option is the right click. This means that a two-finger tap will
+emulate a right button click, whereas a three-finger tap will emulate a middle button
+click.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</sect2>
+
+<sect2 id="touchpad-scroll-options">
+<title>Scrolling options</title>
+
+<variablelist>
+
+<varlistentry>
+<term><guilabel>Vertical scrolling</guilabel></term>
+<listitem><para>
+This option enables/disables the vertical scrolling gesture on the touchpad.
+</para>
+<para>
+The gesture used for scrolling depends on the selected scrolling method, see
+<link linkend="touchpad-scroll-methods">Scrolling method</link>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Horizontal scrolling</guilabel></term>
+<listitem><para>
+This option enables/disables the horizontal scrolling gesture on the touchpad.
+</para>
+<para>
+The gesture used for scrolling depends on the selected scrolling method, see
+<link linkend="touchpad-scroll-methods">Scrolling method</link>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Reverse scroll direction</guilabel></term>
+<listitem><para>
+If this option is checked, the scrolling direction is reversed to resemble natural
+movement of content. This feature is also known as Natural scrolling.
+</para>
+<para>
+With the Synaptics driver you can configure this option for individual directions,
+see the options <guilabel>Apply to horizontal scrolling</guilabel> and
+<guilabel>Apply to vertical scrolling</guilabel> below.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Apply to horizontal scrolling</guilabel></term>
+<listitem><para>
+If this option is checked, the horizontal scrolling direction is reversed
+(Synaptics driver only).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Apply to vertical scrolling</guilabel></term>
+<listitem><para>
+If this option is checked, the vertical scrolling direction is reversed
+(Synaptics driver only).
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</sect2>
+
+<sect2 id="touchpad-scroll-methods">
+<title>Scrolling method</title>
+
+<para>
+This section allows you to pick your preferred scrolling method. This will determine
+the gesture which you will use to trigger scrolling.
+</para>
+<para>
+The two most common options are <guilabel>Two-finger</guilabel> and
+<guilabel>Edge</guilabel> scrolling.</para>
+
+<orderedlist>
+<listitem><para>
+<guilabel>Two-finger</guilabel> scrolling entails a movement with two fingers vertically or horizontally upon the surface of the touchpad.
+</para></listitem>
+<listitem><para>
+<guilabel>Edge scrolling</guilabel> on the other hand tracks movements with one finger
+long the right or bottom edge of the touchpad.
+</para></listitem>
+</orderedlist>
+
+<para>
+Additionally, the Libinput driver provides the <guilabel>Button</guilabel> scrolling
+method. On-button scrolling converts the motion of a device into scroll events while a designated button is held down.
+</para>
+</sect2>
+
+<sect2 id="touchpad-drivers">
+<title>Driver compatibility</title>
+
+<informaltable>
+<tgroup cols="4">
+<thead><row>
+<entry>Group</entry>
+<entry>Feature</entry>
+<entry>LibInput driver</entry>
+<entry>Synaptics driver</entry>
+</row></thead>
+<tbody>
+<row>
+<entry>GENERIC</entry>
+<entry>Enable/disable touchpad</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>BEHAVIOUR</entry>
+<entry>Disable touchpad while typing</entry>
+<entry>YES</entry>
+<entry>YES*</entry>
+</row>
+<row>
+<entry>BEHAVIOUR</entry>
+<entry>Middle button emulation</entry>
+<entry>YES</entry>
+<entry>YES**</entry>
+</row>
+<row>
+<entry>SPEED</entry>
+<entry>Acceleration</entry>
+<entry>YES</entry>
+<entry>NO</entry>
+</row>
+<row>
+<entry>SPEED</entry>
+<entry>Acceleration profile</entry>
+<entry>YES</entry>
+<entry>NO</entry>
+</row>
+<row>
+<entry>TAPPING</entry>
+<entry>Tap-to-click</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>TAPPING</entry>
+<entry>Tap-and-drag</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>TAPPING</entry>
+<entry>Tap-and-drag lock</entry>
+<entry>YES</entry>
+<entry>NO</entry>
+</row>
+<row>
+<entry>TAPPING</entry>
+<entry>Two-finger/three-finger tap swapping</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING OPTIONS</entry>
+<entry>Enable/disable vertical scrolling</entry>
+<entry>YES***</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING OPTIONS</entry>
+<entry>Enable/disable horizontal scrolling</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING OPTIONS</entry>
+<entry>Enable/disable natural scrolling</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING OPTIONS</entry>
+<entry>Enable/disable vertical natural scrolling</entry>
+<entry>NO</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING OPTIONS</entry>
+<entry>Enable/disable horizontal natural scrolling</entry>
+<entry>NO</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING METHODS</entry>
+<entry>Two-finger</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING METHODS</entry>
+<entry>Edge</entry>
+<entry>YES</entry>
+<entry>YES</entry>
+</row>
+<row>
+<entry>SCROLLING METHODS</entry>
+<entry>Button</entry>
+<entry>YES</entry>
+<entry>NO</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>* Synaptics supported using external <guilabel>tdesyndaemon</guilabel> service, automatically started/stopped.</para>
+<para>** Not configurable with the Synaptics driver.</para>
+<para>*** Disabling vertical scrolling under the Libinput driver disables scrolling entirely.</para>
+
+</sect2>
+
+</sect1>
+
+</article>
diff --git a/doc/khelpcenter/license/TDELicenseDlg.cpp b/doc/khelpcenter/license/TDELicenseDlg.cpp
index 2f65ecb68..049009fcb 100644
--- a/doc/khelpcenter/license/TDELicenseDlg.cpp
+++ b/doc/khelpcenter/license/TDELicenseDlg.cpp
@@ -5,7 +5,7 @@
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstddirs.h>
+#include <tdestandarddirs.h>
 #include <ktabwidget.h>
 #include <ktextbrowser.h>
 #include <tdelocale.h>
@@ -95,7 +95,7 @@ TDELicenseDlg::TDELicenseDlg(TQWidget *parent, const char *name)
           TQSizePolicy::Minimum);
   hboxBottom->addItem(spacerHBottom);
   KPushButton *okButton = new KPushButton(KStdGuiItem::ok(), this);
-  connect(okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
+  connect(okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
   okButton->setDefault(true);
   okButton->setFocus();
   hboxBottom->addWidget(okButton);
diff --git a/doc/khelpcenter/license/mainWindow.cpp b/doc/khelpcenter/license/mainWindow.cpp
index b6885e92b..78b50f576 100644
--- a/doc/khelpcenter/license/mainWindow.cpp
+++ b/doc/khelpcenter/license/mainWindow.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs::init(argc,argv, &aboutData);
   TDEApplication::addCmdLineOptions();
   TDEApplication app;
-  TQObject::connect(tqApp, TQT_SIGNAL(lastWindowClosed()), tqApp, TQT_SLOT(quit()));
+  TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit()));
 
   TDELicenseDlg *licenseDlg = new TDELicenseDlg();
   app.setMainWidget(licenseDlg);
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/index.docbook b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook
index 5ed60349f..cd315ed72 100644
--- a/doc/khelpcenter/releasenotes/r14.1.x/index.docbook
+++ b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook
@@ -6,6 +6,9 @@
   <!ENTITY r14.1.00 SYSTEM "r14.1.00.docbook">
   <!ENTITY r14.1.01 SYSTEM "r14.1.01.docbook">
   <!ENTITY r14.1.02 SYSTEM "r14.1.02.docbook">
+  <!ENTITY r14.1.03 SYSTEM "r14.1.03.docbook">
+  <!ENTITY r14.1.04 SYSTEM "r14.1.04.docbook">
+  <!ENTITY r14.1.05 SYSTEM "r14.1.05.docbook">
 ]>
 
 <article id="release-notes-14-1-x" lang="&language;">
@@ -42,8 +45,11 @@
 <para></para>
 </sect1>
 
+&r14.1.05;
+&r14.1.04;
+&r14.1.03;
+&r14.1.02;
 &r14.1.01;
 &r14.1.00;
-&r14.1.02;
 
 </article>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook
index 01ab3fe5f..e4ea66b86 100644
--- a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook
@@ -1,6 +1,129 @@
 <sect1 id="release-notes-r14.1.2">
-<title>R14.1.2 Release Notes (draft)</title>
+<title>R14.1.2 Release Notes</title>
 
-<para>The ongoing temporary list of changes introduced by this release can be found <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/144">here</ulink>.</para>
+<para>This document tracks some of the most important changes introduced in release R14.1.2, the second maintenance release of the R14.1.x series.</para>
+<para>The <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.2">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.2-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>tde-style-polyester: a widget style and TWin decoration aimed to be a good balance between eye candy and simplicity (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-polyester">TDE/tde-style-polyester</ulink>)</para></listitem>
+    <listitem><para>twin-style-fahrenheit: a nice TWin style decoration from the KDE 3.2 days (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-fahrenheit">TDE/twin-style-fahrenheit</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-new-functionalities">
+<title>New functionalities and enhancements</title>
+  <itemizedlist>
+    <listitem><para>ksnapshot: added delay functionality to 'Region' mode (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/71">TDE/tdegraphics#71</ulink>)</para></listitem>
+    <listitem><para>ksnapshot: add `setPixmap` DCOP call to allow setting the pixmap remotely (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/77">TDE/tdegraphics#77</ulink>)</para></listitem>
+    <listitem><para>tdebase: added six new color schemes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/403">TDE/tdebase#403</ulink>)</para></listitem>
+    <listitem><para>tdebase: added GUI option to choose between standard and Ubuntu-style shutdown dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/468">TDE/tdebase#468</ulink>)</para></listitem>
+    <listitem><para>twin: access window tiling via DCOP (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/436">TDE/tdebase#436</ulink>)</para></listitem>
+    <listitem><para>tdeioslave/sftp: overhaul of authentication methods (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/443">TDE/tdebase#443</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/447">TDE/tdebase#447</ulink>)</para></listitem>
+    <listitem><para>konsole: added ability to reset tab color to default (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/217">TDE/tdelibs#217</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/379">TDE/tdebase#379</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/133">TDE/tdelibs#133</ulink>)</para></listitem>
+    <listitem><para>kmix: new system tray icons reflecting current volume level (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/31">TDE/tdemultimedia#31</ulink>)</para></listitem>
+    <listitem><para>tde-ia-ora: five new styles based on GTK engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-ia-ora/issues/10">TDE/tde-style-ia-ora#10</ulink>)</para></listitem>
+    <listitem><para>kstreamripper: various improvements to logic and GUI (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/151">TDE/tde#151</ulink>)</para></listitem>
+    <listitem><para>tqt3: added support for HistoryBack and HistoryForward buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/98">TDE/tqt3#98</ulink>)</para></listitem>
+    <listitem><para>kxkb: added notification for keyboard layout switch (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/438">TDE/tdebase#438</ulink>)</para></listitem>
+    <listitem><para>kxkb: utilize translations provided by xkeyboard-config if available (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/449">TDE/tdebase#449</ulink>)</para></listitem>
+    <listitem><para>kmail: added ability to open the HTML body of an email in an external browser (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/94">TDE/tdepim#94</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/103">TDE/tdepim#103</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/114">TDE/tdepim#114</ulink>)</para></listitem>
+    <listitem><para>tdelibs: improved kdirlister functionality for remote folders (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/259">TDE/tdelibs#259</ulink>)</para></listitem>
+    <listitem><para>gwenview: added option to allow avoiding loading of metadata (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/22">TDE/gwenview#22</ulink>)</para></listitem>
+    <listitem><para>zeroconf ioslave: added support for SFTP servers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/issues/75">TDE/tdenetwork#75</ulink>)</para></listitem>
+    <listitem><para>tqtinterface: added missing `inputmethod` files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface/issues/21">TDE/tqtinterface#21</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface/issues/24">TDE/tqtinterface#24</ulink>)</para></listitem>
+    <listitem><para>added support for python 3.12 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/150">TDE/tde#150</ulink>)</para></listitem>
+    <listitem><para>added support for libpoppler 24.02 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/85">TDE/tdegraphics#85</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/86">TDE/tdegraphics#86</ulink>)</para></listitem>
+    <listitem><para>added support for taglib 2 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/162">TDE/tde#162</ulink>)</para></listitem>
+    <listitem><para>quanta: added support for libxml2-2.12.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdewebdev/issues/42">TDE/tdewebdev#42</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdewebdev/issues/43">TDE/tdewebdev#43</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>tqt3: several memory leak fixes and other small changes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/130">TDE/tqt3#130</ulink>)</para></listitem>
+    <listitem><para>kicker's quicklauncher: empty urls are ignored (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/418">TDE/tdebase#418</ulink>)</para></listitem>
+    <listitem><para>noatun: fixed crash when empty items were found in the playlist (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/53">TDE/tdemultimedia#53</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/54">TDE/tdemultimedia#54</ulink>)</para></listitem>
+    <listitem><para>kaffeine (with xine backend): fixed file filters in 'Open dialog' from second opening onwards (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/58">TDE/tdemultimedia#58</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine/issues/27">TDE/kaffeine#27</ulink>)</para></listitem>
+    <listitem><para>twin: fixed resizing issues with various Virtual Terminal based applications (xfce and mate terminals, gvim) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/57">TDE/tde#57</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/384">TDE/tdebase#384</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/411">TDE/tdebase#411</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/431">TDE/tdebase#431</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/434">TDE/tdebase#434</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/437">TDE/tdebase#437</ulink>)</para></listitem>
+    <listitem><para>twin: fixed functionality of `showWindowMenuAt` DCOP call (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/433">TDE/tdebase#433</ulink>)</para></listitem>
+    <listitem><para>twin: fixed startup crash when `Active borders` are set to `Switch desktop` (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/455">TDE/tdebase#455</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/464">TDE/tdebase#464</ulink>)</para></listitem>
+    <listitem><para>kdiff3: fixed pasting UTF8 text from clipboard (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3/issues/14">TDE/kdiff3#14</ulink>)</para></listitem>
+    <listitem><para>tdm (debian-like distros): prevent unwanted restarting of service during upgrade (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/409">TDE/tdebase#409</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/263">TDE/tde-packaging#263</ulink>)</para></listitem>
+    <listitem><para>kmplayer: solved crash on opening of settings dialog when building without xine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer/issues/14">TDE/kmplayer#14</ulink>)</para></listitem>
+    <listitem><para>kmilo: fixed regression affecting brightness value shown on OSD feedback (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/issues/68">TDE/tdeutils#68</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/issues/69">TDE/tdeutils#69</ulink>)</para></listitem>
+    <listitem><para>fixed tqdesigner and tdevelop crashes caused by invalid pointers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/97">TDE/tqt3#97</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/99">TDE/tqt3#99</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/issues/35">TDE/tdevelop#35</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/issues/40">TDE/tdevelop#40</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/issues/41">TDE/tdevelop#41</ulink>)</para></listitem>
+    <listitem><para>tde-guidance: fixed functionality of mountconfig module (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-guidance/issues/11">TDE/tde-guidance#11</ulink>)</para></listitem>
+    <listitem><para>kmix: fixed problem causing kmix (and possible other programs) to be unable to run after installation (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/29">TDE/tdemultimedia#29</ulink>)</para></listitem>
+    <listitem><para>tdelibs: fixed detection of removable devices with recent linux kernels (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/148">TDE/tde#148</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/248">TDE/tdelibs#248</ulink>)</para></listitem>
+    <listitem><para>krfb: fixed crash on VNC client disconnection (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libtdevnc/issues/2">TDE/libtdevnc#2</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libtdevnc/issues/10">TDE/libtdevnc#10</ulink>, <ulink url="https://bugs.pearsoncomputing.net/show_bug.cgi?id=2972">bug 2972</ulink>)</para></listitem>
+    <listitem><para>kxkb: fixed bug which was causing the loss of `setxkbmap` options already set (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/391">TDE/tdebase#391</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/451">TDE/tdebase#451</ulink>)</para></listitem>
+    <listitem><para>korganizer: do not add unnecessary quotes around Organizer and Attendees (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/108">TDE/tdepim#108</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/109">TDE/tdepim#109</ulink>)</para></listitem>
+    <listitem><para>gwenview: fixed opening correct file over ftp protocol (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/20">TDE/gwenview#20</ulink>)</para></listitem>
+      </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>Dropped Debian Stretch and Ubuntu Xenial (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/257">TDE/tde-packaging#257</ulink>)</para></listitem>
+    <listitem><para>Added support for Ubuntu Noble (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/264">TDE/tde-packaging#264</ulink>)</para></listitem>
+    <listitem><para>Added Fedora 40 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/169">TDE/tde#169</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-cmake-conversions">
+<title>CMake conversions</title>
+  <itemizedlist>
+    <listitem><para>gwenview (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/30">TDE/gwenview#30</ulink>)</para></listitem>
+    <listitem><para>smb4k (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k/issues/13">TDE/smb4k#13</ulink>)</para></listitem>
+    <listitem><para>soundkonverter (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter/issues/13">TDE/soundkonverter#13</ulink>)</para></listitem>
+    <listitem><para>tde-guidance (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-guidance/issues/13">TDE/tde-guidance#13</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-dropped-code-applications">
+<title>Drop code/applications</title>
+  <itemizedlist>
+    <listitem><para>Dropped autotools support for various modules (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/issues/20">TDE/k9copy#20</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libksquirrel/issues/11">TDE/libksquirrel#11</ulink>)</para></listitem>
+    <listitem><para>tde-guidance: removed grubconfig and wineconfig modules (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-guidance">TDE/tde-guidance#12</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-info-developers">
+<title>Info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>Partial work on merging tqtinterface into tqt3. Changes do not affect any API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/145">TDE/tde#145</ulink>)</para></listitem>
+    <listitem><para>debian-like distros: changed debhelper compatibility level to 10 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/255">TDE/tde-packaging#255</ulink>)</para></listitem>
+    <listitem><para>minimum cmake version raised from 3.1 to 3.5</para></listitem>
+    <listitem><para>uncrustify-trinity has been updated to upstream version 0.78.1 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies/issues/12">TDE/extra-dependencies#12</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies/issues/13">TDE/extra-dependencies#13</ulink>)</para></listitem>
+    <listitem><para>libr: removed libglade related code, updated library version to 0.7.0 and .so binary version to 1.0.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libr/issues/11">TDE/libr#11</ulink>)</para></listitem>
+    <listitem><para>libr for debian like distros: libr0 package has been upgraded to libr1 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/262">TDE/tde-packaging#262</ulink>)</para></listitem>
+    <listitem><para>libr: made dependency upon gtk optional (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libr/issues/12">TDE/libr#12</ulink>)</para></listitem>
+    <listitem><para>DEB: automatically add ldconfig trigger if the package contains plugins (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/266">TDE/tde-packaging#266</ulink>)</para></listitem>
+    <listitem><para>tdebase: dependency on libssh is now associated to sftp building option (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/441">TDE/tdebase#441</ulink>)</para></listitem>
+    <listitem><para>kdbusnotification: allow to specify the path of `dbus-binding-tool` using a cmake define (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kdbusnotification/issues/7">TDE/kdbusnotification#7</ulink>)</para></listitem>
+    <listitem><para>scripts: removed `astyle` files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/scripts/issues/7">TDE/scripts#7</ulink>)</para></listitem>
+    <listitem><para>`auto_ptr` has been replaced by modern and supported alternatives (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/157">TDE/tde#157</ulink>)</para></listitem>
+    <listitem><para>tqt3: fixed building with `_FORTIFY_SOURCE=3` (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/70">TDE/tqt3#70</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/100">TDE/tqt3#100</ulink>)</para></listitem>
+    <listitem><para>tqt3: allow to build with `-no-thread` option (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/120">TDE/tqt3#120</ulink>)</para></listitem>
+    <listitem><para>tqt3: enable thread support by default (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/122">TDE/tqt3#122</ulink>)</para></listitem>
+    <listitem><para>tde-cmake: set cmake minimum version in a centralized place (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/164">TDE/tde#164</ulink>)</para></listitem>
+    <listitem><para>added support for 64bit `time_t` on deb-based 32-bit distros (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/issues/281">TDE/tde-packaging#281</ulink>)</para></listitem>
+    <listitem><para>fix building with c++17 standard (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/168">TDE/tde#168</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.2-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.2">Full release notes (with screenshots)</ulink> on TDE wiki</para></listitem>
+    <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/144">This release notes</ulink> on TGW</para></listitem>
+    <listitem><para>TGW <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/143">issue and PR list</ulink></para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.2">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
 
 </sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.03.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.03.docbook
new file mode 100644
index 000000000..ae0c5f43d
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.03.docbook
@@ -0,0 +1,121 @@
+<sect1 id="release-notes-r14.1.3">
+<title>R14.1.3 Release Notes</title>
+
+<para>This document tracks some of the most important changes introduced in release R14.1.3, the third maintenance release of the R14.1.x series.</para>
+<para>The <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.3">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.3-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>xdg-desktop-portal-tde: partial implementation (Account, Email, FileChooser) of the XDG Desktop Portal API for TDE (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/xdg-desktop-portal-tde">TDE/xdg-desktop-portal-tde</ulink>)</para></listitem>
+    <listitem><para>twin-style-mallory: a twin window decoration based on the original KDE Alloyon windec theme (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-mallory">TDE/twin-style-mallory</ulink>)</para></listitem>
+    <listitem><para>tde-ebook-reader: a modern e-book reader for TDE (TQt port of FBReader) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-ebook-reader">TDE/tde-ebook-reader</ulink>)</para></listitem>
+    <listitem><para>universal-indent-gui-tqt: a GUI frontend for several code formatters, beautifiers and indenters (TQt port of UniversalIndentGUI) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/universal-indent-gui-tqt">TDE/universal-indent-gui-tqt</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.3-new-functionalities">
+<title>New functionalities and enhancements</title>
+  <itemizedlist>
+    <listitem><para>tdebase: new touchpad module for TDE Control Centre (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/481">TDE/tdebase#481</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/521">TDE/tdebase#521</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/533">TDE/tdebase#533</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/539">TDE/tdebase#539</ulink>)</para></listitem>
+    <listitem><para>konsole: add Solarized dark and light color schemes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/486">TDE/tdebase#486</ulink>)</para></listitem>
+    <listitem><para>twin and kicker: add support for window tiling to the taskbar and window's popup menus (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/522">TDE/tdebase#522</ulink>)</para></listitem>
+    <listitem><para>khotkeys: allow to run either as kded module or standalone application (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/326">TDE/tdebase#326</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/536">TDE/tdebase#536</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/537">TDE/tdebase#537</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/538">TDE/tdebase#538</ulink>)</para></listitem>
+    <listitem><para>improve visibility of Control Center modules. Modules for which there is no underlying hardware can now be hidden (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/300">TDE/tdelibs#300</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/527">TDE/tdebase#527</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/534">TDE/tdebase#534</ulink>)</para></listitem>
+    <listitem><para>add support to various applications for back/forward actions using history mouse buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/174">TDE/tde#174</ulink>)</para></listitem>
+    <listitem><para>add `Copy Full Path` action to popup menu in konqueror (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/523">TDE/tdebase#523</ulink>) and Dolphin (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/pulls/33">TDE/dolphin#33</ulink>)</para></listitem>
+    <listitem><para>add support for Python 3.13 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin/pulls/34">TDE/tde-common-admin#34</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/27">TDE/sip4-tqt#27</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt/pulls/33">TDE/pytqt#33</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu/pulls/47">TDE/tdeedu#47</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/pulls/80">TDE/koffice#80</ulink>)</para></listitem>
+    <listitem><para>superkaramba: add GB and percent format strings for memory sensors (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/pulls/85">TDE/tdeutils#85</ulink>) and GPU load sensor (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/pulls/86">TDE/tdeutils#86</ulink>)</para></listitem>
+    <listitem><para>tdebase: provide DCOP interface and global shortcuts for suspending the system (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/502">TDE/tdebase#502</ulink>)</para></listitem>
+    <listitem><para>tdebase: allow remote network folders to be moved to and restored from the Trash folder (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/520">TDE/tdebase#520</ulink>)</para></listitem>
+    <listitem><para>knetattach: add SFTP connection option (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/519">TDE/tdebase#519</ulink>)</para></listitem>
+    <listitem><para>kspread: add VLOOKUP/HLOOKUP functions (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/pulls/66">TDE/koffice#66</ulink>)</para></listitem>
+    <listitem><para>added support for webp images (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/277">TDE/tdelibs#277</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/25">TDE/digikam#25</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/pulls/42">TDE/gwenview#42</ulink>)</para></listitem>
+    <listitem><para>konqueror: add support for .webp thumbnails (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/380">TDE/tdebase#380</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/487">TDE/tdebase#487</ulink>)</para></listitem>
+    <listitem><para>kate: use simple paths for local files in `modified on disk` dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/284">TDE/tdelibs#284</ulink>)</para></listitem>
+    <listitem><para>arts: use AudioIOSun on Solaris and NetBSD (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/arts/pulls/22">TDE/arts#22</ulink>)</para></listitem>
+    <listitem><para>tdebase: improve granularity of keyboard and style related timers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/513">TDE/tdebase#513</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/518">TDE/tdebase#518</ulink>)</para></listitem>
+    <listitem><para>codeine: improve the layout of xine parameters configuration dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/18">TDE/codeine#18</ulink>)</para></listitem>
+    <listitem><para>tdelibs kimgio: add support for TIFF transparency (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/282">TDE/tdelibs#282</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/302">TDE/tdelibs#302</ulink>)</para></listitem>
+    <listitem><para>kate PHP syntax: allow `heredoc` closing identifiers to be indented (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/267">TDE/tdelibs#267</ulink>)</para></listitem>
+    <listitem><para>gwenview external tools: replace deprecated gimp-remote with gimp (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/pulls/46">TDE/gwenview#46</ulink>)</para></listitem>
+    <listitem><para>improve support for JasPer 3/4 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/306">TDE/tdelibs#306</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libksquirrel/pulls/21">TDE/libksquirrel#21</ulink>)</para></listitem>
+    <listitem><para>switch from libpcre to libpcre2 regular expressions (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/295">TDE/tdelibs#295</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/524">TDE/tdebase#524</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kbarcode/pulls/20">TDE/kbarcode#20</ulink>)</para></listitem>
+    <listitem><para>add support for libpoppler 24.04 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/97">TDE/tdegraphics#97</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.3-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>konsole: fix text width calculation (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/516">TDE/tdebase#516</ulink>)</para></listitem>
+    <listitem><para>tqt3: several memory leak fixes and other small changes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/148">TDE/tqt3#148</ulink>)</para></listitem>
+    <listitem><para>tdelibs: improve autostart support logic for KDE programs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/283">TDE/tdelibs#283</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/293">TDE/tdelibs#293</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/294">TDE/tdelibs#294</ulink>)</para></listitem>
+    <listitem><para>kmail: fix handling of attachments with a `#` in the filename (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/119">TDE/tdepim#119</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/120">TDE/tdepim#120</ulink>)</para></listitem>
+    <listitem><para>tde-style-polyester: fix loading of twin decoration (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-polyester/pulls/11">TDE/tde-style-polyester#11</ulink>)</para></listitem>
+    <listitem><para>twin-style-fahrenheit: fix loading of twin decoration (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-fahrenheit/pulls/3">TDE/twin-style-fahrenheit#3</ulink>)</para></listitem>
+    <listitem><para>kjobviewer: fix incorrect autostart rule (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/492">TDE/tdebase#492</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/493">TDE/tdebase#493</ulink>)</para></listitem>
+    <listitem><para>fix compatibility with ffmpeg 7.x (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/18">TDE/akode#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/19">TDE/akode#19</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/47">TDE/k3b#47</ulink>)</para></listitem>
+    <listitem><para>tdemultimedia: fix support for libtag2 in FLAC plugin (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/77">TDE/tdemultimedia#77</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/pulls/81">TDE/tdemultimedia#81</ulink>)</para></listitem>
+    <listitem><para>codeine: scale capture preview if it exceeds screen bounds (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/15">TDE/codeine#15</ulink>)</para></listitem>
+    <listitem><para>icon dialog window: fixed display of icon names for filenames with multiple dots in the icon dialog window (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/298">TDE/tdelibs#298</ulink>)</para></listitem>
+    <listitem><para>codeine: fix crash when showing context menu in DVDs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/19">TDE/codeine#19</ulink>)</para></listitem>
+    <listitem><para>codeine: fix filter in "Open file" dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/21">TDE/codeine#21</ulink>)</para></listitem>
+    <listitem><para>codeine: fix disappearing channel selection when modifying toolbar settings (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/issues/24">TDE/codeine#24</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/25">TDE/codeine#25</ulink>)</para></listitem>
+    <listitem><para>tdepim: fix import encoding for vCard v4 in KAddressBook (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/130">TDE/tdepim#130</ulink>)</para></listitem>
+    <listitem><para>ksirc: fix functionality of internal perl scripts, de facto making ksirc usable again (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork/pulls/86">TDE/tdenetwork#86</ulink>)</para></listitem>
+    <listitem><para>kate syntax: highlights alerts (FIXME, TODO) for Rust language (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/308">TDE/tdelibs#308</ulink>)</para></listitem>
+    <listitem><para>tdelibs: fix crash in tdeio scheduler when job or slave are invalid (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/309">TDE/tdelibs#309</ulink>)</para></listitem>
+    <listitem><para>amarok: fix unsigned overflow in Debug::Block dtor (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/67">TDE/amarok#67</ulink>)</para></listitem>
+    <listitem><para>amarok: replace custom MP4 metadata parser with TagLib. This prevent crash when trying to play MP4 files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/82">TDE/tdemultimedia#82</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/66">TDE/amarok#66</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.3-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>OpenMandriva (OMV): add support for OMV 5 and OMV Cooker (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/pulls/171">TDE/tde#171</ulink>)</para></listitem>
+    <listitem><para>Ubuntu: add support for Oracular and dropped support for Kinetic (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/329">TDE/tde-packaging#329</ulink>)</para></listitem>
+    <listitem><para>Fedora: add support for version 41</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.3-cmake-conversions">
+<title>CMake conversions</title>
+  <itemizedlist>
+    <listitem><para>kmyfirewall (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/17">TDE/kmyfirewall#17</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/18">TDE/kmyfirewall#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/19">TDE/kmyfirewall#19</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/20">TDE/kmyfirewall#20</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/21">TDE/kmyfirewall#21</ulink>)</para></listitem>
+    <listitem><para>piklab (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/piklab/pulls/16">TDE/piklab#16</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/piklab/pulls/17">TDE/piklab#17</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.3-dropped-code-applications">
+<title>Drop autotools support</title>
+  <itemizedlist>
+    <listitem><para>gwenview (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/pulls/36">TDE/gwenview#36</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/pulls/39">TDE/gwenview#39</ulink>)</para></listitem>
+    <listitem><para>smb4k (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k/pulls/20">TDE/smb4k#20</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k/pulls/22">TDE/smb4k#22</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k/pulls/23">TDE/smb4k#23</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k/pulls/24">TDE/smb4k#24</ulink>)</para></listitem>
+    <listitem><para>soundkonverter (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter/pulls/21">TDE/soundkonverter#21</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter/pulls/22">TDE/soundkonverter#22</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter/pulls/23">TDE/soundkonverter#23</ulink>)</para></listitem>
+    <listitem><para>tde-guidance (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-guidance/pulls/19">TDE/tde-guidance#19</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.3-info-developers">
+<title>Info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>partial work on merging tqtinterface into TQt3 + several TQt/TDE related renamings (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/pulls/165">TDE/tde#165</ulink>)</para></listitem>
+    <listitem><para>add support for relative paths in `_tde_internal_setup_path` (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-cmake/pulls/108">TDE/tde-cmake#108</ulink>)</para></listitem>
+    <listitem><para>add support for gcc14 builds (several PRs)</para></listitem>
+    <listitem><para>compizconfig-python-trinity, mp4v2 and pyrex have been removed from the DEB extra dependencies repository (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies/pulls/29">TDE/extra-dependencies#29</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies/pulls/31">TDE/extra-dependencies#31</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.3-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.3">Full release notes (with screenshots)</ulink> on TDE wiki</para></listitem>
+    <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/167">This release notes</ulink> on TGW</para></listitem>
+    <listitem><para>TGW <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/166">issue and PR list</ulink></para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.3">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.04.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.04.docbook
new file mode 100644
index 000000000..a33dd8daf
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.04.docbook
@@ -0,0 +1,122 @@
+<sect1 id="release-notes-r14.1.4">
+<title>R14.1.4 Release Notes</title>
+
+<para>This document tracks some of the most important changes introduced in release R14.1.4, the fourth maintenance release of the R14.1.x series.</para>
+<para>The <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.4">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.4-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>tdealternatives: a TDE control module to manage alternatives for DEB/RPM-based distributions (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdealternatives">TDE/tdealternatives</ulink>)</para></listitem>
+    <listitem><para>tdeartwork: 22 new 'Modern Times' and 'Progessive' vector wallpapers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/51">TDE/tdeartwork#51</ulink>)</para></listitem>
+    <listitem><para>new Dekoration theme Euforie (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/12">TDE/twin-style-dekorator#12</ulink>)</para></listitem>
+    <listitem><para>fifteen new color schemes taken from Pling (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/577">TDE/tdebase#577</ulink>)</para></listitem>
+    <listitem><para>tdeknighttour: a puzzle solving game for TDE (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeknighttour">TDE/tdeknighttour</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-new-functionalities">
+<title>New functionalities and enhancements</title>
+  <itemizedlist>
+    <listitem><para>tqt3: add support for Unicode surrogate characters and planes above zero. Requires using a font that support such characters (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/issues/162">TDE/tqt3#162</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/222">TDE/tde#222</ulink>)</para></listitem>
+    <listitem><para>tderandrtray: new context menu structure (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/560">TDE/tdebase#560</ulink>)</para></listitem>
+    <listitem><para>tdefile-plugin: new tdefile metainfo plugin for mp4 audio files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/pulls/96">TDE/tdemultimedia#96</ulink>)</para></listitem>
+    <listitem><para>kxkb: new options `Stretch flag`, `Dim flag` and `Show indicator bevel`. Improvements to layout switching logic and syncing with X in response to external changes. Improvement to  option GUI code. Remember options and layout when keyboards are added/removed (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/550">TDE/tdebase#550</ulink>)</para></listitem>
+    <listitem><para>tdepowersave: scheme and CPU policy can now be set using DCOP (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave/pulls/41">TDE/tdepowersave#41</ulink>)</para></listitem>
+    <listitem><para>kpdf: add support for multiple tabs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/116">TDE/tdegraphics#116</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/117">TDE/tdegraphics#117</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/119">TDE/tdegraphics#118</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/121">TDE/tdegraphics#121</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/122">TDE/tdegraphics#122</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/125">TDE/tdegraphics#125</ulink>)</para></listitem>
+    <listitem><para>codeine: add analyzer view when playing audio-only streams (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/30">TDE/codeine#30</ulink>)</para></listitem>
+    <listitem><para>codeine: add context menu to statusbar to toggle Analyzer visibility when watching videos (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/32">TDE/codeine#32</ulink>)</para></listitem>
+    <listitem><para>libical: makes url links clickable in event descriptions (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/141">TDE/tdepim#141</ulink>)</para></listitem>
+    <listitem><para>add support for ISO8601 reduced precision format (i.e. hour-only) in KRFCDate (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/347">TDE/tdelibs#347</ulink>)</para></listitem>
+    <listitem><para>twin-style-dekorator: add pseudotransparency for themes with transparent pixmaps (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/11">TDE/twin-style-dekorator#11</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/13">TDE/twin-style-dekorator#13</ulink>)</para></listitem>
+    <listitem><para>twin-style-dekorator: improvement to resizing handle size with thin frames (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/15">TDE/twin-style-dekorator#15</ulink>)</para></listitem>
+    <listitem><para>twin-style-dekorator: add optional top and bottom-shaded borders (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/17">TDE/twin-style-dekorator#17</ulink>)</para></listitem>
+    <listitem><para>twin-style-dekorator: add templaTor theme to source code as visual template for artists (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/18">TDE/twin-style-dekorator#18</ulink>)</para></listitem>
+    <listitem><para>twin-style-dekorator: add logic for optional 'inactive window' images (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/21">TDE/twin-style-dekorator#21</ulink>)</para></listitem>
+    <listitem><para>twin-style-dekorator: add readme about theme creations and images (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-dekorator/pulls/22">TDE/twin-style-dekorator#22</ulink>)</para></listitem>
+    <listitem><para>knowit: add `dockOnStart` option to control window status on startup (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/knowit/pulls/18">TDE/knowit#18</ulink>)</para></listitem>
+    <listitem><para>tdebase: don't stat files twice when sending them to trash (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/542">TDE/tdebase#542</ulink>)</para></listitem>
+    <listitem><para>kteatime: new option to reset the timer when clicking on the notification message. Improved configuration dialog layout (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys/issues/47">TDE/tdetoys#47</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys/pulls/48">TDE/tdetoys#48</ulink>)</para></listitem>
+    <listitem><para>universalIndentGUI-tqt: add new info dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/universal-indent-gui-tqt/issues/6">TDE/universal-indent-gui-tqt#6</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/universal-indent-gui-tqt/pulls/9">TDE/universal-indent-gui-tqt#9</ulink>)</para></listitem>
+    <listitem><para>improve support for JasPer 3/4 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/48">TDE/digikam#48</ulink>)</para></listitem>
+    <listitem><para>add support for gcc 15 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/pulls/220">TDE/tde#220</ulink>)</para></listitem>
+    <listitem><para>add support for Poppler >= 25.01 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/113">TDE/tdegraphics#113</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>tderandrtray: fix settings of display gamma (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/163">TDE/tdebase#163</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/321">TDE/tdelibs#321</ulink>)</para></listitem>
+    <listitem><para>tdenetworkmanager: allow creation of VPN connections (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetworkmanager/issues/5">TDE/tdenetworkmanager#5</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/338">TDE/tdelibs#338</ulink>)</para></listitem>
+    <listitem><para>use uppercase PASS command for ftp (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/313">TDE/tdelibs#313</ulink>)</para></listitem>
+    <listitem><para>codeine: fix visualization of audio analyzer on the status bar (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/26">TDE/codeine#26</ulink>)</para></listitem>
+    <listitem><para>codeine: allow seeking in FLAC (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/28">TDE/codeine#28</ulink>)</para></listitem>
+    <listitem><para>codeine: fix mouse events for changing slider volume (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/29">TDE/codeine#29</ulink>)</para></listitem>
+    <listitem><para>gtk-qt-engine: fix up background color rendering of several visual controls (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gtk-qt-engine/pulls/24">TDE/gtk-qt-engine#24</ulink>)</para></listitem>
+    <listitem><para>kcminit: make sure to correctly initialize multiple modules provided by the same library (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/554">TDE/tdebase#554</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/565">TDE/tdebase#565</ulink>)</para></listitem>
+    <listitem><para>tdebase: add `--attach` option to KDialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/558">TDE/tdebase#558</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/issues/318">TDE/tdelibs#318</ulink>, <ulink url="http://bugs.pearsoncomputing.net/show_bug.cgi?id=3038">bug 3038</ulink>)</para></listitem>
+    <listitem><para>amarok: fix FTBFS when  linking taglib2 on 32 bit architectures (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/issues/60">TDE/amarok#60</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/82">TDE/amarok#82</ulink>)</para></listitem>
+    <listitem><para>soundkonverter: fix FTBFS when  linking taglib2 on 32 bit architectures (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter/pulls/29">TDE/soundkonverter#29</ulink>)</para></listitem>
+    <listitem><para>akode: fix seeking in Vorbis decoder (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/22">TDE/akode#22</ulink>)</para></listitem>
+    <listitem><para>akregator: allow to use namespace prefix provided by the XML document (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/152">TDE/tdepim#152</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/154">TDE/tdepim#154</ulink>)</para></listitem>
+    <listitem><para>kmail: avoid confusion between TLS and STARTTLS when configuring accounts (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/153">TDE/tdepim#153</ulink>)</para></listitem>
+    <listitem><para>kxkb: fix incorrect layout display (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/547">TDE/tdebase#547</ulink>) and unwanted reset of options (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/548">TDE/tdebase#548</ulink>). Both part of <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/550">TDE/tdebase#550</ulink> mentioned in the `New functionalities and enhancements` section above</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>Raspbian: drop support for Buster (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/391">TDE/tde-packaging#391</ulink>)</para></listitem>
+    <listitem><para>Ubuntu: add support for Plucky, drop support for Lunar (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/391">TDE/tde-packaging#391</ulink>)</para></listitem>
+    <listitem><para>Fedora: add support for Fedora 43 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging/pulls/421">TDE/tde-packaging#421</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-cmake-conversions">
+<title>CMake conversions</title>
+  <itemizedlist>
+    <listitem><para>digikam (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/30">TDE/digikam#30</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/31">TDE/digikam#31</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/32">TDE/digikam#32</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/33">TDE/digikam#33</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/34">TDE/digikam#34</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/35">TDE/digikam#35</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/37">TDE/digikam#37</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/38">TDE/digikam#38</ulink>)</para></listitem>
+    <listitem><para>krecipes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/krecipes/pulls/15">TDE/krecipes#15</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/krecipes/pulls/16">TDE/krecipes#16</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/krecipes/pulls/17">TDE/krecipes#17</ulink>)</para></listitem>
+    <listitem><para>ksquirrel (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel/pulls/26">TDE/ksquirrel#26</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel/pulls/27">TDE/ksquirrel#27</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel/pulls/30">TDE/ksquirrel#30</ulink>)</para></listitem>
+    <listitem><para>ktorrent (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent/pulls/28">TDE/ktorrent#28</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent/pulls/29">TDE/ktorrent#29</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent/pulls/30">TDE/ktorrent#30</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent/pulls/32">TDE/ktorrent#32</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-dropped-code-applications">
+<title>Drop autotools support</title>
+  <itemizedlist>
+    <listitem><para>kmyfirewall (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/22">TDE/kmyfirewall#22</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/29">TDE/kmyfirewall#29</ulink>)</para></listitem>
+    <listitem><para>piklab (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/piklab/pulls/22">TDE/piklab#22</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-removed-modules">
+<title>Removed modules</title>
+  <itemizedlist>
+    <listitem><para>kaffeine-mozilla (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/pulls/219">TDE/tde#219</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-info-developers">
+<title>Info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>General renames, code improvements, obsolete code removal (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/205">TDE/tde#205</ulink>)</para></listitem>
+    <listitem><para>Remove uncrustify-trinity (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies/pulls/36">TDE/extra-dependencies#36</ulink>)</para></listitem>
+    <listitem><para>Scripts to create TQt3 from Qt3 have been removed (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/scripts/pulls/12">TDE/scripts#12</ulink>)</para></listitem>
+    <listitem><para>Minimum CMake version raised from 3.5 to 3.10 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-cmake/pulls/123">TDE/tde-cmake#123</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.1.4-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.4">Full release notes (with screenshots)</ulink> on TDE wiki</para></listitem>
+    <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/206">This release notes</ulink> on TGW</para></listitem>
+    <listitem><para>TGW full <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/207">issue and PR list</ulink>, by module</para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.4">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.05.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.05.docbook
new file mode 100644
index 000000000..3a1fdc5a5
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.05.docbook
@@ -0,0 +1,6 @@
+<sect1 id="release-notes-r14.1.5">
+<title>R14.1.5 Release Notes (draft)</title>
+
+<para>The ongoing list of changes introduced by this release can be found <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/230">here</ulink>.</para>
+
+</sect1>
diff --git a/doc/khelpcenter/userguide/index.docbook b/doc/khelpcenter/userguide/index.docbook
index 691706676..7891c18c6 100644
--- a/doc/khelpcenter/userguide/index.docbook
+++ b/doc/khelpcenter/userguide/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
   <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "<replaceable>KApp</replaceable>">
+  <!ENTITY kappname "<replaceable>TDEApp</replaceable>">
   <!ENTITY % addindex "INCLUDE">
   <!ENTITY % imageobjectco.module "INCLUDE">
   <!ENTITY getting-help SYSTEM "getting-help.docbook">
diff --git a/doc/khelpcenter/userguide/programs-and-documents.docbook b/doc/khelpcenter/userguide/programs-and-documents.docbook
index b56f486b4..c5eb9091f 100644
--- a/doc/khelpcenter/userguide/programs-and-documents.docbook
+++ b/doc/khelpcenter/userguide/programs-and-documents.docbook
@@ -251,7 +251,7 @@ the <guilabel>Preview and Metafiles</guilabel> tab and change the
 
 <title>Configuring Programs</title>
 
-<sect2 id="configure-kapp">
+<sect2 id="configure-tdeApp">
 <title>Application Configuration</title>
 <!-- FIXME: Make a more friendly title -->
 <indexterm><primary>Configuration</primary></indexterm>
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index 1692f8d8d..2249f928f 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -1019,14 +1019,31 @@ If there is no mark in the checkbox, then the panel is fixed to the
 length specified in this section.
 </para>
 
-<para>The final section of this table is labeled
-<guilabel>Size</guilabel>, and refers to the
-<emphasis>height</emphasis> of the panel. The panel's size can be
-<guilabel>Tiny</guilabel>, <guilabel>Small</guilabel>,
+<para>The final section of this dialog is labeled <guilabel>Size</guilabel>,
+and refers to the <emphasis>height</emphasis> of the panel. The panel's size
+can be <guilabel>Tiny</guilabel>, <guilabel>Small</guilabel>,
 <guilabel>Medium</guilabel>, <guilabel>Large</guilabel> or
-<guilabel>Custom</guilabel>. If you choose
-<guilabel>Custom</guilabel> mode, you can resize &kicker; by
-specifying a height in the combobox.</para>
+<guilabel>Custom</guilabel>. Choosing <guilabel>Custom</guilabel> mode allows
+resizing &kicker; by specifying a height in the combobox. The default
+size for the predefined <emphasis>height</emphasis> <guilabel>Tiny</guilabel>
+is 24 pixels, <guilabel>Small</guilabel> is 30 pixels,
+<guilabel>Normal</guilabel> is 46 pixels, and <guilabel>Large</guilabel> is
+58 pixels.</para>
+
+<tip><para>There are additional hidden options. These hidden options are
+configured in <guilabel>$TDEHOME/share/config/ktaskbarrc [General]</guilabel>.
+The <guilabel>MinimumButtonHeight</guilabel> option is the
+<emphasis>height</emphasis> where taskbar buttons stack into rows. The default
+value is <emphasis>18</emphasis> pixels. To prevent the taskbar buttons from
+stacking into rows, <guilabel>MinimumButtonHeight</guilabel> must defined
+explicitly and be at least one pixel larger than the defined panel
+<emphasis>height</emphasis>.</para></tip>
+
+<tip><para>A second hidden option is <guilabel>MaximumButtonWidth</guilabel>.
+The default value is <emphasis>200</emphasis> pixels. This is the
+<emphasis>width</emphasis> each taskbar button will use. To override the
+default value the option must defined explicitly. The setting mostly affects
+using a Display option with text.</para></tip>
 
 <para>If you have multiple monitors, you can configure the panel for
 each screen entirely independently. If you are not sure which screen
diff --git a/doc/konsole/index.docbook b/doc/konsole/index.docbook
index a11c0dd17..5114a5d36 100644
--- a/doc/konsole/index.docbook
+++ b/doc/konsole/index.docbook
@@ -1437,7 +1437,7 @@ echo $*</programlisting>
 <para>Information on building &konsole; on platforms other than &Linux;
 is available in the <filename>README.ports</filename> file in the
 &konsole; source package. It provides a list of experts for certain
-platforms (Tru64, &Solaris;, OpenBSD) and requests volunteers from other
+platforms (&Solaris;, OpenBSD) and requests volunteers from other
 &UNIX; platforms.</para>
 
 <para>For more infomation please visit these websites:</para>
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index 45846b761..263aaa7fb 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -606,13 +606,13 @@ or before it starts loading plugins, &etc;, invoke &ksplash; as
 follows:</para>
 
 <programlisting>
-DCOPClient *c = kapp-&gt;dcopClient();
+DCOPClient *c = tdeApp-&gt;dcopClient();
 TQString error;
 QCString KSplashName;
 int pid = 0;
 QStringList args;
 args &lt;&lt; "--theme=MyCoolTheme" &lt;&lt; "--managed";
-if (kapp-&gt;startServiceByDesktopName("ksplash", args, &amp;error,
+if (tdeApp-&gt;startServiceByDesktopName("ksplash", args, &amp;error,
 &amp;KSplashName, &amp;pid))
 {
   KMessageBox::sorry(0, error, "Unable to invoke KSplash");
@@ -1101,7 +1101,7 @@ appropriate plugin.</para>
 #include &lt;tdeglobalsettings.h&gt;
 #include &lt;tdelocale.h&gt;
 #include &lt;ksplash/objkstheme.h&gt;
-#include &lt;kstandarddirs.h&gt;
+#include &lt;tdestandarddirs.h&gt;
 
 #include "rotwidget.h"
 #include "theme2k.h"
@@ -1267,7 +1267,7 @@ c2, int sp )
     preparePixmap( i );
 
   m_stepTimer = new QTimer( this );
-  connect(m_stepTimer, SIGNAL(timeout()), this, SLOT(stepEvent()));
+  connect(m_stepTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(stepEvent()));
   m_stepTimer-&gt;start( 50 );
 }
 
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 000000000..74cd0aefd
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,28 @@
+tde_conditional_add_subdirectory( BUILD_DRKONQI drkonqi )
+tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
+tde_conditional_add_subdirectory( BUILD_KATE kate )
+tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
+tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
+tde_conditional_add_subdirectory( BUILD_KDCOP kdcop )
+tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )
+tde_conditional_add_subdirectory( BUILD_KFIND kfind )
+tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
+tde_conditional_add_subdirectory( BUILD_KICKER kicker )
+tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit )
+tde_conditional_add_subdirectory( BUILD_KNETATTACH knetattach )
+tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
+tde_conditional_add_subdirectory( BUILD_KONSOLE konsole )
+tde_conditional_add_subdirectory( BUILD_KPAGER kpager )
+tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer )
+tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig )
+tde_conditional_add_subdirectory( BUILD_KSTART kstart )
+tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
+tde_conditional_add_subdirectory( BUILD_KXKB kxkb )
+tde_conditional_add_subdirectory( BUILD_STARTTDE starttde )
+tde_conditional_add_subdirectory( BUILD_TDEDEBUGDIALOG tdedebugdialog )
+tde_conditional_add_subdirectory( BUILD_TDEIOSLAVES tdeioslave )
+tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )
+tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint )
+tde_conditional_add_subdirectory( BUILD_TDESCREENSAVER tdescreensaver )
+tde_conditional_add_subdirectory( BUILD_TDESU tdesu )
+tde_conditional_add_subdirectory( BUILD_TDM tdm )
diff --git a/doc/man/drkonqi/CMakeLists.txt b/doc/man/drkonqi/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/drkonqi/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/drkonqi.1 b/doc/man/drkonqi/drkonqi.1
index 987164834..987164834 100644
--- a/doc/man/drkonqi.1
+++ b/doc/man/drkonqi/drkonqi.1
diff --git a/doc/man/kappfinder/CMakeLists.txt b/doc/man/kappfinder/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kappfinder/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kappfinder.1 b/doc/man/kappfinder/kappfinder.1
index ec8eae964..ec8eae964 100644
--- a/doc/man/kappfinder.1
+++ b/doc/man/kappfinder/kappfinder.1
diff --git a/doc/man/kate/CMakeLists.txt b/doc/man/kate/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kate/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kate.1 b/doc/man/kate/kate.1
index e48268d6f..e48268d6f 100644
--- a/doc/man/kate.1
+++ b/doc/man/kate/kate.1
diff --git a/doc/man/kwrite.1 b/doc/man/kate/kwrite.1
index f7d39f61d..f7d39f61d 100644
--- a/doc/man/kwrite.1
+++ b/doc/man/kate/kwrite.1
diff --git a/doc/man/kcheckpass/CMakeLists.txt b/doc/man/kcheckpass/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kcheckpass/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kcheckpass.1 b/doc/man/kcheckpass/kcheckpass.1
index fa5a4c817..fa5a4c817 100644
--- a/doc/man/kcheckpass.1
+++ b/doc/man/kcheckpass/kcheckpass.1
diff --git a/doc/man/kcminit/CMakeLists.txt b/doc/man/kcminit/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kcminit/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kcminit.1 b/doc/man/kcminit/kcminit.1
index 4c557456e..4c557456e 100644
--- a/doc/man/kcminit.1
+++ b/doc/man/kcminit/kcminit.1
diff --git a/doc/man/kdcop/CMakeLists.txt b/doc/man/kdcop/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kdcop/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kdcop.1 b/doc/man/kdcop/kdcop.1
index 1c01dcc47..1c01dcc47 100644
--- a/doc/man/kdcop.1
+++ b/doc/man/kdcop/kdcop.1
diff --git a/doc/man/kdialog/CMakeLists.txt b/doc/man/kdialog/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kdialog/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kdialog.1 b/doc/man/kdialog/kdialog.1
index 243709ed1..243709ed1 100644
--- a/doc/man/kdialog.1
+++ b/doc/man/kdialog/kdialog.1
diff --git a/doc/man/kfind/CMakeLists.txt b/doc/man/kfind/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kfind/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kfind.1 b/doc/man/kfind/kfind.1
index 55542fd66..55542fd66 100644
--- a/doc/man/kfind.1
+++ b/doc/man/kfind/kfind.1
diff --git a/doc/man/khotkeys/CMakeLists.txt b/doc/man/khotkeys/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/khotkeys/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/khotkeys.1 b/doc/man/khotkeys/khotkeys.1
index 34d754b05..34d754b05 100644
--- a/doc/man/khotkeys.1
+++ b/doc/man/khotkeys/khotkeys.1
diff --git a/doc/man/kicker/CMakeLists.txt b/doc/man/kicker/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kicker/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/appletproxy.1 b/doc/man/kicker/appletproxy.1
index 3ab13208f..3ab13208f 100644
--- a/doc/man/appletproxy.1
+++ b/doc/man/kicker/appletproxy.1
diff --git a/doc/man/extensionproxy.1 b/doc/man/kicker/extensionproxy.1
index 4ea041189..4ea041189 100644
--- a/doc/man/extensionproxy.1
+++ b/doc/man/kicker/extensionproxy.1
diff --git a/doc/man/kasbar.1 b/doc/man/kicker/kasbar.1
index 7d57958d2..7d57958d2 100644
--- a/doc/man/kasbar.1
+++ b/doc/man/kicker/kasbar.1
diff --git a/doc/man/kicker.1 b/doc/man/kicker/kicker.1
index 1d17fa199..1d17fa199 100644
--- a/doc/man/kicker.1
+++ b/doc/man/kicker/kicker.1
diff --git a/doc/man/kmenuedit/CMakeLists.txt b/doc/man/kmenuedit/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kmenuedit/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kmenuedit.1 b/doc/man/kmenuedit/kmenuedit.1
index fd5c7daf5..fd5c7daf5 100644
--- a/doc/man/kmenuedit.1
+++ b/doc/man/kmenuedit/kmenuedit.1
diff --git a/doc/man/knetattach/CMakeLists.txt b/doc/man/knetattach/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/knetattach/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/knetattach.1 b/doc/man/knetattach/knetattach.1
index 84bc38fcf..84bc38fcf 100644
--- a/doc/man/knetattach.1
+++ b/doc/man/knetattach/knetattach.1
diff --git a/doc/man/konqueror/CMakeLists.txt b/doc/man/konqueror/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/konqueror/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/keditbookmarks.1 b/doc/man/konqueror/keditbookmarks.1
index 23606dccb..23606dccb 100644
--- a/doc/man/keditbookmarks.1
+++ b/doc/man/konqueror/keditbookmarks.1
diff --git a/doc/man/kfmclient.1 b/doc/man/konqueror/kfmclient.1
index 67cbed380..67cbed380 100644
--- a/doc/man/kfmclient.1
+++ b/doc/man/konqueror/kfmclient.1
diff --git a/doc/man/konqueror.1 b/doc/man/konqueror/konqueror.1
index 0515c4f87..0515c4f87 100644
--- a/doc/man/konqueror.1
+++ b/doc/man/konqueror/konqueror.1
diff --git a/doc/man/konsole/CMakeLists.txt b/doc/man/konsole/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/konsole/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/konsole.1 b/doc/man/konsole/konsole.1
index 5de5500b4..5de5500b4 100644
--- a/doc/man/konsole.1
+++ b/doc/man/konsole/konsole.1
diff --git a/doc/man/kpager/CMakeLists.txt b/doc/man/kpager/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kpager/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kpager.1 b/doc/man/kpager/kpager.1
index 63a24f267..63a24f267 100644
--- a/doc/man/kpager.1
+++ b/doc/man/kpager/kpager.1
diff --git a/doc/man/kpersonalizer/CMakeLists.txt b/doc/man/kpersonalizer/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kpersonalizer/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kpersonalizer.1 b/doc/man/kpersonalizer/kpersonalizer.1
index 01dc0b3cc..01dc0b3cc 100644
--- a/doc/man/kpersonalizer.1
+++ b/doc/man/kpersonalizer/kpersonalizer.1
diff --git a/doc/man/kreadconfig/CMakeLists.txt b/doc/man/kreadconfig/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kreadconfig/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kreadconfig.1 b/doc/man/kreadconfig/kreadconfig.1
index 3bb6c4d0b..3bb6c4d0b 100644
--- a/doc/man/kreadconfig.1
+++ b/doc/man/kreadconfig/kreadconfig.1
diff --git a/doc/man/kwriteconfig.1 b/doc/man/kreadconfig/kwriteconfig.1
index b347b9849..b347b9849 100644
--- a/doc/man/kwriteconfig.1
+++ b/doc/man/kreadconfig/kwriteconfig.1
diff --git a/doc/man/kstart/CMakeLists.txt b/doc/man/kstart/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kstart/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kstart.1 b/doc/man/kstart/kstart.1
index 9d3a77ddc..9d3a77ddc 100644
--- a/doc/man/kstart.1
+++ b/doc/man/kstart/kstart.1
diff --git a/doc/man/ksystraycmd/CMakeLists.txt b/doc/man/ksystraycmd/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/ksystraycmd/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/ksystraycmd.1 b/doc/man/ksystraycmd/ksystraycmd.1
index 4807276c0..4807276c0 100644
--- a/doc/man/ksystraycmd.1
+++ b/doc/man/ksystraycmd/ksystraycmd.1
diff --git a/doc/man/kxkb/CMakeLists.txt b/doc/man/kxkb/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/kxkb/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kxkb.1 b/doc/man/kxkb/kxkb.1
index 9a6a6bcf6..9a6a6bcf6 100644
--- a/doc/man/kxkb.1
+++ b/doc/man/kxkb/kxkb.1
diff --git a/doc/man/starttde/CMakeLists.txt b/doc/man/starttde/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/starttde/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/starttde.1 b/doc/man/starttde/starttde.1
index 73ab27b9c..73ab27b9c 100644
--- a/doc/man/starttde.1
+++ b/doc/man/starttde/starttde.1
diff --git a/doc/man/tdedebugdialog/CMakeLists.txt b/doc/man/tdedebugdialog/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdedebugdialog/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/tdedebugdialog.1 b/doc/man/tdedebugdialog/tdedebugdialog.1
index af48f59e6..af48f59e6 100644
--- a/doc/man/tdedebugdialog.1
+++ b/doc/man/tdedebugdialog/tdedebugdialog.1
diff --git a/doc/man/tdeio_system_documenthelper.1 b/doc/man/tdeio_system_documenthelper.1
deleted file mode 100644
index 270dd86e6..000000000
--- a/doc/man/tdeio_system_documenthelper.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
-.SH NAME
-tdeio_system_documenthelper
-\- TDE helper script used by document.desktop
-.SH SYNOPSIS
-\fBtdeio_system_documenthelper\fP
-
-.SH DESCRIPTION
-The script is used by document.desktop entry to determine if it must be shown or not.
-
-.SH AUTHORS
-.nf
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/doc/man/tdeioslave/CMakeLists.txt b/doc/man/tdeioslave/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdeioslave/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/ktrash.1 b/doc/man/tdeioslave/ktrash.1
index 0094c84fa..0094c84fa 100644
--- a/doc/man/ktrash.1
+++ b/doc/man/tdeioslave/ktrash.1
diff --git a/doc/man/tdeio_media_mounthelper.1 b/doc/man/tdeioslave/tdeio_media_mounthelper.1
index 1e7b055f6..1e7b055f6 100644
--- a/doc/man/tdeio_media_mounthelper.1
+++ b/doc/man/tdeioslave/tdeio_media_mounthelper.1
diff --git a/doc/man/tdepasswd/CMakeLists.txt b/doc/man/tdepasswd/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdepasswd/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/tdepasswd.1 b/doc/man/tdepasswd/tdepasswd.1
index e09aff0e2..e09aff0e2 100644
--- a/doc/man/tdepasswd.1
+++ b/doc/man/tdepasswd/tdepasswd.1
diff --git a/doc/man/tdeprint/CMakeLists.txt b/doc/man/tdeprint/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdeprint/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kjobviewer.1 b/doc/man/tdeprint/kjobviewer.1
index 6dae2692e..6dae2692e 100644
--- a/doc/man/kjobviewer.1
+++ b/doc/man/tdeprint/kjobviewer.1
diff --git a/doc/man/kprinter.1 b/doc/man/tdeprint/kprinter.1
index a3ecdc88b..a3ecdc88b 100644
--- a/doc/man/kprinter.1
+++ b/doc/man/tdeprint/kprinter.1
diff --git a/doc/man/tdeprintfax.1 b/doc/man/tdeprint/tdeprintfax.1
index e407c294e..e407c294e 100644
--- a/doc/man/tdeprintfax.1
+++ b/doc/man/tdeprint/tdeprintfax.1
diff --git a/doc/man/tdescreensaver/CMakeLists.txt b/doc/man/tdescreensaver/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdescreensaver/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/kblankscrn.kss.1 b/doc/man/tdescreensaver/kblankscrn.kss.1
index 46b2d4e1a..46b2d4e1a 100644
--- a/doc/man/kblankscrn.kss.1
+++ b/doc/man/tdescreensaver/kblankscrn.kss.1
diff --git a/doc/man/krandom.kss.1 b/doc/man/tdescreensaver/krandom.kss.1
index 4a13d95ec..4a13d95ec 100644
--- a/doc/man/krandom.kss.1
+++ b/doc/man/tdescreensaver/krandom.kss.1
diff --git a/doc/man/tdesu/CMakeLists.txt b/doc/man/tdesu/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdesu/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/tdesu.1 b/doc/man/tdesu/tdesu.1
index fa8c45e09..fa8c45e09 100644
--- a/doc/man/tdesu.1
+++ b/doc/man/tdesu/tdesu.1
diff --git a/doc/man/tdm/CMakeLists.txt b/doc/man/tdm/CMakeLists.txt
new file mode 100644
index 000000000..65c83b94f
--- /dev/null
+++ b/doc/man/tdm/CMakeLists.txt
@@ -0,0 +1,7 @@
+file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 )
+
+install(
+    FILES ${_man_files}
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/doc/man/gentdmconf.1 b/doc/man/tdm/gentdmconf.1
index d98e166c2..d98e166c2 100644
--- a/doc/man/gentdmconf.1
+++ b/doc/man/tdm/gentdmconf.1
diff --git a/doc/man/krootimage.1 b/doc/man/tdm/krootimage.1
index e9b19a604..e9b19a604 100644
--- a/doc/man/krootimage.1
+++ b/doc/man/tdm/krootimage.1
diff --git a/doc/man/tdm.1 b/doc/man/tdm/tdm.1
index 1150fe5a8..1150fe5a8 100644
--- a/doc/man/tdm.1
+++ b/doc/man/tdm/tdm.1
diff --git a/doc/man/tdm_config.1 b/doc/man/tdm/tdm_config.1
index b8753b168..b8753b168 100644
--- a/doc/man/tdm_config.1
+++ b/doc/man/tdm/tdm_config.1
diff --git a/doc/man/tdm_greet.1 b/doc/man/tdm/tdm_greet.1
index 10b7bde6e..10b7bde6e 100644
--- a/doc/man/tdm_greet.1
+++ b/doc/man/tdm/tdm_greet.1
diff --git a/doc/man/tdmctl.1 b/doc/man/tdm/tdmctl.1
index 82be6ae16..82be6ae16 100644
--- a/doc/man/tdmctl.1
+++ b/doc/man/tdm/tdmctl.1
diff --git a/doc/tdeprint/index.docbook b/doc/tdeprint/index.docbook
index 225469889..a1633fcec 100644
--- a/doc/tdeprint/index.docbook
+++ b/doc/tdeprint/index.docbook
@@ -20,7 +20,7 @@
   <!ENTITY external-command-doc SYSTEM "external-command.docbook">
   <!ENTITY extensions-doc SYSTEM "extensions.docbook">
   <!ENTITY final-word-doc SYSTEM "final-word.docbook">
-  <!ENTITY kappname "&tdeprint;"><!-- replace kapp here -->
+  <!ENTITY kappname "&tdeprint;"><!-- replace tdeApp here -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
 ]>
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index ac82e4417..1f2521781 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -30,9 +30,9 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <tdetempfile.h>
@@ -100,7 +100,7 @@ void BackTrace::start()
     return;
   }
   m_temp = new KTempFile;
-  m_temp->setAutoDelete(TRUE);
+  m_temp->setAutoDelete(true);
   int handle = m_temp->handle();
   TQString backtraceCommand = m_krashconf->backtraceCommand();
   const char* bt = backtraceCommand.latin1();
@@ -114,7 +114,7 @@ void BackTrace::start()
 
   // write the debugger command
   m_temp_cmd = new KTempFile(TQString::null, TQString::null, 0700);
-  m_temp_cmd->setAutoDelete(TRUE);
+  m_temp_cmd->setAutoDelete(true);
   handle = m_temp_cmd->handle();
   const char* dbgcommand = str.latin1();
   ::write(handle, dbgcommand, strlen(dbgcommand)); // the command to execute the debugger
@@ -148,10 +148,10 @@ void BackTrace::start()
     *m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\"";
   }
 
-  connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
-          TQT_SLOT(slotReadInput(TDEProcess*, char*, int)));
-  connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)),
-          TQT_SLOT(slotProcessExited(TDEProcess*)));
+  connect(m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+          TQ_SLOT(slotReadInput(TDEProcess*, char*, int)));
+  connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)),
+          TQ_SLOT(slotProcessExited(TDEProcess*)));
 
   m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All );
 }
@@ -238,12 +238,12 @@ bool BackTrace::usefulBacktrace()
 // remove stack frames added because of TDECrash
 void BackTrace::processBacktrace()
 {
-	if( !m_krashconf->kcrashRegExp().isEmpty()) {
-		TQRegExp kcrashregexp( m_krashconf->kcrashRegExp());
-		kcrashregexp.setMinimal(true);
+	if( !m_krashconf->tdecrashRegExp().isEmpty()) {
+		TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExp());
+		tdecrashregexp.setMinimal(true);
 		int pos = 0;
 		int prevpos = 0;
-		while ((pos = kcrashregexp.search( m_strBt, pos )) >= 0) {
+		while ((pos = tdecrashregexp.search( m_strBt, pos )) >= 0) {
 			if (prevpos == pos) {
 				// Avoid infinite loop
 				// Shouldn't ever get here, but given that this is a crash handler, better safe than sorry!
@@ -251,15 +251,15 @@ void BackTrace::processBacktrace()
 			}
 			prevpos = pos;
 			if( pos >= 0 ) {
-				int len = kcrashregexp.matchedLength();
+				int len = tdecrashregexp.matchedLength();
 				int nextinfochunkpos = m_strBt.find("====", pos);
 				if (nextinfochunkpos >= 0) {
 					// Trying to delete too much!
 					int limitedlen = nextinfochunkpos - pos;
 					TQString limitedstrBt = m_strBt.mid(pos, limitedlen);
-					int limitedpos = kcrashregexp.search( limitedstrBt );
+					int limitedpos = tdecrashregexp.search( limitedstrBt );
 					if (limitedpos >= 0) {
-						len = kcrashregexp.matchedLength();
+						len = tdecrashregexp.matchedLength();
 					}
 					else {
 						len = 0;
@@ -287,11 +287,11 @@ void BackTrace::processBacktrace()
 			}
 		}
 	}
-	if( !m_krashconf->kcrashRegExpSingle().isEmpty()) {
-		TQRegExp kcrashregexp( m_krashconf->kcrashRegExpSingle());
-		int pos = kcrashregexp.search( m_strBt );
+	if( !m_krashconf->tdecrashRegExpSingle().isEmpty()) {
+		TQRegExp tdecrashregexp( m_krashconf->tdecrashRegExpSingle());
+		int pos = tdecrashregexp.search( m_strBt );
 		if( pos >= 0 ) {
-			int len = kcrashregexp.matchedLength();
+			int len = tdecrashregexp.matchedLength();
 			if( m_strBt[ pos ] == '\n' ) {
 				++pos;
 				--len;
@@ -381,10 +381,10 @@ void BackTrace::processBacktrace()
 
 	{
 		// Clean up hard to read debug blocks
-		TQRegExp kcrashregexp( "[^\n]\n==== ");
-		kcrashregexp.setMinimal(true);
+		TQRegExp tdecrashregexp( "[^\n]\n==== ");
+		tdecrashregexp.setMinimal(true);
 		int pos = 0;
-		while ((pos = kcrashregexp.search( m_strBt, pos )) >= 0) {
+		while ((pos = tdecrashregexp.search( m_strBt, pos )) >= 0) {
 			m_strBt.insert(pos+1, "\n");
 		}
 	}
diff --git a/drkonqi/bugdescriptiondialog.cpp b/drkonqi/bugdescriptiondialog.cpp
index 32c7b4b2d..ba9e832eb 100644
--- a/drkonqi/bugdescriptiondialog.cpp
+++ b/drkonqi/bugdescriptiondialog.cpp
@@ -31,8 +31,8 @@
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
 #include <kurllabel.h>
diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp
index f1ff70df4..0141b1031 100644
--- a/drkonqi/crashtest.cpp
+++ b/drkonqi/crashtest.cpp
@@ -21,7 +21,7 @@ void WorkerObject::run()
 #define SET_UP_WORKER(x, y)												\
 	WorkerObject x;													\
 	x.moveToThread(&y);												\
-	TQTimer::singleShot(0, &x, SLOT(run()));
+	TQTimer::singleShot(0, &x, TQ_SLOT(run()));
 
 static TDECmdLineOptions options[] =
 {
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index 4e3622e12..f4f883d6a 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -51,7 +51,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
     m_proctrace(0)
 {
   TQVBoxLayout *vbox = new TQVBoxLayout( this, 0, KDialog::marginHint() );
-  vbox->setAutoAdd(TRUE);
+  vbox->setAutoAdd(true);
 
   m_backtrace = new KTextBrowser(this);
   m_backtrace->setTextFormat(TQt::PlainText);
@@ -64,10 +64,10 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
   //m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
   KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "edit-copy" ) );
   m_copyButton = new KPushButton( item, w );
-  connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
+  connect( m_copyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) );
   m_copyButton->setEnabled( false );
   m_saveButton = new KPushButton( m_krashconf->safeMode() ? KStdGuiItem::save() : KStdGuiItem::saveAs(), w );
-  connect( m_saveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) );
+  connect( m_saveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) );
   m_saveButton->setEnabled( false );
 }
 
@@ -95,7 +95,7 @@ void KrashDebugger :: slotSave()
 {
   if (m_krashconf->safeMode())
   {
-    KTempFile tf(TQString::fromAscii("/tmp/"), TQString::fromAscii(".kcrash"), 0600);
+    KTempFile tf(TQString::fromAscii("/tmp/"), TQString::fromAscii(".tdecrash"), 0600);
     if (!tf.status())
     {
       *tf.textStream() << m_backtrace->text();
@@ -109,7 +109,7 @@ void KrashDebugger :: slotSave()
   }
   else
   {
-    TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
+    TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".tdecrash" );
     if( defname.contains( '/' ))
         defname = defname.mid( defname.findRev( '/' ) + 1 );
     TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
@@ -193,12 +193,12 @@ void KrashDebugger :: startDebugger()
   }
   m_status->setText(i18n("Loading symbols..."));
 
-  m_proctrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
+  m_proctrace = new BackTrace(m_krashconf, this);
 
-  connect(m_proctrace, TQT_SIGNAL(append(const TQString &)),
-          TQT_SLOT(slotAppend(const TQString &)));
-  connect(m_proctrace, TQT_SIGNAL(done(const TQString&)), TQT_SLOT(slotDone(const TQString&)));
-  connect(m_proctrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSomeError()));
+  connect(m_proctrace, TQ_SIGNAL(append(const TQString &)),
+          TQ_SLOT(slotAppend(const TQString &)));
+  connect(m_proctrace, TQ_SIGNAL(done(const TQString&)), TQ_SLOT(slotDone(const TQString&)));
+  connect(m_proctrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSomeError()));
 
   m_proctrace->start();
 }
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index 12c8064e0..384ac76d0 100644
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@@ -110,8 +110,8 @@ void KrashConfig :: readConfig()
   m_invalidStackFrameRegExp = debuggers.readEntry("InvalidStackFrameRegExp");
   m_frameRegExp = debuggers.readEntry("FrameRegExp");
   m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
-  m_kcrashRegExp = debuggers.readEntry("TDECrashRegExp");
-  m_kcrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle");
+  m_tdecrashRegExp = debuggers.readEntry("TDECrashRegExp");
+  m_tdecrashRegExpSingle = debuggers.readEntry("TDECrashRegExpSingle");
   m_threadRegExp = debuggers.readEntry("ThreadRegExp");
   m_infoSharedLibraryHeader = debuggers.readEntry("InfoSharedLibraryHeader");
 
diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h
index be823cba1..409ca51b1 100644
--- a/drkonqi/krashconf.h
+++ b/drkonqi/krashconf.h
@@ -1,5 +1,5 @@
 /*****************************************************************
- * drkonqi - The KDE Crash Handler
+ * drkonqi - The TDE Crash Handler
  *
  * Copyright (C) 2000-2003 Hans Petter Bieker <bieker@kde.org>
  *
@@ -65,8 +65,8 @@ public:
   TQString invalidStackFrameRegExp() const { return m_invalidStackFrameRegExp; }
   TQString frameRegExp() const { return m_frameRegExp; }
   TQString neededInValidBacktraceRegExp() const { return m_neededInValidBacktraceRegExp; }
-  TQString kcrashRegExp() const { return m_kcrashRegExp; }
-  TQString kcrashRegExpSingle() const { return m_kcrashRegExpSingle; }
+  TQString tdecrashRegExp() const { return m_tdecrashRegExp; }
+  TQString tdecrashRegExpSingle() const { return m_tdecrashRegExpSingle; }
   TQString threadRegExp() const { return m_threadRegExp; }
   TQString infoSharedLibraryHeader() const { return m_infoSharedLibraryHeader; }
   bool showBacktrace() const { return m_showbacktrace; };
@@ -110,8 +110,8 @@ private:
   TQString m_invalidStackFrameRegExp;
   TQString m_frameRegExp;
   TQString m_neededInValidBacktraceRegExp;
-  TQString m_kcrashRegExp;
-  TQString m_kcrashRegExpSingle;
+  TQString m_tdecrashRegExp;
+  TQString m_tdecrashRegExpSingle;
   TQString m_threadRegExp;
   TQString m_infoSharedLibraryHeader;
 };
diff --git a/drkonqi/sha1.cpp b/drkonqi/sha1.cpp
index 86dd30a99..c2619d3a6 100644
--- a/drkonqi/sha1.cpp
+++ b/drkonqi/sha1.cpp
@@ -26,9 +26,6 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h> /* For uintXX_t on OSX */
 #endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h> /* For uintXX_t on Tru64 */
-#endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index 297181d89..d0a11d80e 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -31,11 +31,11 @@
 
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kbugreport.h>
 #include <tdefiledialog.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdetempfile.h>
@@ -89,11 +89,11 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
   showButton( User2, m_krashconf->showDebugger() );
   showButton( User3, true );
 
-  connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(accept()));
-  connect(m_krashconf, TQT_SIGNAL(newDebuggingApplication(const TQString&)), TQT_SLOT(slotNewDebuggingApp(const TQString&)));
+  connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(accept()));
+  connect(m_krashconf, TQ_SIGNAL(newDebuggingApplication(const TQString&)), TQ_SLOT(slotNewDebuggingApp(const TQString&)));
 
-  if ( !m_krashconf->safeMode() && kapp->dcopClient()->attach() )
-    kapp->dcopClient()->registerAs( kapp->name() );
+  if ( !m_krashconf->safeMode() && tdeApp->dcopClient()->attach() )
+    tdeApp->dcopClient()->registerAs( tdeApp->name() );
 }
 
 Toplevel :: ~Toplevel()
@@ -159,9 +159,9 @@ void Toplevel :: slotUser1()
     TQApplication::setOverrideCursor ( TQt::waitCursor );
 
     // generate the backtrace
-    BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
-    connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError()));
-    connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotBacktraceDone(const TQString &)));
+    BackTrace *backtrace = new BackTrace(m_krashconf, this);
+    connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotBacktraceSomeError()));
+    connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotBacktraceDone(const TQString &)));
 
     backtrace->start();
 
@@ -198,9 +198,9 @@ void Toplevel :: slotUser3()
 	TQApplication::setOverrideCursor ( TQt::waitCursor );
 
 	// generate the backtrace
-	BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
-	connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSendReportBacktraceSomeError()));
-	connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotSendReportBacktraceDone(const TQString &)));
+	BackTrace *backtrace = new BackTrace(m_krashconf, this);
+	connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSendReportBacktraceSomeError()));
+	connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotSendReportBacktraceDone(const TQString &)));
 
 	backtrace->start();
 
@@ -399,13 +399,13 @@ int Toplevel::postCrashDataToServer(TQCString data) {
 	TDEIO::TransferJob* job = TDEIO::http_post(url, postData, true);
 	job->addMetaData("content-type", TQString("Content-Type: multipart/form-data; boundary=%1").arg(formDataBoundary));
 	job->addMetaData("referrer", "http://drkonqi-client.crashreport.trinitydesktop.org");
-	connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &)));
-	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(postCrashDataToServerResult(TDEIO::Job *)));
-// 	connect(job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-// 		TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-// 	connect(job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-// 		TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-	connect(job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQT_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&)));
+	connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &)));
+	connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(postCrashDataToServerResult(TDEIO::Job *)));
+// 	connect(job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+// 		TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+// 	connect(job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+// 		TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+	connect(job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQ_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&)));
 
 	return 0;
 }
diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp
index 51d30dee5..6a54f1a05 100644
--- a/kappfinder/common.cpp
+++ b/kappfinder/common.cpp
@@ -20,9 +20,9 @@
 */
 
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqdir.h>
 #include <tqfile.h>
@@ -50,7 +50,7 @@ void copyFile( const TQString &inFileName, const TQString &outFileName )
 bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
                       TQString destDir )
 {
-  KDesktopFile desktop( templ, true );
+  TDEDesktopFile desktop( templ, true );
 
   // find out where to put the .desktop files
   TQString destName;
diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp
index c56179548..214e596fd 100644
--- a/kappfinder/main_install.cpp
+++ b/kappfinder/main_install.cpp
@@ -21,9 +21,9 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqstringlist.h>
 
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index fd6fd1283..dd4958657 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
@@ -31,7 +31,7 @@
 #include <kprogress.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 #include <tdestartupinfo.h>
 
@@ -77,23 +77,23 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   layout->addWidget( mSummary );
 
   KButtonBox* bbox = new KButtonBox( this );
-  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) );
+  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), this, TQ_SLOT( slotScan() ) );
   bbox->addStretch( 5 );
-  mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this),
-                                   TQT_SLOT( slotSelectAll() ) );
+  mSelectButton = bbox->addButton( i18n( "Select All" ), this,
+                                   TQ_SLOT( slotSelectAll() ) );
   mSelectButton->setEnabled( false );
-  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this),
-                                     TQT_SLOT( slotUnselectAll() ) );
+  mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this,
+                                     TQ_SLOT( slotUnselectAll() ) );
   mUnSelectButton->setEnabled( false );
   bbox->addStretch( 5 );
-  mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) );
+  mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQ_SLOT( slotCreate() ) );
   mApplyButton->setEnabled( false );
-  bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) );
+  bbox->addButton( KStdGuiItem::close(), tdeApp, TQ_SLOT( quit() ) );
   bbox->layout();
 
   layout->addWidget( bbox );
 
-	connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );
+	connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) );
 
   mAppCache.setAutoDelete( true );
 
@@ -105,7 +105,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
   TDEStartupInfo::appStarted();
 
   TQAccel *accel = new TQAccel( this );
-  accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) );
+  accel->connectItem( accel->insertItem( Key_Q + CTRL ), tdeApp, TQ_SLOT( quit() ) );
 
   TDEAcceleratorManager::manage( this );
 }
@@ -202,7 +202,7 @@ void TopLevel::slotScan()
     if (found)
        continue; 
 
-    KDesktopFile desktop( *it, true );
+    TDEDesktopFile desktop( *it, true );
 
     // copy over the desktop file, if exists
     if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) {
diff --git a/kate/app/CMakeLists.txt b/kate/app/CMakeLists.txt
index 77908ffcf..0cc100efc 100644
--- a/kate/app/CMakeLists.txt
+++ b/kate/app/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  -include tqt.h
-)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 0176545fa..613e9f604 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -39,7 +39,7 @@
 #include <klibloader.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestartupinfo.h>
 
 #include <tqfile.h>
@@ -69,10 +69,10 @@ KateApp::KateApp (TDECmdLineArgs *args)
   m_application = new Kate::Application (this);
 
   // doc + project man
-  m_docManager = new KateDocManager (TQT_TQOBJECT(this));
+  m_docManager = new KateDocManager (this);
 
   // init all normal plugins
-  m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this));
+  m_pluginManager = new KatePluginManager (this);
 
   // session manager up
   m_sessionManager = KateSessionManager::self();
@@ -113,7 +113,7 @@ KateApp::~KateApp ()
 
 KateApp *KateApp::self ()
 {
-  return (KateApp *) kapp;
+  return (KateApp *) tdeApp;
 }
 
 Kate::Application *KateApp::application ()
@@ -239,7 +239,7 @@ bool KateApp::startupKate()
     }
     else
       KMessageBox::sorry( activeMainWindow(),
-                          i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(m_args->url(z).url()) );
+                          i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(m_args->url(z).pathOrURL()) );
   }
 
   Kate::Document::setOpenErrorDialogsActivated (true);
@@ -350,9 +350,9 @@ bool KateApp::query_session_close()
       saveSessions = true;
     }
   }
-  
+
   if (saveSessions)
-  {    
+  {
     m_sessionManager->saveActiveSession();
   }
   m_sessionManager->saveConfig(saveSessions);
@@ -403,7 +403,7 @@ bool KateApp::openURL (const KURL &url, const TQString &encoding, bool isTempFil
   }
   else
     KMessageBox::sorry( mainWindow,
-                        i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(url.url()) );
+                        i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(url.pathOrURL()) );
 
   return true;
 }
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h
index 47918a46f..e0c2d4317 100644
--- a/kate/app/kateapp.h
+++ b/kate/app/kateapp.h
@@ -39,7 +39,7 @@ class TDECmdLineArgs;
  * Kate Application
  * This class represents the core kate application object
  */
-class KDE_EXPORT KateApp : public TDEApplication
+class TDE_EXPORT KateApp : public TDEApplication
 {
   TQ_OBJECT
 
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 6fcd4e483..990c163f1 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -44,19 +44,19 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
 #include <tdelistbox.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <kseparator.h>
 
@@ -110,13 +110,13 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   cb_fullPath = new TQCheckBox(i18n("&Show full path in title"), bgStartup);
   cb_fullPath->setChecked(mainWindow->viewManager()->getShowFullPath());
   TQWhatsThis::add(cb_fullPath, i18n("If this option is checked, the full document path will be shown in the window caption."));
-  connect(cb_fullPath, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(cb_fullPath, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   // show session name in title
   cb_showSessionName = new TQCheckBox(i18n("Show s&ession name in title"), bgStartup);
   cb_showSessionName->setChecked(parent->showSessionName);
   TQWhatsThis::add(cb_showSessionName, i18n("If this option is checked, the session name will be shown in the window caption."));
-  connect(cb_showSessionName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(cb_showSessionName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   // sort filelist if desired
   cb_sortFiles = new TQCheckBox(bgStartup);
@@ -124,7 +124,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   cb_sortFiles->setChecked(parent->filelist->sortType() == KateFileList::sortByName);
   TQWhatsThis::add( cb_sortFiles, i18n(
         "If this is checked, the files in the file list will be sorted alphabetically.") );
-  connect( cb_sortFiles, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_sortFiles, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // GROUP with the one below: "Behavior"
   bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Behavior"), frGeneral );
@@ -142,7 +142,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
         "some items forgotten.</qt>") );
   TQWhatsThis::add( lNrf, numRecentFileHelpString );
   TQWhatsThis::add( sb_numRecentFiles, numRecentFileHelpString );
-  connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( sb_numRecentFiles, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   // Use only one instance of kate (MDI) ?
   cb_useInstance = new TQCheckBox(bgStartup);
@@ -151,7 +151,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   TQWhatsThis::add( cb_useInstance, i18n(
         "When checked, all files opened from outside of Kate will only use the "
         "currently opened instance of Kate.") );
-  connect( cb_useInstance, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_useInstance, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // sync the konsole ?
   cb_syncKonsole = new TQCheckBox(bgStartup);
@@ -161,7 +161,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
         "If this is checked, the built in Konsole will <code>cd</code> to the directory "
         "of the active document when started and whenever the active document changes, "
         "if the document is a local file.") );
-  connect( cb_syncKonsole, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_syncKonsole, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // modified files notification
   cb_modNotifications = new TQCheckBox(
@@ -172,8 +172,8 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
       "files that have been modified on the hard disk. If not enabled, you will "
       "be asked what to do with a file that has been modified on the hard disk only "
       "when that file gains focus inside Kate.") );
-  connect( cb_modNotifications, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SLOT( slotChanged() ) );
+  connect( cb_modNotifications, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SLOT( slotChanged() ) );
 
   // GROUP with the one below: "Meta-informations"
   bgStartup = new TQButtonGroup( 2, TQt::Horizontal, i18n("Meta-Information"), frGeneral );
@@ -187,7 +187,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
         "Check this if you want document configuration like for example "
         "bookmarks to be saved past editor sessions. The configuration will be "
         "restored if the document has not changed when reopened."));
-  connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_saveMetaInfos, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   // meta infos days
   TQHBox *hbDmf = new TQHBox( bgStartup );
@@ -198,8 +198,8 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   sb_daysMetaInfos->setSuffix(i18n(" day(s)"));
   sb_daysMetaInfos->setValue( KateDocManager::self()->getDaysMetaInfos() );
   lDmf->setBuddy( sb_daysMetaInfos );
-  connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), hbDmf, TQT_SLOT( setEnabled( bool ) ) );
-  connect( sb_daysMetaInfos, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_saveMetaInfos, TQ_SIGNAL( toggled( bool ) ), hbDmf, TQ_SLOT( setEnabled( bool ) ) );
+  connect( sb_daysMetaInfos, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   lo->addStretch(1); // :-] works correct without autoadd
   //END General page
@@ -224,7 +224,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   cb_restoreVC->setChecked( config->readBoolEntry("Restore Window Configuration", true) );
   TQWhatsThis::add(cb_restoreVC, i18n(
         "Check this if you want all your views and frames restored each time you open Kate"));
-  connect( cb_restoreVC, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( cb_restoreVC, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   TQRadioButton *rb1, *rb2, *rb3;
 
@@ -245,9 +245,9 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   else
     sessions_start->setButton (2);
 
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   sessions_exit = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions );
   lo->add (sessions_exit);
@@ -266,9 +266,9 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   else
     sessions_exit->setButton (2);
 
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   lo->addStretch(1); // :-] works correct without autoadd
   //END Session page
@@ -282,7 +282,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
                               BarIcon("document-open", TDEIcon::SizeSmall) );
   fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
                                          mainWindow->fileselector );
-  connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+  connect( fileSelConfigPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
   path.clear();
 
   path << i18n("Application") << i18n("Document List");
@@ -290,14 +290,14 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   BarIcon("view_text", TDEIcon::SizeSmall) );
   filelistConfigPage = new KFLConfigPage( page, "file list config page",
 					  mainWindow->filelist );
-  connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+  connect( filelistConfigPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
   path.clear();
 
   path << i18n("Application") << i18n("Plugins");
   /*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
                           BarIcon("connect_established",TDEIcon::SizeSmall));
   KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
-  connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
+  connect( configPluginPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
 
   // Tools->External Tools menu
   path.clear();
@@ -305,7 +305,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   page = addVBoxPage( path, i18n("External Tools"),
       BarIcon("configure", TDEIcon::SizeSmall) );
   configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
-  connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
+  connect( configExternalToolsPage, TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()) );
 
   // editor widgets from kwrite/kwdialog
   path.clear();
@@ -320,7 +320,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
                               KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, TDEIcon::SizeSmall) );
 
     KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page);
-    connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+    connect( cPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
     editorPages.append (cPage);
   }
 
@@ -356,7 +356,7 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin)
     PluginPageListItem *info=new PluginPageListItem;
     info->plugin = plugin;
     info->page = Kate::pluginConfigInterfaceExtension(plugin)->configPage (i, page);
-    connect( info->page, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
+    connect( info->page, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
     pluginPages.append(info);
   }
 }
diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp
index 90d7262e5..d2b17eb52 100644
--- a/kate/app/kateconfigplugindialogpage.cpp
+++ b/kate/app/kateconfigplugindialogpage.cpp
@@ -82,7 +82,7 @@ KateConfigPluginPage::KateConfigPluginPage(TQWidget *parent, KateConfigDialog *d
   listView->addColumn(i18n("Comment"));
   TQWhatsThis::add(listView,i18n("Here you can see all available Kate plugins. Those with a check mark are loaded, and will be loaded again the next time Kate is started."));
 
-  connect(listView, TQT_SIGNAL(stateChange(KatePluginListItem *, bool)), this, TQT_SLOT(stateChange(KatePluginListItem *, bool)));
+  connect(listView, TQ_SIGNAL(stateChange(KatePluginListItem *, bool)), this, TQ_SLOT(stateChange(KatePluginListItem *, bool)));
 
   KatePluginList &pluginList (KatePluginManager::self()->pluginList());
   for (unsigned int i=0; i < pluginList.size(); ++i)
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index cb49ef16e..1e87a59d8 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -50,7 +50,7 @@ KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent)
 KateConsole::~KateConsole ()
 {
   if (m_part)
-    disconnect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+    disconnect ( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
 }
 
 void KateConsole::loadConsoleIfNeeded()
@@ -64,7 +64,7 @@ void KateConsole::loadConsoleIfNeeded()
 
   if (!factory) return;
 
-  m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),"libkonsolepart", "KParts::ReadOnlyPart"));
+  m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,"libkonsolepart", "KParts::ReadOnlyPart"));
 
   if (!m_part) return;
 
@@ -74,7 +74,7 @@ void KateConsole::loadConsoleIfNeeded()
 
   m_part->widget()->show();
 
-  connect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+  connect ( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
 
   if (m_mw->viewManager()->activeView())
     if (m_mw->viewManager()->activeView()->getDoc()->url().isValid())
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 9e568ca2f..d592edd13 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -116,7 +116,7 @@ Kate::Document *KateDocManager::createDoc ()
   emit documentCreated ((Kate::Document *)doc);
   emit m_documentManager->documentCreated ((Kate::Document *)doc);
 
-  connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
+  connect(doc,TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
   return (Kate::Document *)doc;
 }
 
@@ -256,7 +256,7 @@ Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encodin
       }
     }
 
-    connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document *)), this, TQT_SLOT(slotModChanged(Kate::Document *)));
+    connect(doc, TQ_SIGNAL(modStateChanged(Kate::Document *)), this, TQ_SLOT(slotModChanged(Kate::Document *)));
 
     emit initialDocumentReplaced();
 
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index dcfc6494e..a52c70618 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -92,7 +92,7 @@ bool KateExternalTool::checkExec()
   if ( tryexec.isEmpty() )
     tryexec = command.section( " ", 0, 0, TQString::SectionSkipEmpty );
 
-  // NOTE this code is modified taken from kdesktopfile.cpp, from KDesktopFile::tryExec()
+  // NOTE this code is modified taken from tdedesktopfile.cpp, from TDEDesktopFile::tryExec()
   if (!tryexec.isEmpty()) {
     if (tryexec[0] == '/') {
       if (::access(TQFile::encodeName(tryexec), R_OK | X_OK))
@@ -225,7 +225,7 @@ KateExternalToolAction::KateExternalToolAction( TQObject *parent,
   if ( ! t->icon.isEmpty() )
     setIconSet( SmallIconSet( t->icon ) );
 
-  connect( this ,TQT_SIGNAL(activated()), this, TQT_SLOT(slotRun()) );
+  connect( this ,TQ_SIGNAL(activated()), this, TQ_SLOT(slotRun()) );
 }
 
 bool KateExternalToolAction::expandMacro( const TQString &str, TQStringList &ret )
@@ -300,7 +300,7 @@ KateExternalToolsMenuAction::KateExternalToolsMenuAction( const TQString &text,
 
   m_actionCollection = new TDEActionCollection( mainwindow );
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentChanged()),this,TQT_SLOT(slotDocumentChanged()));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentChanged()),this,TQ_SLOT(slotDocumentChanged()));
 
   reload();
 }
@@ -498,7 +498,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   TQToolButton *btnMTW = new TQToolButton(w);
   lo->addWidget( btnMTW, 4, 3 );
   btnMTW->setIconSet(TQIconSet(SmallIcon("wizard")));
-  connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg()));
+  connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg()));
   TQWhatsThis::add( btnMTW, i18n(
       "Click for a dialog that can help you creating a list of mimetypes.") );
 
@@ -562,33 +562,33 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent,
 
   lbTools = new TDEListBox( this );
   lo->addMultiCellWidget( lbTools, 1, 4, 0, 3 );
-  connect( lbTools, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
+  connect( lbTools, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
 
   btnNew = new TQPushButton( i18n("&New..."), this );
   lo->addWidget( btnNew, 5, 0 );
-  connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) );
+  connect( btnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()) );
 
   btnRemove = new TQPushButton( i18n("&Remove"), this );
   lo->addWidget( btnRemove, 5, 2 );
-  connect( btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemove()) );
+  connect( btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemove()) );
 
   btnEdit = new TQPushButton( i18n("&Edit..."), this );
   lo->addWidget( btnEdit, 5, 1 );
-  connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) );
+  connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()) );
 
   TQPushButton *b = new TQPushButton( i18n("Insert &Separator"), this );
   lo->addWidget( b, 5, 3 );
-  connect( b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSeparator()) );
+  connect( b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInsertSeparator()) );
 
   btnMoveUp = new TQPushButton( SmallIconSet("go-up"), "", this );
   lo->addWidget( btnMoveUp, 2, 4 );
-  connect( btnMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUp()) );
+  connect( btnMoveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveUp()) );
 
   btnMoveDwn = new TQPushButton( SmallIconSet("go-down"), "", this );
   lo->addWidget( btnMoveDwn, 3, 4 );
-  connect( btnMoveDwn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDown()) );
+  connect( btnMoveDwn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDown()) );
 
-  connect( lbTools, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this,  TQT_SLOT( slotEdit() ) );
+  connect( lbTools, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this,  TQ_SLOT( slotEdit() ) );
 
   lo->setRowStretch( 1, 1 );
   lo->setRowStretch( 4, 1 );
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 5379d665d..de749a60a 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -48,6 +48,7 @@
 #include <kstringhandler.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>
+#include <kmimetype.h>
 //END Includes
 
 //BEGIN ToolTip
@@ -107,7 +108,7 @@ KateFileList::KateFileList (KateMainWindow *main,
 
   setupActions ();
 
-  connect(this,TQT_SIGNAL(moved()),this,TQT_SLOT(updateFileListLocations()));
+  connect(this,TQ_SIGNAL(moved()),this,TQ_SLOT(updateFileListLocations()));
 
   for (uint i = 0; i < KateDocManager::self()->documents(); i++)
   {
@@ -115,18 +116,18 @@ KateFileList::KateFileList (KateMainWindow *main,
     slotModChanged (KateDocManager::self()->document(i));
   }
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),
-	  this,TQT_SLOT(slotDocumentCreated(Kate::Document *)));
-  connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)),
-	  this,TQT_SLOT(slotDocumentDeleted(uint)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),
+	  this,TQ_SLOT(slotDocumentCreated(Kate::Document *)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentDeleted(uint)),
+	  this,TQ_SLOT(slotDocumentDeleted(uint)));
 
   // don't Honour KDE single/double click setting, this files are already open,
   // no need for hassle of considering double-click
-  connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-	  this,TQT_SLOT(slotActivateView(TQListViewItem *)));
-  connect(viewManager,TQT_SIGNAL(viewChanged()), this,TQT_SLOT(slotViewChanged()));
-  connect(this,TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )),
-	  this,TQT_SLOT(slotMenu ( TQListViewItem *, const TQPoint &, int )));
+  connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+	  this,TQ_SLOT(slotActivateView(TQListViewItem *)));
+  connect(viewManager,TQ_SIGNAL(viewChanged()), this,TQ_SLOT(slotViewChanged()));
+  connect(this,TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )),
+	  this,TQ_SLOT(slotMenu ( TQListViewItem *, const TQPoint &, int )));
 }
 
 KateFileList::~KateFileList ()
@@ -136,20 +137,20 @@ KateFileList::~KateFileList ()
 
 void KateFileList::setupActions ()
 {
-  windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
-  windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
+  windowNext = KStdAction::back(this, TQ_SLOT(slotPrevDocument()), m_main->actionCollection());
+  windowPrev = KStdAction::forward(this, TQ_SLOT(slotNextDocument()), m_main->actionCollection());
   sortAction = new TDESelectAction( i18n("Sort &By"), 0,
       m_main->actionCollection(), "filelist_sortby"  );
   listMoveFileUp = new TDEAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
   //listMoveFileUp->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Comma));
   listMoveFileDown = new TDEAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
   //listMoveFileDown->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Period));
-  connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
-  connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
+  connect( listMoveFileUp, TQ_SIGNAL(activated()), this, TQ_SLOT(moveFileUp()) );
+  connect( listMoveFileDown, TQ_SIGNAL(activated()), this, TQ_SLOT(moveFileDown()) );
   TQStringList l;
   l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement");
   sortAction->setItems( l );
-  connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
+  connect( sortAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setSortType(int)) );
 }
 
 void KateFileList::updateActions ()
@@ -176,6 +177,7 @@ void KateFileList::keyPressEvent(TQKeyEvent *e) {
 // returning
 void KateFileList::contentsMousePressEvent( TQMouseEvent *e )
 {
+  if (e->button() != TQMouseEvent::LeftButton) return;
   m_lastMouseDownPos = e->pos();
 
   if ( ! itemAt( contentsToViewport( e->pos() ) ) )
@@ -227,9 +229,9 @@ void KateFileList::slotPrevDocument()
 void KateFileList::slotDocumentCreated (Kate::Document *doc)
 {
   new KateFileListItem( this, doc/*, doc->documentNumber()*/ );
-  connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(slotModChanged(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotNameChanged(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
+  connect(doc,TQ_SIGNAL(modStateChanged(Kate::Document *)),this,TQ_SLOT(slotModChanged(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotNameChanged(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
 
   sort();
   updateFileListLocations();
@@ -436,7 +438,7 @@ TQString KateFileList::tooltip( TQListViewItem *item, int )
       str += i18n("<b>This file was changed (deleted) on disk by another program.</b><br />");
   }
 
-  str += i->document()->url().prettyURL();
+  str += i->document()->url().pathOrURL();
   return str;
 }
 
@@ -556,20 +558,27 @@ KateFileListItem::~KateFileListItem()
 {
 }
 
+
 const TQPixmap *KateFileListItem::pixmap ( int column ) const
 {
   if ( column == 0) {
-    static TQPixmap noPm = SmallIcon ("null");
+    static TQMap<TQString, TQPixmap> mimeIcons;
     static TQPixmap modPm = SmallIcon("modified");
     static TQPixmap discPm = SmallIcon("modonhd");
     static TQPixmap modmodPm = SmallIcon("modmod");
 
     const KateDocumentInfo *info = KateDocManager::self()->documentInfo(doc);
+    KMimeType::Ptr mime = KMimeType::findByURL(doc->url());
+
+    if (!mimeIcons.contains(mime->name()))
+    {
+        mimeIcons.insert(mime->name(), mime->pixmap(TDEIcon::Small));
+    }
 
     if (info && info->modifiedOnDisc)
       return doc->isModified() ? &modmodPm : &discPm;
     else
-      return doc->isModified() ? &modPm : &noPm;
+      return doc->isModified() ? &modPm : &mimeIcons[mime->name()];
   }
 
   return 0;
@@ -707,11 +716,11 @@ KFLConfigPage::KFLConfigPage( TQWidget* parent, const char *name, KateFileList *
   reload();
 
   slotEnableChanged();
-  connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotMyChanged()) );
-  connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChanged()) );
-  connect( kcbViewShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) );
-  connect( kcbEditShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) );
-  connect( cmbSort, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMyChanged()) );
+  connect( cbEnableShading, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotMyChanged()) );
+  connect( cbEnableShading, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChanged()) );
+  connect( kcbViewShade, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotMyChanged()) );
+  connect( kcbEditShade, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotMyChanged()) );
+  connect( cmbSort, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMyChanged()) );
 }
 
 void KFLConfigPage::apply()
@@ -732,7 +741,7 @@ void KFLConfigPage::apply()
 void KFLConfigPage::reload()
 {
   // read in from config file
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Filelist" );
   cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) );
   kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) );
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 67ea67a8b..c68b8e031 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -132,8 +132,8 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   dir = new KDirOperator(KURL(), this, "operator");
   dir->setView(KFile::/* Simple */Detail);
   dir->view()->setSelectionMode(KFile::Extended);
-  connect ( dir, TQT_SIGNAL( viewChanged(KFileView *) ),
-                   this, TQT_SLOT( selectorViewChanged(KFileView *) ) );
+  connect ( dir, TQ_SIGNAL( viewChanged(KFileView *) ),
+                   this, TQ_SLOT( selectorViewChanged(KFileView *) ) );
   setStretchFactor(dir, 2);
 
   TDEActionCollection *coll = dir->actionCollection();
@@ -159,37 +159,37 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   filter = new KHistoryCombo( true, filterBox, "filter");
   filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   filterBox->setStretchFactor(filter, 2);
-  connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
+  connect( btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnFilterClick() ) );
 
-  connect( filter, TQT_SIGNAL( activated(const TQString&) ),
-                   TQT_SLOT( slotFilterChange(const TQString&) ) );
-  connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
-           filter, TQT_SLOT( addToHistory(const TQString&) ) );
+  connect( filter, TQ_SIGNAL( activated(const TQString&) ),
+                   TQ_SLOT( slotFilterChange(const TQString&) ) );
+  connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ),
+           filter, TQ_SLOT( addToHistory(const TQString&) ) );
 
   // tdeaction for the dir sync method
   acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0,
-        TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
+        this, TQ_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
   toolbar->setIconText( TDEToolBar::IconOnly );
   toolbar->setIconSize( 16 );
   toolbar->setEnableContextMenu( false );
 
-  connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL&  )),
-             this,  TQT_SLOT( cmbPathActivated( const KURL& ) ));
-  connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString&  )),
-             this,  TQT_SLOT( cmbPathReturnPressed( const TQString& ) ));
-  connect(dir, TQT_SIGNAL(urlEntered(const KURL&)),
-             this, TQT_SLOT(dirUrlEntered(const KURL&)) );
+  connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL&  )),
+             this,  TQ_SLOT( cmbPathActivated( const KURL& ) ));
+  connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString&  )),
+             this,  TQ_SLOT( cmbPathReturnPressed( const TQString& ) ));
+  connect(dir, TQ_SIGNAL(urlEntered(const KURL&)),
+             this, TQ_SLOT(dirUrlEntered(const KURL&)) );
 
-  connect(dir, TQT_SIGNAL(finishedLoading()),
-             this, TQT_SLOT(dirFinishedLoading()) );
+  connect(dir, TQ_SIGNAL(finishedLoading()),
+             this, TQ_SLOT(dirFinishedLoading()) );
 
   // enable dir sync button if current doc has a valid URL
-  connect ( viewmanager, TQT_SIGNAL( viewChanged() ),
-              this, TQT_SLOT( kateViewChanged() ) );
+  connect ( viewmanager, TQ_SIGNAL( viewChanged() ),
+              this, TQ_SLOT( kateViewChanged() ) );
 
   // Connect the bookmark handler
-  connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
-           this, TQT_SLOT( setDir( const TQString& ) ) );
+  connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )),
+           this, TQ_SLOT( setDir( const TQString& ) ) );
 
   waitingUrl = TQString::null;
 
@@ -230,11 +230,11 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
   cmbPath->setMaxItems( config->readNumEntry( "pathcombo history len", 9 ) );
   cmbPath->setURLs( config->readPathListEntry( "dir history" ) );
   // if we restore history
-  if ( config->readBoolEntry( "restore location", true ) || kapp->isRestored() ) {
+  if ( config->readBoolEntry( "restore location", true ) || tdeApp->isRestored() ) {
     TQString loc( config->readPathEntry( "location" ) );
     if ( ! loc.isEmpty() ) {
 //       waitingDir = loc;
-//       TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack()));
+//       TQTimer::singleShot(0, this, TQ_SLOT(initialDirChangeHack()));
       setDir( loc );
     }
   }
@@ -245,7 +245,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
   filter->setHistoryItems( config->readListEntry("filter history"), true );
   lastFilter = config->readEntry( "last filter" );
   TQString flt("");
-  if ( config->readBoolEntry( "restore last filter", true ) || kapp->isRestored() )
+  if ( config->readBoolEntry( "restore last filter", true ) || tdeApp->isRestored() )
     flt = config->readEntry("current filter");
   filter->lineEdit()->setText( flt );
   slotFilterChange( flt );
@@ -537,18 +537,18 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
   acSel->setAvailableLabel( i18n("A&vailable actions:") );
   acSel->setSelectedLabel( i18n("S&elected actions:") );
   lo->addWidget( gbToolbar );
-  connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( added( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( removed( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( acSel, TQ_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // Sync
   TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this );
   cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync );
   cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync );
   lo->addWidget( gbSync );
-  connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( cbSyncActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( cbSyncShow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // Histories
   TQHBox *hbPathHist = new TQHBox ( this );
@@ -556,22 +556,22 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
   sbPathHistLength = new TQSpinBox( hbPathHist );
   lbPathHist->setBuddy( sbPathHistLength );
   lo->addWidget( hbPathHist );
-  connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( sbPathHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   TQHBox *hbFilterHist = new TQHBox ( this );
   TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist );
   sbFilterHistLength = new TQSpinBox( hbFilterHist );
   lbFilterHist->setBuddy( sbFilterHistLength );
   lo->addWidget( hbFilterHist );
-  connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( sbFilterHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // Session
   TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this );
   cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession );
   cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession );
   lo->addWidget( gbSession );
-  connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
-  connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) );
+  connect( cbSesLocation, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
+  connect( cbSesFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) );
 
   // make it look nice
   lo->addStretch( 1 );
@@ -629,7 +629,7 @@ void KFSConfigPage::apply()
 
   m_changed = false;
 
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "fileselector" );
   // toolbar
   TQStringList l;
@@ -671,7 +671,7 @@ void KFSConfigPage::reload()
 }
 void KFSConfigPage::init()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "fileselector" );
   // toolbar
   TQStringList l = config->readListEntry( "toolbar actions", ',' );
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index ddeda4cd4..af0d91784 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -35,7 +35,7 @@
 #include <tdeaccelmanager.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
@@ -153,7 +153,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   loInput->addLayout( loFiles, 2, 1 );
 
   cmbFiles = new KComboBox(true, this);
-  lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
+  lFiles->setBuddy(cmbFiles->focusProxy());
   cmbFiles->setMinimumSize(cmbFiles->sizeHint());
   cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
   cmbFiles->setDuplicatesEnabled(false);
@@ -262,16 +262,16 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   cmbFiles->installEventFilter( this );
   cmbDir->comboBox()->installEventFilter( this );
 
-  connect( cmbTemplate, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(templateActivated(int)) );
-  connect( lbResult, TQT_SIGNAL(selected(const TQString&)),
-           TQT_SLOT(itemSelected(const TQString&)) );
-  connect( btnSearch, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotSearch()) );
-  connect( btnClear, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotClear()) );
-  connect( cmbPattern->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )),
-           TQT_SLOT( patternTextChanged( const TQString & )));
+  connect( cmbTemplate, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(templateActivated(int)) );
+  connect( lbResult, TQ_SIGNAL(selected(const TQString&)),
+           TQ_SLOT(itemSelected(const TQString&)) );
+  connect( btnSearch, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotSearch()) );
+  connect( btnClear, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotClear()) );
+  connect( cmbPattern->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )),
+           TQ_SLOT( patternTextChanged( const TQString & )));
 
   patternTextChanged( cmbPattern->lineEdit()->text());
 }
@@ -321,7 +321,7 @@ void GrepTool::processOutput()
       lbResult->insertItem(item);
     buf = buf.mid(pos+1);
   }
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 void GrepTool::slotSearch()
@@ -370,7 +370,7 @@ void GrepTool::slotSearch()
     *childproc << "-maxdepth" << "1";
   if (!cmbFiles->currentText().isEmpty() )
   {
-    TQStringList files = TQStringList::split ( ",", cmbFiles->currentText(), FALSE );
+    TQStringList files = TQStringList::split ( ",", cmbFiles->currentText(), false );
     *childproc << "(";
     bool first = true;
     for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it )
@@ -389,12 +389,12 @@ void GrepTool::slotSearch()
   *childproc << "/dev/null"; //trick to have grep always display the filename
   *childproc << ";";
 
-  connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)),
-           TQT_SLOT(childExited()) );
-  connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-           TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) );
-  connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-           TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
+  connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)),
+           TQ_SLOT(childExited()) );
+  connect( childproc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+           TQ_SLOT(receivedOutput(TDEProcess *, char *, int)) );
+  connect( childproc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+           TQ_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
 
   // actually it should be checked whether the process was started successfully
   lbResult->setCursor( TQCursor(TQt::WaitCursor) );
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 2d933669a..9afa644cb 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -77,7 +77,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow  *mainwin )
     i++;
   }
   list->hide();
-  connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
+  connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotShowButton()) );
   mw->setMinimumSize( lInfo->sizeHint() );
 }
 
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 2291a8668..cfd158036 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -19,13 +19,13 @@
 
 #include "kateapp.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdestartupinfo.h>
 #include <dcopclient.h>
 #include <dcopref.h>
@@ -57,7 +57,7 @@ static TDECmdLineOptions options[] =
     TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
 {
   TDEConfig * config = NULL;
   bool alwaysUseInstance;
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 906bac6f5..bd44d3ffb 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -45,7 +45,7 @@
 #include "../interfaces/toolviewmanager.h"
 
 #include <dcopclient.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tdecmdlineargs.h>
@@ -55,7 +55,7 @@
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
 #include <kiconloader.h>
@@ -65,14 +65,13 @@
 #include <kmimetype.h>
 #include <kopenwith.h>
 #include <tdepopupmenu.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
-#include <kuniqueapplication.h>
 #include <kurldrag.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <khelpmenu.h>
 #include <tdemultitabbar.h>
 #include <ktip.h>
@@ -151,6 +150,8 @@ KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup)
 
   m_dcop = new KateMainWindowDCOPIface (this);
 
+  m_mainWindow->installEventFilter(this);
+
   // setup the most important widgets
   setupMainWindow();
 
@@ -168,13 +169,13 @@ KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup)
 
   // connect documents menu aboutToshow
   documentMenu = (TQPopupMenu*)factory()->container("documents", this);
-  connect(documentMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(documentMenuAboutToShow()));
+  connect(documentMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(documentMenuAboutToShow()));
 
   // caption update
   for (uint i = 0; i < KateDocManager::self()->documents(); i++)
     slotDocumentCreated (KateDocManager::self()->document(i));
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(slotDocumentCreated(Kate::Document *)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),this,TQ_SLOT(slotDocumentCreated(Kate::Document *)));
 
   readOptions();
 
@@ -213,10 +214,11 @@ void KateMainWindow::setupMainWindow ()
   KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("application-vnd.tde.tdemultiple"), i18n("Documents"));
   filelist = new KateFileList (this, m_viewManager, ft, "filelist");
   filelist->readConfig(KateApp::self()->config(), "Filelist");
+  filelist->viewport()->installEventFilter(this);
 
   KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("document-open"), i18n("Filesystem Browser"));
   fileselector = new KateFileSelector( this, m_viewManager, t, "operator");
-  connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*)));
+  connect(fileselector->dirOperator(),TQ_SIGNAL(fileSelected(const KFileItem*)),this,TQ_SLOT(fileSelected(const KFileItem*)));
 
   KateMDI::ToolView *st = createToolView("kate_sessionpanel", KMultiTabBar::Left, SmallIcon("view_choose"), i18n("Sessions"));
   m_sessionpanel = new KateSessionPanel( this, m_viewManager, st, "sessionpanel");
@@ -226,8 +228,8 @@ void KateMainWindow::setupMainWindow ()
   {
     t = createToolView("kate_greptool", KMultiTabBar::Bottom, SmallIcon("filefind"), i18n("Find in Files") );
     greptool = new GrepTool( t, "greptool" );
-    connect(greptool, TQT_SIGNAL(itemSelected(const TQString &,int)), this, TQT_SLOT(slotGrepToolItemSelected(const TQString &,int)));
-    connect(t,TQT_SIGNAL(visibleChanged(bool)),this, TQT_SLOT(updateGrepDir (bool)));
+    connect(greptool, TQ_SIGNAL(itemSelected(const TQString &,int)), this, TQ_SLOT(slotGrepToolItemSelected(const TQString &,int)));
+    connect(t,TQ_SIGNAL(visibleChanged(bool)),this, TQ_SLOT(updateGrepDir (bool)));
     // WARNING HACK - anders: showing the greptool seems to make the menu accels work
     greptool->show();
 
@@ -243,25 +245,25 @@ void KateMainWindow::setupActions()
 {
   TDEAction *a;
 
-  KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
-  KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
+  KStdAction::openNew( m_viewManager, TQ_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
+  KStdAction::open( m_viewManager, TQ_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
 
-  fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection());
+  fileOpenRecent = KStdAction::openRecent (m_viewManager, TQ_SLOT(openURL (const KURL&)), actionCollection());
   fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
 
-  a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" );
+  a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQ_SLOT( saveAll() ), actionCollection(), "file_save_all" );
   a->setWhatsThis(i18n("Save all open, modified documents to disk."));
 
-  KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
+  KStdAction::close( m_viewManager, TQ_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
 
-  a=new TDEAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
+  a=new TDEAction( i18n( "Clos&e All" ), 0, this, TQ_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
   a->setWhatsThis(i18n("Close all open documents."));
 
-  KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
+  KStdAction::mail( this, TQ_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
 
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
+  KStdAction::quit( this, TQ_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
 
-  a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
+  a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQ_SLOT(newWindow()), actionCollection(), "view_new_view");
   a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list)."));
 
   if ( KateApp::self()->authorize("shell_access") )
@@ -271,64 +273,64 @@ void KateMainWindow::setupActions()
   }
 
   TDEToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this);
-  connect( showFullScreenAction,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(slotFullScreen(bool)));
+  connect( showFullScreenAction,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(slotFullScreen(bool)));
 
   documentOpenWith = new TDEActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with");
   documentOpenWith->setWhatsThis(i18n("Open the current document using another application registered for its file type, or an application of your choice."));
-  connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu()));
-  connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int)));
+  connect(documentOpenWith->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(mSlotFixOpenWithMenu()));
+  connect(documentOpenWith->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenWithMenuAction(int)));
 
-  a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
+  a=KStdAction::keyBindings(this, TQ_SLOT(editKeys()), actionCollection());
   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
 
-  a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+  a=KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
 
-  TDEAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
+  TDEAction* settingsConfigure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection(), "settings_configure");
   settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component."));
 
   // pipe to terminal action
   if (KateApp::self()->authorize("shell_access"))
-    new TDEAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
+    new TDEAction(i18n("&Pipe to Console"), "pipe", 0, console, TQ_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
 
   // tip of the day :-)
-  KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
+  KStdAction::tipOfDay( this, TQ_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
 
   if (KatePluginManager::self()->pluginList().count() > 0)
   {
-    a=new TDEAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
+    a=new TDEAction(i18n("&Plugins Handbook"), 0, this, TQ_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
     a->setWhatsThis(i18n("This shows help files for various available plugins."));
   }
 
-  connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotWindowActivated()));
-  connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdateOpenWith()));
+  connect(m_viewManager,TQ_SIGNAL(viewChanged()),this,TQ_SLOT(slotWindowActivated()));
+  connect(m_viewManager,TQ_SIGNAL(viewChanged()),this,TQ_SLOT(slotUpdateOpenWith()));
 
   slotWindowActivated ();
 
   // session actions
-  new TDEAction(i18n("&New"), "list-add", 0, 
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotNewSession()), actionCollection(), "session_new");
-  new TDEAction(i18n("&Save"), "document-save", 0, 
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSession()), actionCollection(), "session_save");
-  new TDEAction(i18n("Save &As..."), "document-save-as", 0, 
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as");
+  new TDEAction(i18n("&New"), "list-add", 0,
+      m_sessionpanel, TQ_SLOT(slotNewSession()), actionCollection(), "session_new");
+  new TDEAction(i18n("&Save"), "document-save", 0,
+      m_sessionpanel, TQ_SLOT(slotSaveSession()), actionCollection(), "session_save");
+  new TDEAction(i18n("Save &As..."), "document-save-as", 0,
+      m_sessionpanel, TQ_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as");
   new TDEAction(i18n("&Rename"), "edit_user", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotRenameSession()), actionCollection(), "session_rename");
+      m_sessionpanel, TQ_SLOT(slotRenameSession()), actionCollection(), "session_rename");
   new TDEAction(i18n("&Delete"), "edit-delete", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotDeleteSession()), actionCollection(), "session_delete");
+      m_sessionpanel, TQ_SLOT(slotDeleteSession()), actionCollection(), "session_delete");
   new TDEAction(i18n("Re&load"), "reload", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotReloadSession()), actionCollection(), "session_reload");
+      m_sessionpanel, TQ_SLOT(slotReloadSession()), actionCollection(), "session_reload");
   new TDEAction(i18n("Acti&vate"), "forward", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotActivateSession()), actionCollection(), "session_activate");
+      m_sessionpanel, TQ_SLOT(slotActivateSession()), actionCollection(), "session_activate");
   new TDEToggleAction(i18n("Toggle read &only"), "encrypted", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only");
+      m_sessionpanel, TQ_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only");
   new TDEAction(i18n("Move &Up"), "go-up", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up");
+      m_sessionpanel, TQ_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up");
   new TDEAction(i18n("Move Do&wn"), "go-down", 0,
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down");
+      m_sessionpanel, TQ_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down");
   new KateSessionListActionMenu(this, i18n("Sele&ct session"), actionCollection(), "session_list");
 
-  connect(m_sessionpanel, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
+  connect(m_sessionpanel, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 }
 
 KateTabWidget *KateMainWindow::tabWidget ()
@@ -412,7 +414,7 @@ void KateMainWindow::slotEditToolbars()
 {
   saveMainWindowSettings( KateApp::self()->config(), "MainWindow" );
   KEditToolbar dlg( factory() );
-  connect( &dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) );
+  connect( &dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) );
   dlg.exec();
 }
 
@@ -423,7 +425,7 @@ void KateMainWindow::slotNewToolbarConfig()
 
 void KateMainWindow::slotFileQuit()
 {
-  KateApp::self()->shutdownKate(this);  
+  KateApp::self()->shutdownKate(this);
 }
 
 void KateMainWindow::readOptions ()
@@ -514,7 +516,7 @@ void KateMainWindow::documentMenuAboutToShow()
     Kate::Document* doc = ((KateFileListItem *)item)->document();
     documentMenu->insertItem (
           doc->isModified() ? i18n("'document name [*]', [*] means modified", "%1 [*]").arg(name) : name,
-          m_viewManager, TQT_SLOT (activateView (int)), 0,
+          m_viewManager, TQ_SLOT (activateView (int)), 0,
           ((KateFileListItem *)item)->documentNumber () );
 
     item = item->nextSibling();
@@ -596,7 +598,7 @@ void KateMainWindow::slotConfigure()
   dlg->exec();
 
   delete dlg;
-  
+
   // Inform Kate that options may have been changed
   KateApp::self()->reparse_config();
 }
@@ -816,9 +818,9 @@ bool KateMainWindow::showModOnDiskPrompt()
 
 void KateMainWindow::slotDocumentCreated (Kate::Document *doc)
 {
-  connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(updateCaption(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotNameChanged(Kate::Document *)));
-  connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotUpdateOpenWith()));
+  connect(doc,TQ_SIGNAL(modStateChanged(Kate::Document *)),this,TQ_SLOT(updateCaption(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotNameChanged(Kate::Document *)));
+  connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotUpdateOpenWith()));
 
   updateCaption (doc);
 }
@@ -848,7 +850,7 @@ void KateMainWindow::updateCaption(Kate::Document *doc)
   }
   else
   {
-    c = m_viewManager->activeView()->getDoc()->url().prettyURL();
+    c = m_viewManager->activeView()->getDoc()->url().pathOrURL();
   }
 
   if (showSessionName)
@@ -888,6 +890,24 @@ void KateMainWindow::readProperties(TDEConfig *config)
   config->setGroup(grp);
 }
 
+bool KateMainWindow::eventFilter(TQObject *obj, TQEvent *ev)
+{
+    if (ev->type() == TQEvent::MouseButtonRelease)
+    {
+        TQMouseEvent *mouseEvent = static_cast<TQMouseEvent *>(ev);
+        switch (mouseEvent->button())
+        {
+            case TQMouseEvent::HistoryBackButton:
+                filelist->slotPrevDocument();
+                return true;
+            case TQMouseEvent::HistoryForwardButton:
+                filelist->slotNextDocument();
+                return true;
+        }
+    }
+    return false;
+}
+
 //-------------------------------------------
 void KateMainWindow::slotSelectionChanged()
 {
@@ -905,8 +925,8 @@ void KateMainWindow::slotSelectionChanged()
     if (a)
     {
       a->setEnabled((*spa_it)->isEnabled());
-    }  
-  }              
+    }
+  }
 }
 
 //-------------------------------------------
@@ -916,7 +936,7 @@ void KateMainWindow::activateSession(int sessionId)
   {
     return;
   }
-  
+
   // Select the required session in the session panel's listview
   TQListViewItem *item = m_sessionpanel->m_listview->firstChild();
   int idx = 0;
@@ -937,7 +957,7 @@ void KateMainWindow::activateSession(int sessionId)
 KateSessionListActionMenu::KateSessionListActionMenu(KateMainWindow *mw, const TQString &text, TQObject *parent, const char *name)
   : TDEActionMenu(text, parent, name), m_mainWindow(mw)
 {
-  connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShow()));
 }
 
 //-------------------------------------------
@@ -948,6 +968,6 @@ void KateSessionListActionMenu::slotAboutToShow()
   TQPtrList<KateSession> &sessions = KateApp::self()->sessionManager()->getSessionsList();
   for (int idx = 0;  idx < (int)sessions.count();  ++idx)
   {
-    popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQT_SLOT(activateSession(int)), 0, idx);
+    popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQ_SLOT(activateSession(int)), 0, idx);
   }
 }
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index 1e8839991..8901be978 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -105,16 +105,16 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
     bool queryClose_internal();
 
     void openURL (const TQString &name=0L);
-  
+
   public slots:
     /**
      * update "Sessions" menu status when selection in session panel has changed
      */
     void slotSelectionChanged();
-    
+
     /**
      * activate the specified session. When there is the need to activate a session
-     * from the outside (for example from DCOP), using this method assures that 
+     * from the outside (for example from DCOP), using this method assures that
      * the session activation is consistent with the behavior of the session panel
      * @param sessionId the id of the session to activate
      */
@@ -176,9 +176,10 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
 
     void updateGrepDir (bool visible);
     void slotDocumentCloseAll();
-  
+
   protected:
     bool event( TQEvent * );
+    bool eventFilter(TQObject *obj, TQEvent *ev);
 
   private:
     static uint uniqueID;
@@ -215,7 +216,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
 
     KateExternalToolsMenuAction *externalTools;
     GrepTool * greptool;
-    bool m_modignore, m_grrr;
+    bool m_modignore;
 
     KateTabWidget *m_tabWidget;
 };
@@ -230,7 +231,7 @@ class KateSessionListActionMenu : public TDEActionMenu
 
   public slots:
     void slotAboutToShow();
-    
+
   protected:
     KateMainWindow *m_mainWindow;
 };
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index d3d4528b1..679be8a30 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -71,8 +71,8 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor
  : TDEToggleAction(text,cut,parent,name)
  , m_tv(tv)
 {
-  connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
-  connect(m_tv,TQT_SIGNAL(visibleChanged(bool)),this,TQT_SLOT(visibleChanged(bool)));
+  connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool)));
+  connect(m_tv,TQ_SIGNAL(visibleChanged(bool)),this,TQ_SLOT(visibleChanged(bool)));
 
   setChecked(m_tv->visible());
 }
@@ -123,8 +123,8 @@ GUIClient::GUIClient ( MainWindow *mw )
  , KXMLGUIClient ( mw )
  , m_mw (mw)
 {
-  connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
-           this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+  connect( m_mw->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+           this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
 
   if ( domDocument().documentElement().isNull() )
   {
@@ -142,14 +142,14 @@ GUIClient::GUIClient ( MainWindow *mw )
                                             CTRL|ALT|SHIFT|Key_F, actionCollection(), "kate_mdi_sidebar_visibility" );
   m_showSidebarsAction->setCheckedState(i18n("Hide Side&bars"));
   m_showSidebarsAction->setChecked( m_mw->sidebarsVisible() );
-  connect( m_showSidebarsAction, TQT_SIGNAL( toggled( bool ) ),
-           m_mw, TQT_SLOT( setSidebarsVisible( bool ) ) );
+  connect( m_showSidebarsAction, TQ_SIGNAL( toggled( bool ) ),
+           m_mw, TQ_SLOT( setSidebarsVisible( bool ) ) );
 
   m_toolMenu->insert( m_showSidebarsAction );
   m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) );
 
   // read shortcuts
-  actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
+  actionCollection()->readShortcutSettings( "Shortcuts", tdeApp->config() );
 }
 
 GUIClient::~GUIClient()
@@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv)
 
   // try to read the action shortcut
   TDEShortcut sc;
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   TQString _grp = cfg->group();
   cfg->setGroup("Shortcuts");
   sc = TDEShortcut( cfg->readEntry( aname, "" ) );
@@ -256,8 +256,8 @@ bool ToolView::visible () const
 void ToolView::childEvent ( TQChildEvent *ev )
 {
   // set the widget to be focus proxy if possible
-  if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast("TQWidget")) {
-    setFocusProxy (::tqt_cast<TQWidget*>(TQT_TQOBJECT(ev->child())));
+  if (ev->inserted() && ev->child() && ev->child()->tqt_cast("TQWidget")) {
+    setFocusProxy (::tqt_cast<TQWidget*>(ev->child()));
 }
 
   TQVBox::childEvent (ev);
@@ -332,7 +332,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
 
   show ();
 
-  connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+  connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
   tab(newId)->installEventFilter(this);
 
   return widget;
@@ -480,8 +480,8 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
         if (position() != 3)
           p->insertItem(SmallIconSet("go-down"), i18n("Bottom Sidebar"),3);
 
-        connect(p, TQT_SIGNAL(activated(int)),
-              this, TQT_SLOT(buttonPopupActivate(int)));
+        connect(p, TQ_SIGNAL(activated(int)),
+              this, TQ_SLOT(buttonPopupActivate(int)));
 
         p->exec(e->globalPos());
         delete p;
@@ -596,7 +596,7 @@ void Sidebar::restoreSession (TDEConfig *config)
       // readd the button
       int newId = m_widgetToId[tv];
       appendTab (tv->icon, newId, tv->text);
-      connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+      connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
       tab(newId)->installEventFilter(this);
 
       // reshuffle in splitter
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index c908b3617..978095010 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -28,7 +28,7 @@
 #include <tdelistview.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 #include <krun.h>
 #include <tdetempfile.h>
 #include <kpushbutton.h>
@@ -44,7 +44,7 @@ class KateDocItem : public TQCheckListItem
 {
   public:
     KateDocItem( Kate::Document *doc, const TQString &status, TDEListView *lv )
-  : TQCheckListItem( lv, doc->url().prettyURL(), CheckBox ),
+  : TQCheckListItem( lv, doc->url().pathOrURL(), CheckBox ),
         document( doc )
     {
       setText( 1, status );
@@ -99,7 +99,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
   for ( uint i=0; i < docs.size(); i++ )
     new KateDocItem( docs[i], l[ (uint)KateDocManager::self()->documentInfo( docs[i] )->modifiedOnDiscReason ], lvDocuments );
 
-  connect( lvDocuments, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
+  connect( lvDocuments, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
 
   // diff button
   TQHBox *lo2 = new TQHBox ( w );
@@ -111,7 +111,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
       "Calculates the difference between the the editor contents and the disk "
       "file for the selected document, and shows the difference with the "
       "default application. Requires diff(1).") );
-  connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) );
+  connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) );
 
   slotSelectionChanged();
   m_tmpfile = 0;
@@ -143,12 +143,12 @@ void KateMwModOnHdDialog::handleSelected( int action )
   for ( TQListViewItemIterator it ( lvDocuments );  it.current(); ++it )
   {
     KateDocItem *item = static_cast<KateDocItem *>(it.current());
-    
+
     if ( item->isOn() )
     {
       int reason = (int)KateDocManager::self()->documentInfo( item->document )->modifiedOnDiscReason;
       bool succes = true;
-      
+
       Kate::DocumentExt *dext = documentExt( item->document );
       if ( ! dext ) continue;
 
@@ -161,7 +161,7 @@ void KateMwModOnHdDialog::handleSelected( int action )
           {
             KMessageBox::sorry( this,
                                 i18n("Could not save the document \n'%1'").
-                                    arg( item->document->url().prettyURL() ) );
+                                    arg( item->document->url().pathOrURL() ) );
           }
           break;
 
@@ -213,11 +213,11 @@ void KateMwModOnHdDialog::slotDiff()
     return;
 
   // Start a TDEProcess that creates a diff
-  KProcIO *p = new KProcIO();
+  TDEProcIO *p = new TDEProcIO();
   p->setComm( TDEProcess::All );
   *p << "diff" << "-u" << "-" <<  doc->url().path();
-  connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
-  connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
+  connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) );
+  connect( p, TQ_SIGNAL(readReady(TDEProcIO*)), this, TQ_SLOT(slotPRead(TDEProcIO*)) );
 
   setCursor( WaitCursor );
 
@@ -230,7 +230,7 @@ void KateMwModOnHdDialog::slotDiff()
   p->closeWhenDone();
 }
 
-void KateMwModOnHdDialog::slotPRead( KProcIO *p)
+void KateMwModOnHdDialog::slotPRead( TDEProcIO *p)
 {
   // create a file for the diff if we haven't one allready
   if ( ! m_tmpfile )
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index 2ca012f84..e9b867a71 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -25,7 +25,7 @@
 #include <kate/document.h>
 
 typedef  TQPtrVector<Kate::Document> DocVector;
-class KProcIO;
+class TDEProcIO;
 class TDEProcess;
 /**
  * A dialog for handling multiple documents modified on disk
@@ -46,7 +46,7 @@ class KateMwModOnHdDialog : public KDialogBase
   private slots:
     void slotDiff();
     void slotSelectionChanged();
-    void slotPRead(KProcIO*);
+    void slotPRead(TDEProcIO*);
     void slotPDone(TDEProcess*);
 
   private:
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 9ff79dfb4..4fca9b763 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -156,11 +156,11 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate:
 		}
 		m_documentRoot->setOpen(true);
 	} else m_documentRoot=0;
-	connect(m_list, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemSelected()));
-	connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotItemSelected()));
-	connect(m_list, TQT_SIGNAL(spacePressed(TQListViewItem *)), TQT_SLOT(slotItemSelected()));
+	connect(m_list, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemSelected()));
+	connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotItemSelected()));
+	connect(m_list, TQ_SIGNAL(spacePressed(TQListViewItem *)), TQ_SLOT(slotItemSelected()));
 	if(documents.count()>3) { //For 3 or less, it would be quicker just to tick or untick them yourself, so don't clutter the gui.
-		connect(new TQPushButton(i18n("Se&lect All"),box),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSelectAll()));
+		connect(new TQPushButton(i18n("Se&lect All"),box),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSelectAll()));
 	}
 }
 
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index bab8dce56..74c348833 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -22,7 +22,7 @@
 #include "katemainwindow.h"
 #include "katedocmanager.h"
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
@@ -101,7 +101,7 @@ KateSession::KateSession(const KateSession &session, const TQString &newSessionN
   createFilename();
   if (session.m_config)
   {
-    m_config = new KSimpleConfig(m_filename);
+    m_config = new TDESimpleConfig(m_filename);
     session.m_config->copyTo(m_filename, m_config);
     m_config->sync();
   }
@@ -139,7 +139,7 @@ void KateSession::load(bool includeGUIInfo)
   if (TDEGlobal::dirs()->exists(m_filename))
   {
     // Create config object if the session file already exists
-    m_config = new KSimpleConfig(m_filename, m_readOnly);
+    m_config = new TDESimpleConfig(m_filename, m_readOnly);
     m_config->setGroup(KS_GENERAL);
     // Session general properties
     m_sessionName = m_config->readEntry(KS_NAME, i18n(KS_UNNAMED));
@@ -211,7 +211,7 @@ void KateSession::save(bool saveGUIInfo, bool setReadOnly)
   // save session config info
   if (!m_config)
   {
-    m_config = new KSimpleConfig(m_filename);
+    m_config = new TDESimpleConfig(m_filename);
   }
 
   if (m_config->hasGroup(KS_GENERAL))
@@ -342,7 +342,7 @@ KateSessionManager::KateSessionManager() :
   if (TDEGlobal::dirs()->exists(m_configFile))
   {
     // Read new style configuration (from TDE R14.1.0)
-    m_config = new KSimpleConfig(m_configFile);
+    m_config = new TDESimpleConfig(m_configFile);
     m_config->setGroup(KSM_SESSIONS_LIST);
     sessionsCount = m_config->readNumEntry(KSM_SESSIONS_COUNT, 0);
     m_lastSessionId = m_config->readNumEntry(KSM_LAST_SESSION_ID, INVALID_SESSION);
@@ -503,7 +503,7 @@ void KateSessionManager::saveConfig(bool saveSessions)
   
   if (!m_config)
   {
-    m_config = new KSimpleConfig(m_configFile);
+    m_config = new TDESimpleConfig(m_configFile);
   }
   if (m_config->hasGroup(KSM_SESSIONS_LIST))
   {
@@ -847,8 +847,8 @@ KateSessionChooser::KateSessionChooser(TQWidget *parent)
   m_listview->setSorting(-1);
   m_listview->setResizeMode(TQListView::LastColumn);
 
-  connect (m_listview, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
-  connect (m_listview, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotUser2()));
+  connect (m_listview, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+  connect (m_listview, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotUser2()));
 
   TQPtrList<KateSession> &sessions = KateSessionManager::self()->getSessionsList();
   for (int idx = sessions.count()-1;  idx >= 0;  --idx)
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index fa267e91f..d9fe8f637 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -22,7 +22,7 @@
 #include "katemain.h"
 
 #include <kdialogbase.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <ksharedptr.h>
 #include <tdeaction.h>
 
@@ -145,7 +145,7 @@ class KateSession
 		TQString       m_filename;
 		bool           m_readOnly;
 		TQStringList   m_documents;           // document URLs
-		KSimpleConfig *m_config;              // session config
+		TDESimpleConfig *m_config;            // session config
 
 };
 //END KateSession
@@ -464,20 +464,20 @@ class KateSessionManager : public TQObject
 		 * @param sessionId the id of the session to save
 		 * @param saveGUIInfo if true, save also the information about the GUI elements
 		 * @param setReadOnly necessary to save a session that has to be turned to read only
-     * @emit sessionSaved
-     */
+		 * @emit sessionSaved
+		 */
 		void saveSession(int sessionId, bool saveGUIInfo, bool setReadOnly = false);
 
 
-		TQString m_baseDir;       					// folder where session files are stored
-		TQString m_configFile;     					// file where the session list config is stored
+		TQString m_baseDir;                 // folder where session files are stored
+		TQString m_configFile;              // file where the session list config is stored
 		int m_activeSessionId;              // id of the active session
-    int m_lastSessionId;                // id of the last active session before closing Kate
+		int m_lastSessionId;                // id of the last active session before closing Kate
 		TQPtrList<KateSession> m_sessions;  // session list
-		KSimpleConfig *m_config;        		// session manager config
+		TDESimpleConfig *m_config;          // session manager config
 		int m_startupOption;                // session option on Kate startup
 		int m_switchOption;                 // session option on session switch or Kate shutdown
-		
+
 		static KateSessionManager *ksm_instance;  // the only KateSessionManager instance
 };
 //END KateSessionManager
diff --git a/kate/app/katesessionpanel.cpp b/kate/app/katesessionpanel.cpp
index c2f262ff8..e05da91cd 100644
--- a/kate/app/katesessionpanel.cpp
+++ b/kate/app/katesessionpanel.cpp
@@ -64,7 +64,7 @@ KateSessionNameChooser::KateSessionNameChooser(TQWidget *parent, bool showSwitch
 		m_activateCB->setChecked(true);
 	}
 
-  connect(m_sessionNameLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged()));
+  connect(m_sessionNameLE, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
   slotTextChanged();  // update button status
 }
 
@@ -146,28 +146,28 @@ KateSessionPanel::KateSessionPanel(KateMainWindow *mainWindow, KateViewManager *
   //m_listview->setRootIsDecorated(true);  // FIXME disabled until doc list software is developed
 
 
-  connect(m_listview, TQT_SIGNAL(selectionChanged()),
-          this, TQT_SLOT(slotSelectionChanged()));
-  connect(m_listview, TQT_SIGNAL(executed(TQListViewItem*)),
-          this, TQT_SLOT(slotItemExecuted(TQListViewItem*)));
-  connect(m_listview, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-          this, TQT_SLOT(slotItemExecuted(TQListViewItem*)));
-  connect(KateApp::self(), TQT_SIGNAL(optionsChanged()),
-          this, TQT_SLOT(slotSelectionChanged()));
-  connect(m_sessionManager, TQT_SIGNAL(switchOptionChanged()),
-          this, TQT_SLOT(slotSelectionChanged()));
-  connect(m_sessionManager, TQT_SIGNAL(sessionActivated(int, int)),
-          this, TQT_SLOT(slotSessionActivated(int, int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionCreated(int)),
-          this, TQT_SLOT(slotSessionCreated(int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionDeleted(int)),
-          this, TQT_SLOT(slotSessionDeleted(int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionsSwapped(int, int)),
-          this, TQT_SLOT(slotSessionsSwapped(int, int)));
-  connect(m_sessionManager, TQT_SIGNAL(sessionRenamed(int)),
-          this, TQT_SLOT(slotSessionRenamed(int)));
-  connect(m_listview, TQT_SIGNAL(itemRenamed(TQListViewItem*)),
-          this, TQT_SLOT(slotLVSessionRenamed(TQListViewItem*)));
+  connect(m_listview, TQ_SIGNAL(selectionChanged()),
+          this, TQ_SLOT(slotSelectionChanged()));
+  connect(m_listview, TQ_SIGNAL(executed(TQListViewItem*)),
+          this, TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+  connect(m_listview, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+          this, TQ_SLOT(slotItemExecuted(TQListViewItem*)));
+  connect(KateApp::self(), TQ_SIGNAL(optionsChanged()),
+          this, TQ_SLOT(slotSelectionChanged()));
+  connect(m_sessionManager, TQ_SIGNAL(switchOptionChanged()),
+          this, TQ_SLOT(slotSelectionChanged()));
+  connect(m_sessionManager, TQ_SIGNAL(sessionActivated(int, int)),
+          this, TQ_SLOT(slotSessionActivated(int, int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionCreated(int)),
+          this, TQ_SLOT(slotSessionCreated(int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionDeleted(int)),
+          this, TQ_SLOT(slotSessionDeleted(int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionsSwapped(int, int)),
+          this, TQ_SLOT(slotSessionsSwapped(int, int)));
+  connect(m_sessionManager, TQ_SIGNAL(sessionRenamed(int)),
+          this, TQ_SLOT(slotSessionRenamed(int)));
+  connect(m_listview, TQ_SIGNAL(itemRenamed(TQListViewItem*)),
+          this, TQ_SLOT(slotLVSessionRenamed(TQListViewItem*)));
 
   TQPtrList<KateSession>& sessions = m_sessionManager->getSessionsList();
   for (int idx = sessions.count() - 1;  idx >= 0;  --idx)
@@ -199,45 +199,45 @@ void KateSessionPanel::setup_toolbar()
   TDEAction *a;
 
   a = new TDEAction(i18n("New"), SmallIcon("list-add"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotNewSession()), m_actionCollection, "session_new");
+          this, TQ_SLOT(slotNewSession()), m_actionCollection, "session_new");
   a->setWhatsThis(i18n("Create a new session and switch to it."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Save"), SmallIcon("document-save"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSaveSession()), m_actionCollection, "session_save");
+          this, TQ_SLOT(slotSaveSession()), m_actionCollection, "session_save");
   a->setWhatsThis(i18n("Save the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Save as..."), SmallIcon("document-save-as"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as");
+          this, TQ_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as");
   a->setWhatsThis(i18n("Save an unsaved session with a new name or clone an already saved session "
                        "into a new session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Rename"), SmallIcon("edit_user"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotRenameSession()), m_actionCollection, "session_rename");
+          this, TQ_SLOT(slotRenameSession()), m_actionCollection, "session_rename");
   a->setWhatsThis(i18n("Rename the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Delete"), SmallIcon("edit-delete"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotDeleteSession()), m_actionCollection, "session_delete");
+          this, TQ_SLOT(slotDeleteSession()), m_actionCollection, "session_delete");
   a->setWhatsThis(i18n("Delete the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Reload"), SmallIcon("reload"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotReloadSession()), m_actionCollection, "session_reload");
+          this, TQ_SLOT(slotReloadSession()), m_actionCollection, "session_reload");
   a->setWhatsThis(i18n("Reload the last saved state of the selected session."));
   a->plug(m_toolbar);
 
   m_toolbar->insertLineSeparator();
 
   a = new TDEAction(i18n("Activate"), SmallIcon("forward"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotActivateSession()), m_actionCollection, "session_activate");
+          this, TQ_SLOT(slotActivateSession()), m_actionCollection, "session_activate");
   a->setWhatsThis(i18n("Activate the selected session."));
   a->plug(m_toolbar);
 
 	TDEToggleAction *tglA = new TDEToggleAction(i18n("Toggle read only"), SmallIcon("encrypted"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only");
+          this, TQ_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only");
   tglA->setWhatsThis(i18n("Toggle read only status for the selected session.<p>"
 					"In a read only session, you can work as usual but the list of documents in the session "
           "will not be saved when you exit Kate or switch to another session.<p>"
@@ -245,12 +245,12 @@ void KateSessionPanel::setup_toolbar()
   tglA->plug(m_toolbar);
 
   a = new TDEAction(i18n("Move Up"), SmallIcon("go-up"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up");
+          this, TQ_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up");
   a->setWhatsThis(i18n("Move up the selected session."));
   a->plug(m_toolbar);
 
   a = new TDEAction(i18n("Move Down"), SmallIcon("go-down"), 0,
-          TQT_TQOBJECT(this), TQT_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down");
+          this, TQ_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down");
   a->setWhatsThis(i18n("Move down the selected session."));
   a->plug(m_toolbar);
 }
diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp
index e2ac7e8b3..20f2a230d 100644
--- a/kate/app/katetabwidget.cpp
+++ b/kate/app/katetabwidget.cpp
@@ -32,7 +32,7 @@ KateTabWidget::KateTabWidget(TQWidget* parent, const char* name)
 
   setHoverCloseButton(true);
 
-  connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*)));
+  connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*)));
 }
 
 KateTabWidget::~KateTabWidget()
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 7682b6cfd..a3db1dde7 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -39,9 +39,9 @@
 #include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdestdaccel.h>
 
@@ -71,7 +71,7 @@ KateViewManager::KateViewManager (KateMainWindow *parent)
 
   m_viewManager = new Kate::ViewManager (this);
   m_currentContainer=0;
- connect(m_mainWindow->tabWidget(),TQT_SIGNAL(currentChanged(TQWidget*)),this,TQT_SLOT(tabChanged(TQWidget*)));
+ connect(m_mainWindow->tabWidget(),TQ_SIGNAL(currentChanged(TQWidget*)),this,TQ_SLOT(tabChanged(TQWidget*)));
  slotNewTab();
  tabChanged(m_mainWindow->tabWidget()->currentPage());
 
@@ -94,47 +94,47 @@ void KateViewManager::setupActions ()
   /**
    * tabbing
    */
-  a=new TDEAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()),
+  a=new TDEAction ( i18n("New Tab"),"tab_new", 0, this, TQ_SLOT(slotNewTab()),
                   m_mainWindow->actionCollection(), "view_new_tab" );
 
-  m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()),
+  m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQ_SLOT(slotCloseTab()),
                              m_mainWindow->actionCollection(),"view_close_tab");
 
   m_activateNextTab
       = new TDEAction( i18n( "Activate Next Tab" ),
                      TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(),
-                     TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
+                     this, TQ_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
 
   m_activatePrevTab
       = new TDEAction( i18n( "Activate Previous Tab" ),
                      TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(),
-                     TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
+                     this, TQ_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
 
   /**
    * view splitting
    */
-  a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(
+  a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQ_SLOT(
                   slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert");
 
   a->setWhatsThis(i18n("Split the currently active view vertically into two views."));
 
-  a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(
+  a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT(
                   slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz");
 
   a->setWhatsThis(i18n("Split the currently active view horizontally into two views."));
 
-  m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this),
-                    TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
+  m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this,
+                    TQ_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
                     "view_close_current_space" );
 
   m_closeView->setWhatsThis(i18n("Close the currently active splitted view"));
 
-  goNext=new TDEAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this),
-                     TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
+  goNext=new TDEAction(i18n("Next View"),Key_F8,this,
+                     TQ_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
 
   goNext->setWhatsThis(i18n("Make the next split view the active one."));
 
-  goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
+  goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, this, TQ_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
 
   goPrev->setWhatsThis(i18n("Make the previous split view the active one."));
 
@@ -142,16 +142,16 @@ void KateViewManager::setupActions ()
    * buttons for tabbing
    */
   TQToolButton *b = new TQToolButton( m_mainWindow->tabWidget() );
-  connect( b, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotNewTab() ) );
+  connect( b, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotNewTab() ) );
   b->setIconSet( SmallIcon( "tab_new" ) );
   b->adjustSize();
   TQToolTip::add(b, i18n("Open a new tab"));
   m_mainWindow->tabWidget()->setCornerWidget( b, TopLeft );
 
   b = m_closeTabButton = new TQToolButton( m_mainWindow->tabWidget() );
-  connect( b, TQT_SIGNAL( clicked() ),
-            this, TQT_SLOT( slotCloseTab() ) );
+  connect( b, TQ_SIGNAL( clicked() ),
+            this, TQ_SLOT( slotCloseTab() ) );
   b->setIconSet( SmallIcon( "tab_remove" ) );
   b->adjustSize();
   TQToolTip::add(b, i18n("Close the current tab"));
@@ -199,8 +199,8 @@ void KateViewManager::slotNewTab()
   m_viewSpaceContainerList.append(container);
   m_mainWindow->tabWidget()->addTab (container, "");
 
-  connect(container,TQT_SIGNAL(viewChanged()),this,TQT_SIGNAL(viewChanged()));
-  connect(container,TQT_SIGNAL(viewChanged()),m_viewManager,TQT_SIGNAL(viewChanged()));
+  connect(container,TQ_SIGNAL(viewChanged()),this,TQ_SIGNAL(viewChanged()));
+  connect(container,TQ_SIGNAL(viewChanged()),m_viewManager,TQ_SIGNAL(viewChanged()));
 
   if (!m_init)
   {
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index 64e941583..240d9a810 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -30,6 +30,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
+#include <kmimetype.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
@@ -39,6 +40,7 @@
 #include <tqcursor.h>
 #include <tqpopupmenu.h>
 #include <tqpixmap.h>
+#include <tqtooltip.h>
 
 //BEGIN KVSSBSep
 /*
@@ -139,8 +141,8 @@ void KateViewSpace::addView(Kate::View* v, bool show)
 
 void KateViewSpace::removeView(Kate::View* v)
 {
-  disconnect( v->getDoc(), TQT_SIGNAL(modifiedChanged()),
-              mStatusBar, TQT_SLOT(modifiedChanged()) );
+  disconnect( v->getDoc(), TQ_SIGNAL(modifiedChanged()),
+              mStatusBar, TQ_SLOT(modifiedChanged()) );
 
   bool active = ( v == currentView() );
 
@@ -168,12 +170,12 @@ bool KateViewSpace::showView(uint documentNumber)
   for( ; it.current(); --it ) {
     if (((Kate::Document*)it.current()->getDoc())->documentNumber() == documentNumber) {
       if ( currentView() )
-        disconnect( currentView()->getDoc(), TQT_SIGNAL(modifiedChanged()),
-                    mStatusBar, TQT_SLOT(modifiedChanged()) );
+        disconnect( currentView()->getDoc(), TQ_SIGNAL(modifiedChanged()),
+                    mStatusBar, TQ_SLOT(modifiedChanged()) );
 
       Kate::View* kv = it.current();
-      connect( kv->getDoc(), TQT_SIGNAL(modifiedChanged()),
-               mStatusBar, TQT_SLOT(modifiedChanged()) );
+      connect( kv->getDoc(), TQ_SIGNAL(modifiedChanged()),
+               mStatusBar, TQ_SLOT(modifiedChanged()) );
 
       mViewList.removeRef( kv );
       mViewList.append( kv );
@@ -340,7 +342,6 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
   m_modPm = SmallIcon("modified");
   m_modDiscPm = SmallIcon("modonhd");
   m_modmodPm = SmallIcon("modmod");
-  m_noPm = SmallIcon("null");
 }
 
 KateVSStatusBar::~KateVSStatusBar ()
@@ -377,6 +378,8 @@ void KateVSStatusBar::updateMod( bool mod )
 
     bool modOnHD = info && info->modifiedOnDisc;
 
+    KMimeType::Ptr mime = KMimeType::findByURL(v->getDoc()->url());
+
     m_modifiedLabel->setPixmap(
         mod ?
           info && modOnHD ?
@@ -384,8 +387,9 @@ void KateVSStatusBar::updateMod( bool mod )
             m_modPm :
           info && modOnHD ?
             m_modDiscPm :
-        m_noPm
+            mime->pixmap(TDEIcon::Small)
         );
+    TQToolTip::add(this, mime->comment());
   }
 }
 
diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h
index 3b238beb8..fa4ae6c2c 100644
--- a/kate/app/kateviewspace.h
+++ b/kate/app/kateviewspace.h
@@ -64,7 +64,7 @@ class KateVSStatusBar : public KStatusBar
       TQLabel* m_insertModeLabel;
       TQLabel* m_selectModeLabel;
       KSqueezedTextLabel* m_fileNameLabel;
-      TQPixmap m_modPm, m_modDiscPm, m_modmodPm, m_noPm;
+      TQPixmap m_modPm, m_modDiscPm, m_modmodPm;
       class KateViewSpace *m_viewSpace;
 };
 
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index f681180a0..306514791 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -40,9 +40,9 @@
 #include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <kstringhandler.h>
 
@@ -69,14 +69,14 @@ KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManage
   m_viewSpaceList.setAutoDelete(true);
 
   KateViewSpace* vs = new KateViewSpace( this, this );
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
+  connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQ_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
   vs->setActive( true );
   m_viewSpaceList.append(vs);
-  connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) );
-  connect(KateDocManager::self(), TQT_SIGNAL(initialDocumentReplaced()), this, TQT_SIGNAL(viewChanged()));
+  connect( this, TQ_SIGNAL(viewChanged()), this, TQ_SLOT(slotViewChanged()) );
+  connect(KateDocManager::self(), TQ_SIGNAL(initialDocumentReplaced()), this, TQ_SIGNAL(viewChanged()));
 
-  connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(documentCreated(Kate::Document *)));
-  connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)),this,TQT_SLOT(documentDeleted(uint)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),this,TQ_SLOT(documentCreated(Kate::Document *)));
+  connect(KateDocManager::self(),TQ_SIGNAL(documentDeleted(uint)),this,TQ_SLOT(documentDeleted(uint)));
 }
 
 KateViewSpaceContainer::~KateViewSpaceContainer ()
@@ -122,17 +122,17 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
   // popup menu
   view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("tdetexteditor_popup", mainWindow())) );
 
-  connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
-  connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));
-  connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg()));
-  connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg()));
-  connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *)));
-  connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *)));
+  connect(view->getDoc(),TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(statusMsg()));
+  connect(view,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(statusMsg()));
+  connect(view,TQ_SIGNAL(newStatus()),this,TQ_SLOT(statusMsg()));
+  connect(view->getDoc(), TQ_SIGNAL(undoChanged()), this, TQ_SLOT(statusMsg()));
+  connect(view,TQ_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQ_SLOT(slotDropEvent(TQDropEvent *)));
+  connect(view,TQ_SIGNAL(gotFocus(Kate::View *)),this,TQ_SLOT(activateSpace(Kate::View *)));
 
   activeViewSpace()->addView( view );
   activateView( view );
-  connect( doc, TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),
-      activeViewSpace(), TQT_SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) );
+  connect( doc, TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),
+      activeViewSpace(), TQ_SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) );
 
   return true;
 }
@@ -256,7 +256,7 @@ void KateViewSpaceContainer::reactivateActiveView() {
     activateView(view);
   } else if (m_pendingViewCreation) {
     m_pendingViewCreation=false;
-    disconnect(m_pendingDocument,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotPendingDocumentNameChanged()));
+    disconnect(m_pendingDocument,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotPendingDocumentNameChanged()));
     createView(m_pendingDocument);
   }
 }
@@ -378,7 +378,7 @@ void KateViewSpaceContainer::closeViews(uint documentNumber)
     }
 
   if (m_blockViewCreationAndActivation) return;
-  TQTimer::singleShot(0,this,TQT_SIGNAL(viewChanged()));
+  TQTimer::singleShot(0,this,TQ_SIGNAL(viewChanged()));
   //emit m_viewManager->viewChanged ();
 }
 
@@ -429,7 +429,7 @@ void KateViewSpaceContainer::statusMsg ()
   }
   else
   {
-    c = v->getDoc()->url().prettyURL();
+    c = v->getDoc()->url().pathOrURL();
   }
 
   m_viewManager->mainWindow()->tabWidget()->changeTab (this, KStringHandler::lsqueeze(c,32));
@@ -481,7 +481,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
   sizes << space << space;
   s->setSizes( sizes );
 
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
+  connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQ_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
   m_viewSpaceList.append( vsNew );
   activeViewSpace()->setActive( false );
   vsNew->setActive( true, true );
@@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString
     {
      KateViewSpace* vs = new KateViewSpace( this, s );
 
-     connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
+     connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQ_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
 
      if (m_viewSpaceList.isEmpty())
        vs->setActive (true);
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index 8dbf8461d..4e6fd3394 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -27,7 +27,7 @@
 #include <kbookmarkimporter.h>
 #include <tdepopupmenu.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdediroperator.h>
 #include <tdeaction.h>
 
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 00eb85a68..2b0c2ddfb 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -81,7 +81,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
     {
       KMessageBox::error(this, i18n("A TDE text-editor component could not be found;\n"
                                     "please check your TDE installation."));
-      kapp->exit(1);
+      tdeApp->exit(1);
     }
 
     docList.append(doc);
@@ -96,11 +96,11 @@ KWrite::KWrite (KTextEditor::Document *doc)
 
   setAcceptDrops(true);
 
-  connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption()));
-  connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &)));
-  connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption()));
-  connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged()));
-  connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *)));
+  connect(m_view,TQ_SIGNAL(newStatus()),this,TQ_SLOT(newCaption()));
+  connect(m_view,TQ_SIGNAL(viewStatusMsg(const TQString &)),this,TQ_SLOT(newStatus(const TQString &)));
+  connect(m_view->document(),TQ_SIGNAL(fileNameChanged()),this,TQ_SLOT(newCaption()));
+  connect(m_view->document(),TQ_SIGNAL(fileNameChanged()),this,TQ_SLOT(slotFileNameChanged()));
+  connect(m_view,TQ_SIGNAL(dropEventPass(TQDropEvent *)),this,TQ_SLOT(slotDropEvent(TQDropEvent *)));
 
   setXMLFile( "kwriteui.rc" );
   createShellGUI( true );
@@ -134,46 +134,46 @@ KWrite::~KWrite()
     delete m_view->document();
   }
 
-  kapp->config()->sync ();
+  tdeApp->config()->sync ();
 }
 
 void KWrite::setupActions()
 {
-  KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
+  KStdAction::close( this, TQ_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
 
   // setup File menu
-  KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
-  KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
-  KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
+  KStdAction::print(this, TQ_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
+  KStdAction::openNew( this, TQ_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
+  KStdAction::open( this, TQ_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
 
-  m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpen(const KURL&)),
+  m_recentFiles = KStdAction::openRecent(this, TQ_SLOT(slotOpen(const KURL&)),
                                          actionCollection());
   m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
 
-  TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
+  TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQ_SLOT(newView()),
               actionCollection(), "view_new_view");
   a->setWhatsThis(i18n("Create another view containing the current document"));
 
-  a=new TDEAction(i18n("Choose Editor Component..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()),
+  a=new TDEAction(i18n("Choose Editor Component..."),0,this,TQ_SLOT(changeEditor()),
 		actionCollection(),"settings_choose_editor");
   a->setWhatsThis(i18n("Override the system wide setting for the default editing component"));
 
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
 
   // setup Settings menu
   setStandardToolBarMenuEnabled(true);
 
-  m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
+  m_paShowStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
   m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
 
-  m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()),
+  m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, this, TQ_SLOT(newCaption()),
                     actionCollection(), "set_showPath");
   m_paShowPath->setCheckedState(i18n("Hide Path"));
   m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption"));
-  a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
+  a=KStdAction::keyBindings(this, TQ_SLOT(editKeys()), actionCollection());
   a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
 
-  a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection());
+  a=KStdAction::configureToolbars(this, TQ_SLOT(editToolbars()), actionCollection());
   a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
 }
 
@@ -297,16 +297,16 @@ void KWrite::editKeys()
 
 void KWrite::editToolbars()
 {
-  saveMainWindowSettings( kapp->config(), "MainWindow" );
+  saveMainWindowSettings( tdeApp->config(), "MainWindow" );
   KEditToolbar *dlg = new KEditToolbar(guiFactory());
-  connect( dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) );
+  connect( dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) );
   dlg->exec();
   delete dlg;
 }
 
 void KWrite::slotNewToolbarConfig()
 {
-  applyMainWindowSettings( kapp->config(), "MainWindow" );
+  applyMainWindowSettings( tdeApp->config(), "MainWindow" );
 }
 
 
@@ -431,13 +431,13 @@ void KWrite::writeConfig(TDEConfig *config)
 //config file
 void KWrite::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   readConfig(config);
 }
 
 void KWrite::writeConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   writeConfig(config);
 }
 
@@ -492,7 +492,7 @@ void KWrite::saveGlobalProperties(TDEConfig *config) //save documents
 //restore session
 void KWrite::restore()
 {
-  TDEConfig *config = kapp->sessionConfig();
+  TDEConfig *config = tdeApp->sessionConfig();
 
   if (!config)
     return;
@@ -536,7 +536,7 @@ static TDECmdLineOptions options[] =
   TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
   Kate::Document::setFileChangedDialogsActivated (true);
 
@@ -595,7 +595,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
   TDEGlobal::locale()->insertCatalogue("katepart");
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isRegistered())
   {
     client->attach();
@@ -604,7 +604,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-  if (kapp->isRestored())
+  if (tdeApp->isRestored())
   {
     KWrite::restore();
   }
diff --git a/kate/data/kate.desktop b/kate/data/kate.desktop
index 78c3c8b3e..9c81cefc8 100644
--- a/kate/data/kate.desktop
+++ b/kate/data/kate.desktop
@@ -12,4 +12,4 @@ Type=Application
 Terminal=false
 X-TDE-InitialPreference=8
 X-DCOP-ServiceType=Multi
-Categories=Qt;TDE;TextEditor;
+Categories=Qt;TDE;Utility;TextEditor;
diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop
index 4f4200a3b..6741deae8 100644
--- a/kate/data/kwrite.desktop
+++ b/kate/data/kwrite.desktop
@@ -11,4 +11,4 @@ Type=Application
 Terminal=false
 X-TDE-InitialPreference=8
 X-DCOP-ServiceType=Multi
-Categories=Qt;TDE;TextEditor;
+Categories=Qt;TDE;Utility;TextEditor;
diff --git a/kate/data/tips b/kate/data/tips
index aaee34424..07ed4a968 100644
--- a/kate/data/tips
+++ b/kate/data/tips
@@ -102,7 +102,7 @@ line.</p>
 <p>Simply enter your filter in the filter entry at the bottom, for example:
 <code>*.html *.php</code> if you only want to see HTML and PHP files in the
 current folder.</p>
-<p>The File Selector will even remember your filters for you.</strong></p>
+<p>The File Selector will even remember your filters for you.</p>
 </html>
 </tip>
 <tip category="Kate|app">
diff --git a/kate/interfaces/application.h b/kate/interfaces/application.h
index 8cbc9abce..42ddf9cb3 100644
--- a/kate/interfaces/application.h
+++ b/kate/interfaces/application.h
@@ -35,7 +35,7 @@ class MainWindow;
  * other objects like document/projectmanager, ... no way goes around this
  * central interface
  */
-class KDE_EXPORT Application : public TQObject
+class TDE_EXPORT Application : public TQObject
 {
   friend class PrivateApplication;
 
@@ -72,7 +72,7 @@ class KDE_EXPORT Application : public TQObject
  * Returns the application object
  * @return Application application object
  */
-KDE_EXPORT Application *application ();
+TDE_EXPORT Application *application ();
 
 }
 
diff --git a/kate/interfaces/documentmanager.h b/kate/interfaces/documentmanager.h
index d3f55fdf5..d9cc50a2b 100644
--- a/kate/interfaces/documentmanager.h
+++ b/kate/interfaces/documentmanager.h
@@ -26,7 +26,7 @@ namespace Kate
 {
 /** This interface provides access to the Kate Document Manager.
 */
-class KDE_EXPORT DocumentManager : public TQObject
+class TDE_EXPORT DocumentManager : public TQObject
 {
   friend class PrivateDocumentManager;
 
@@ -104,7 +104,7 @@ class KDE_EXPORT DocumentManager : public TQObject
  * Returns the document manager object
  * @return DocumentManager document manager object
  */
-KDE_EXPORT DocumentManager *documentManager ();
+TDE_EXPORT DocumentManager *documentManager ();
 
 }
 
diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h
index 7e9033ce3..38f8232f2 100644
--- a/kate/interfaces/mainwindow.h
+++ b/kate/interfaces/mainwindow.h
@@ -29,7 +29,7 @@ namespace Kate
 
 class ViewManager;
 
-class KDE_EXPORT MainWindow : public TQObject
+class TDE_EXPORT MainWindow : public TQObject
 {
   friend class PrivateMainWindow;
 
diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h
index bc79a0491..1048a9e88 100644
--- a/kate/interfaces/plugin.h
+++ b/kate/interfaces/plugin.h
@@ -32,7 +32,7 @@ namespace Kate
 class Application;
 class MainWindow;
 
-class KDE_EXPORT Plugin : public TQObject
+class TDE_EXPORT Plugin : public TQObject
 {
   friend class PrivatePlugin;
 
@@ -52,13 +52,13 @@ class KDE_EXPORT Plugin : public TQObject
     unsigned int myPluginNumber;
 };
 
-KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application = 0, const char *name = 0,const TQStringList &args = TQStringList() );
+TDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application = 0, const char *name = 0,const TQStringList &args = TQStringList() );
 
 /*
  * view plugin class
  * this plugin will be bound to a tdetexteditor::view
  */
-class KDE_EXPORT PluginViewInterface
+class TDE_EXPORT PluginViewInterface
 {
   friend class PrivatePluginViewInterface;
 
@@ -80,7 +80,7 @@ class KDE_EXPORT PluginViewInterface
     unsigned int myPluginViewInterfaceNumber;
 };
 
-KDE_EXPORT PluginViewInterface *pluginViewInterface (Plugin *plugin);
+TDE_EXPORT PluginViewInterface *pluginViewInterface (Plugin *plugin);
 
 }
 
diff --git a/kate/interfaces/pluginconfiginterface.h b/kate/interfaces/pluginconfiginterface.h
index f626b1cde..749a1c33a 100644
--- a/kate/interfaces/pluginconfiginterface.h
+++ b/kate/interfaces/pluginconfiginterface.h
@@ -19,7 +19,7 @@
 #ifndef __kate_pluginconfiginterface_h__
 #define __kate_pluginconfiginterface_h__
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace Kate
 {
@@ -27,7 +27,7 @@ namespace Kate
 /*
 *  This is an interface for the KTextEditor::Document/Plugin/ViewPlugin classes !!!
 */
-class KDE_EXPORT PluginConfigInterface
+class TDE_EXPORT PluginConfigInterface
 {
   friend class PrivatePluginConfigInterface;
 
@@ -56,7 +56,7 @@ class KDE_EXPORT PluginConfigInterface
 };
 
 class Plugin;
-KDE_EXPORT PluginConfigInterface *pluginConfigInterface (Plugin *plugin);
+TDE_EXPORT PluginConfigInterface *pluginConfigInterface (Plugin *plugin);
 
 }
 
diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h
index d70d35069..c3db71fde 100644
--- a/kate/interfaces/pluginconfiginterfaceextension.h
+++ b/kate/interfaces/pluginconfiginterfaceextension.h
@@ -26,7 +26,7 @@
 namespace Kate
 {
 
-class KDE_EXPORT PluginConfigPage : public TQWidget
+class TDE_EXPORT PluginConfigPage : public TQWidget
 {
   TQ_OBJECT
 
@@ -60,7 +60,7 @@ class KDE_EXPORT PluginConfigPage : public TQWidget
 /*
 *  This is an interface for the KTextEditor::Document/Plugin/ViewPlugin classes !!!
 */
-class KDE_EXPORT PluginConfigInterfaceExtension
+class TDE_EXPORT PluginConfigInterfaceExtension
 {
   friend class PrivatePluginConfigInterfaceExtension;
 
@@ -97,7 +97,7 @@ class KDE_EXPORT PluginConfigInterfaceExtension
 };
 
 class Plugin;
-KDE_EXPORT PluginConfigInterfaceExtension *pluginConfigInterfaceExtension (Plugin *plugin);
+TDE_EXPORT PluginConfigInterfaceExtension *pluginConfigInterfaceExtension (Plugin *plugin);
 
 }
 
diff --git a/kate/interfaces/pluginmanager.h b/kate/interfaces/pluginmanager.h
index 26d77b26c..74aa4d874 100644
--- a/kate/interfaces/pluginmanager.h
+++ b/kate/interfaces/pluginmanager.h
@@ -27,7 +27,7 @@ namespace Kate
 {
 /** This interface provides access to the Kate Plugin Manager.
 */
-class KDE_EXPORT PluginManager : public TQObject
+class TDE_EXPORT PluginManager : public TQObject
 {
   friend class PrivatePluginManager;
 
diff --git a/kate/interfaces/toolviewmanager.h b/kate/interfaces/toolviewmanager.h
index fec942b2b..48c14f93f 100644
--- a/kate/interfaces/toolviewmanager.h
+++ b/kate/interfaces/toolviewmanager.h
@@ -29,7 +29,7 @@ namespace Kate
 /**
   Interface to the toolviewmanager
  */
-class KDE_EXPORT ToolViewManager : public TQObject
+class TDE_EXPORT ToolViewManager : public TQObject
 {
   friend class PrivateToolViewManager;
 
diff --git a/kate/interfaces/viewmanager.h b/kate/interfaces/viewmanager.h
index 0ca689680..12b296702 100644
--- a/kate/interfaces/viewmanager.h
+++ b/kate/interfaces/viewmanager.h
@@ -30,7 +30,7 @@ class View;
 /**
  * Interface to the viewmanager
  */
-class KDE_EXPORT ViewManager : public TQObject
+class TDE_EXPORT ViewManager : public TQObject
 {
   friend class PrivateViewManager;
 
diff --git a/kate/pics/actions/cr16-action-null.png b/kate/pics/actions/cr16-action-null.png
deleted file mode 100644
index c06ca5543..000000000
--- a/kate/pics/actions/cr16-action-null.png
+++ /dev/null
diff --git a/kate/pics/actions/lo16-action-null.png b/kate/pics/actions/lo16-action-null.png
deleted file mode 100644
index c06ca5543..000000000
--- a/kate/pics/actions/lo16-action-null.png
+++ /dev/null
diff --git a/kate/pics/sessionchooser.png b/kate/pics/sessionchooser.png
index 85132358c..356f10fdd 100644
--- a/kate/pics/sessionchooser.png
+++ b/kate/pics/sessionchooser.png
diff --git a/kate/utils/messageview.cpp b/kate/utils/messageview.cpp
index 53c0191a9..a780cc063 100644
--- a/kate/utils/messageview.cpp
+++ b/kate/utils/messageview.cpp
@@ -26,8 +26,8 @@ Kate::MessageView::MessageView( TQWidget *parent, const char *name )
 {
   m_view = new TQTextBrowser( this );
   // m_view->setFormat( TQt::richText ); // should be!!
-  connect( m_view, TQT_SIGNAL( linkClicked( const TQString & ) ), 
-           TQT_SIGNAL( linkClicked( const TQString & ) ) );
+  connect( m_view, TQ_SIGNAL( linkClicked( const TQString & ) ), 
+           TQ_SIGNAL( linkClicked( const TQString & ) ) );
 }
 
 Kate::MessageView::~MessageView()
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index f1fbf8987..3a2d7c362 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -112,16 +112,25 @@ void KCMInit::runModules( int phase )
 
       TQString libName = TQString("kcm_%1").arg(library);
 
+      TQString factoryName = service->property("X-TDE-FactoryName", TQVariant::String).toString();
+      if (!factoryName.isEmpty())
+      {
+          factoryName = ":" + factoryName;
+      }
+      TQString libFactoryName = libName + factoryName;
+
       // try to load the library
-      if (! alreadyInitialized.contains( libName.ascii() )) {
+      if (!alreadyInitialized.contains( libFactoryName.ascii() )) {
 	  if (!runModule(libName, service)) {
 	      libName = TQString("libkcm_%1").arg(library);
-	      if (! alreadyInitialized.contains( libName.ascii() )) {
+	      libFactoryName = libName + factoryName;
+	      if (!alreadyInitialized.contains( libFactoryName.ascii() )) {
 		  runModule(libName, service);
-		  alreadyInitialized.append( libName.ascii() );
+		  alreadyInitialized.append( libFactoryName.ascii() );
 	      }
-	  } else 
-	      alreadyInitialized.append( libName.ascii() );
+	  } else {
+	      alreadyInitialized.append( libFactoryName.ascii() );
+	  }
       }
   }
 }
@@ -171,8 +180,8 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
 
   }
 
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
 
   // This key has no GUI apparently
   TDEConfig config("kcmdisplayrc", true );
@@ -185,15 +194,15 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
   TQByteArray params;
   TQDataStream stream(params, IO_WriteOnly);
   stream << name << value;
-  kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
+  tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
   setenv( name, value, 1 ); // apply effect also to itself
 
   if( startup )
   {
      runModules( 0 );
-     kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kcminit"));
+     tdeApp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kcminit"));
      sendReady();
-     TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
+     TQTimer::singleShot( 300 * 1000, tqApp, TQ_SLOT( quit())); // just in case
      tqApp->exec(); // wait for runPhase1() and runPhase2()
   }
   else
@@ -218,7 +227,7 @@ void KCMInit::runPhase2()
   tqApp->exit( 0 );
 }
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
   // tdeinit waits for kcminit to finish, but during KDE startup
   // only important kcm's are started very early in the login process,
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 2cb9281df..874df3b67 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -92,14 +92,14 @@ static ModifierKey modifierKeys[] = {
 
 
 KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
-  : KUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false),
+  : TDEUniqueApplication(allowStyles, GUIenabled), _artsBellBlocked(false),
                                                  overlay(0), wm(0, KWinModule::INFO_DESKTOP)
 {
   _activeWindow = wm.activeWindow();
-  connect(&wm, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(activeWindowChanged(WId)));
+  connect(&wm, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(activeWindowChanged(WId)));
 
   artsBellTimer = new TQTimer( this );
-  connect( artsBellTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotArtsBellTimeout() ));
+  connect( artsBellTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotArtsBellTimeout() ));
 
   features = 0;
   requestedFeatures = 0;
@@ -364,7 +364,7 @@ bool KAccessApp::x11EventFilter(XEvent *event)
 void VisualBell::paintEvent(TQPaintEvent *event)
 {
   TQWidget::paintEvent(event);
-  TQTimer::singleShot(_pause, this, TQT_SLOT(hide()));
+  TQTimer::singleShot(_pause, this, TQ_SLOT(hide()));
 }
 
 
@@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
       lay->setSpacing(KDialog::spacingHint());
 
       TQLabel *label1 = new TQLabel( contents);
-      TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
+      TQPixmap pixmap = tdeApp->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
       if (pixmap.isNull())
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
       label1->setPixmap(pixmap);
@@ -605,9 +605,9 @@ void KAccessApp::createDialogContents() {
       dialog->setMainWidget(topcontents);
       dialog->enableButtonSeparator(false);
 
-      connect (dialog, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(yesClicked()));
-      connect (dialog, TQT_SIGNAL(noClicked()), this, TQT_SLOT(noClicked()));
-      connect (dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(dialogClosed()));
+      connect (dialog, TQ_SIGNAL(yesClicked()), this, TQ_SLOT(yesClicked()));
+      connect (dialog, TQ_SIGNAL(noClicked()), this, TQ_SLOT(noClicked()));
+      connect (dialog, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(dialogClosed()));
    }
 }
 
@@ -751,7 +751,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event)
               +" "+i18n("These AccessX settings are needed for some users with motion impairments and can be configured in the Trinity Control Center. You can also turn them on and off with standardized keyboard gestures.\n\nIf you do not need them, you can select \"Deactivate all AccessX features and gestures\".") );
 
         KWin::setState( dialog->winId(), NET::KeepAbove );
-        kapp->updateUserTimestamp();
+        tdeApp->updateUserTimestamp();
         dialog->show();
      }
   }
diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h
index fbfa0d783..0bb22f8e7 100644
--- a/kcontrol/access/kaccess.h
+++ b/kcontrol/access/kaccess.h
@@ -6,7 +6,7 @@
 #include <tqcolor.h>
 
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <twinmodule.h>
 
 
@@ -19,7 +19,7 @@ class KDialogBase;
 class TQLabel;
 class KComboBox;
 
-class KAccessApp : public KUniqueApplication
+class KAccessApp : public TDEUniqueApplication
 {
   TQ_OBJECT
 
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index e38615ebb..b7e20d27b 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -24,7 +24,7 @@
 
 
 #include <kcombobox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kcolorbutton.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
@@ -55,10 +55,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) {
 	KIntNumInput::setRange (min,max,step, slider);
 
 	if (slider) {
-		disconnect(m_slider, TQT_SIGNAL(valueChanged(int)),
-					  m_spin, TQT_SLOT(setValue(int)));
-		disconnect(m_spin, TQT_SIGNAL(valueChanged(int)),
-					  this, TQT_SLOT(spinValueChanged(int)));
+		disconnect(m_slider, TQ_SIGNAL(valueChanged(int)),
+					  m_spin, TQ_SLOT(setValue(int)));
+		disconnect(m_spin, TQ_SIGNAL(valueChanged(int)),
+					  this, TQ_SLOT(spinValueChanged(int)));
 
 		this->min = min;
 		this->max = max;
@@ -72,10 +72,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) {
 		double logVal = alpha * (log((double)value())-log((double)min));
 		m_slider->setValue ((int)floor (0.5 + logVal));
 
-		connect(m_slider, TQT_SIGNAL(valueChanged(int)),
-				  this, TQT_SLOT(slotSliderValueChanged(int)));
-		connect(m_spin, TQT_SIGNAL(valueChanged(int)),
-				  this, TQT_SLOT(slotSpinValueChanged(int)));
+		connect(m_slider, TQ_SIGNAL(valueChanged(int)),
+				  this, TQ_SLOT(slotSliderValueChanged(int)));
+		connect(m_spin, TQ_SIGNAL(valueChanged(int)),
+				  this, TQ_SLOT(slotSpinValueChanged(int)));
 	}
 }
 
@@ -276,13 +276,13 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   TQWhatsThis::add( soundLabel, wtstr );
   TQWhatsThis::add( soundButton, wtstr );
 
-  connect(soundButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectSound()));
+  connect(soundButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectSound()));
 
-  connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
-  connect(systemBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(soundEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(systemBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(soundEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
 
   // -----------------------------------------------------
 
@@ -320,22 +320,22 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addSpacing(24);
 
   durationSlider = new ExtendedIntNumInput(grp);
-  durationSlider->setRange(100, 2000, 100);
+  durationSlider->setRange(10, 2000, 10);
   durationSlider->setLabel(i18n("Duration:"));
   durationSlider->setSuffix(i18n(" msec"));
   hbox->addWidget(durationSlider);
   TQWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") );
 
-  connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(colorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFlashScreenColor()));
+  connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(colorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeFlashScreenColor()));
 
-  connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertClicked()));
-  connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(flashClicked()));
+  connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertClicked()));
+  connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(flashClicked()));
 
-  connect(durationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
+  connect(durationSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
 
   vbox->addStretch();
 
@@ -391,16 +391,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyModifiersButton);
 
-  connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(stickyKeysLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(stickyKeysAutoOff, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(stickyKeysLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(stickyKeysAutoOff, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
-  connect(stickyKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(toggleKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(kNotifyModifiersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify()));
+  connect(stickyKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(toggleKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(kNotifyModifiersButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify()));
 
   vbox->addStretch();
 
@@ -424,7 +424,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addSpacing(24);
   slowKeysDelay = new ExtendedIntNumInput(grp);
   slowKeysDelay->setSuffix(i18n(" msec"));
-  slowKeysDelay->setRange(50, 10000, 100);
+  slowKeysDelay->setRange(10, 10000, 10);
   slowKeysDelay->setLabel(i18n("Acceptance dela&y:"));
   hbox->addWidget(slowKeysDelay);
 
@@ -456,7 +456,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addSpacing(24);
   bounceKeysDelay = new ExtendedIntNumInput(grp);
   bounceKeysDelay->setSuffix(i18n(" msec"));
-  bounceKeysDelay->setRange(100, 5000, 100);
+  bounceKeysDelay->setRange(10, 5000, 10);
   bounceKeysDelay->setLabel(i18n("D&ebounce time:"));
   hbox->addWidget(bounceKeysDelay);
 
@@ -465,18 +465,18 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   bounceKeysRejectBeep = new TQCheckBox(i18n("Use the system bell whenever a key is rejected"), grp);
   hbox->addWidget(bounceKeysRejectBeep);
 
-  connect(slowKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-  connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(slowKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+  connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
-  connect(slowKeysPressBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(slowKeysAcceptBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(slowKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(slowKeysPressBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(slowKeysAcceptBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(slowKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
-  connect(bounceKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-  connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(bounceKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
+  connect(bounceKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+  connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(bounceKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
 
   vbox->addStretch();
 
@@ -513,7 +513,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addSpacing(24);
   timeoutDelay = new KIntNumInput(grp);
   timeoutDelay->setSuffix(i18n(" min"));
-  timeoutDelay->setRange(1, 30, 4);
+  timeoutDelay->setRange(1, 30, 1);
   timeoutDelay->setLabel(i18n("Timeout:"));
   hbox->addWidget(timeoutDelay);
 
@@ -539,15 +539,15 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyAccessXButton);
 
-  connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(timeoutDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged()));
-  connect(accessxBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(gestureConfirmation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
-  connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(kNotifyAccessXButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify()));
+  connect(gestures, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(timeoutDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged()));
+  connect(accessxBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(gestureConfirmation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
+  connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(kNotifyAccessXButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify()));
 
   vbox->addStretch();
 
@@ -717,7 +717,7 @@ void KAccessConfig::save()
   // When turning things off, it needs to be done by kaccess,
   // so don't actually kill it *shrug*.
   if ( true /*needToRunKAccessDaemon( config )*/ )
-      kapp->startServiceByDesktopName("kaccess");
+      tdeApp->startServiceByDesktopName("kaccess");
 
   else // don't need it -> kill it
   {
@@ -799,7 +799,7 @@ void KAccessConfig::checkAccess()
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
   {
     return new KAccessConfig(parent, name);
   }
@@ -807,14 +807,14 @@ extern "C"
   /* This one gets called by kcminit
 
    */
-  KDE_EXPORT void init_access()
+  TDE_EXPORT void init_access()
   {
     TDEConfig *config = new TDEConfig("kaccessrc", true, false);
     bool run = needToRunKAccessDaemon( config );
 
     delete config;
     if (run)
-      kapp->startServiceByDesktopName("kaccess");
+      tdeApp->startServiceByDesktopName("kaccess");
   }
 }
 
diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp
index aede70579..11aedc50b 100644
--- a/kcontrol/access/main.cpp
+++ b/kcontrol/access/main.cpp
@@ -4,7 +4,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 
-extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
+extern "C" TDE_EXPORT int kdemain(int argc, char * argv[] )
 {
   TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
                   0, 0, TDEAboutData::License_GPL,
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 388776bc1..0e63f876f 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -43,19 +43,19 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <krichtextlabel.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 #include <libtdemid/deviceman.h>
 
 #include "arts.h"
 
 extern "C" {
-	KDE_EXPORT void init_arts();
+	TDE_EXPORT void init_arts();
 
-    KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/)
+    TDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/)
 	{
 		TDEGlobal::locale()->insertCatalogue("kcmarts");
 		return new KArtsModule(parent, "kcmarts" );
@@ -74,7 +74,7 @@ static bool startArts()
 	delete config;
 
 	if (startServer)
-		kapp->tdeinitExec(startRealtime?"artswrapper":"artsd",
+		tdeApp->tdeinitExec(startRealtime?"artswrapper":"artsd",
 		                  TQStringList::split(" ",args));
 	return startServer;
 }
@@ -100,10 +100,10 @@ void KArtsModule::initAudioIOList()
 	*artsd << "artsd";
 	*artsd << "-A";
 
-	connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)),
-	        this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
-	connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
-	        this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int)));
+	connect(artsd, TQ_SIGNAL(processExited(TDEProcess*)),
+	        this, TQ_SLOT(slotArtsdExited(TDEProcess*)));
+	connect(artsd, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+	        this, TQ_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int)));
 
 	if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) {
 		KMessageBox::error(0, i18n("Unable to start the sound server to "
@@ -216,31 +216,31 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 
 	suspendTime->setRange( 1, 999, 1, true );
 
-	connect(startServer,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(networkTransparent,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(startRealtime,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(fullDuplex,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged()));
-	connect(customDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect(deviceName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(customRate, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect(samplingRate, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SLOT(slotChanged()));
-//	connect(general->volumeSystray, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged()) );
-
-	connect(hardware->audioIO,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged()));
-	connect(hardware->audioIO,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged()));
-	connect(hardware->customOptions,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged()));
-	connect(hardware->addOptions,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotChanged()));
-	connect(hardware->soundQuality,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged()));
-	connect(hardware->soundQuality,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged()));
-	connect(general->latencySlider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged()));
-	connect(autoSuspend,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged()));
-	connect(suspendTime,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged()));
-	connect(general->testSound,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestSound()));
-	connect(hardware->midiDevice, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotChanged() ) );
-	connect(hardware->midiDevice, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) );
-	connect(hardware->midiUseMapper, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-	connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ),
-			this, TQT_SLOT( slotChanged() ) );
+	connect(startServer,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(networkTransparent,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(startRealtime,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(fullDuplex,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged()));
+	connect(customDevice, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect(deviceName, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(customRate, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect(samplingRate, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SLOT(slotChanged()));
+//	connect(general->volumeSystray, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChanged()) );
+
+	connect(hardware->audioIO,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged()));
+	connect(hardware->audioIO,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged()));
+	connect(hardware->customOptions,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged()));
+	connect(hardware->addOptions,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotChanged()));
+	connect(hardware->soundQuality,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged()));
+	connect(hardware->soundQuality,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged()));
+	connect(general->latencySlider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged()));
+	connect(autoSuspend,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged()));
+	connect(suspendTime,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged()));
+	connect(general->testSound,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestSound()));
+	connect(hardware->midiDevice, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotChanged() ) );
+	connect(hardware->midiDevice, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotChanged() ) );
+	connect(hardware->midiUseMapper, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+	connect(hardware->midiMapper, TQ_SIGNAL( textChanged( const TQString& ) ),
+			this, TQ_SLOT( slotChanged() ) );
 
 	TDEAboutData *about =  new TDEAboutData(I18N_NOOP("kcmarts"),
                   I18N_NOOP("The Sound Server Control Module"),
@@ -553,8 +553,8 @@ bool KArtsModule::realtimeIsPossible()
 	*checkProcess << "artswrapper";
 	*checkProcess << "check";
 
-	connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-	        this, TQT_SLOT(slotArtsdExited(TDEProcess*)));
+	connect(checkProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+	        this, TQ_SLOT(slotArtsdExited(TDEProcess*)));
 	if (!checkProcess->start(TDEProcess::Block))
 	{
 		delete checkProcess;
@@ -600,7 +600,7 @@ void KArtsModule::restartServer()
 	}
 
 	// Restart knotify
-	kapp->startServiceByDesktopName("knotify");
+	tdeApp->startServiceByDesktopName("knotify");
 }
 
 bool KArtsModule::artsdIsRunning()
@@ -672,7 +672,7 @@ KStartArtsProgressDialog::KStartArtsProgressDialog(KArtsModule *parent, const ch
                           const TQString &caption, const TQString &text)
  : KProgressDialog(parent, name, caption, text, true), m_module(parent), m_shutdown(false)
 {
-  connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress()));
+  connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress()));
   progressBar()->setTotalSteps(20);
   m_timeStep = 700;
   m_timer.start(m_timeStep);
@@ -718,7 +718,7 @@ KStartArtsProgressDialog::slotFinished()
 {
   progressBar()->setProgress(20);
   m_timer.stop();
-  TQTimer::singleShot(1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot(1000, this, TQ_SLOT(close()));
 }
 
 
diff --git a/kcontrol/background/KCrossBGRender.cpp b/kcontrol/background/KCrossBGRender.cpp
index 489e98d1b..8f91a904d 100644
--- a/kcontrol/background/KCrossBGRender.cpp
+++ b/kcontrol/background/KCrossBGRender.cpp
@@ -149,7 +149,7 @@ bool KCrossBGRender::needWallpaperChange(){
 }
 
 /* 
- * This method change the enabledEffect flag to TRUE of FALSE, according 
+ * This method change the enabledEffect flag to true of false, according 
  * with multiWallpaperMode and FileName (it needs to be a XML)
  */
 void KCrossBGRender::fixEnabled(){
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 3194c2859..2d5db7b8f 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -37,7 +37,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 
 #include "bgrender.h"
@@ -77,8 +77,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
    dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 );
    dlg->m_listPrograms->setAllColumnsShowFocus(true);
 
-   connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)),
-         TQT_SLOT(slotProgramItemClicked(TQListViewItem *)));
+   connect(dlg->m_listPrograms, TQ_SIGNAL(clicked(TQListViewItem *)),
+         TQ_SLOT(slotProgramItemClicked(TQListViewItem *)));
 
    // Load programs
    TQStringList lst = KBackgroundProgram::list();
@@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
       dlg->m_spinCache->setSpecialValueText(i18n("Unlimited"));
       dlg->m_spinCache->setSuffix(i18n(" KB"));
 
-      connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()),
-         TQT_SLOT(slotAdd()));
-      connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()),
-         TQT_SLOT(slotRemove()));
-      connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()),
-         TQT_SLOT(slotModify()));
+      connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotAdd()));
+      connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotRemove()));
+      connect(dlg->m_buttonModify, TQ_SIGNAL(clicked()),
+         TQ_SLOT(slotModify()));
 
-      connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-         TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *)));
+      connect(dlg->m_listPrograms, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+         TQ_SLOT(slotProgramItemDoubleClicked(TQListViewItem *)));
    }
    else
    {
@@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
       dlg->m_groupCache->hide();
    }
 
-   connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(slotEnableProgram(bool)));
+   connect( dlg->m_cbProgram, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(slotEnableProgram(bool)));
 
    m_backgroundMode = m_oldBackgroundMode = r->backgroundMode();
    if (m_oldBackgroundMode == KBackgroundSettings::Program)
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 89847c9b2..79686182e 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -47,7 +47,7 @@
 #include <kimageio.h>
 #include <tdelocale.h>
 #include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurlrequester.h>
 #include <twin.h>
@@ -73,7 +73,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
    m_previewUpdates = true;
    
    KWinModule *m_twin;
-   m_twin = new KWinModule(TQT_TQOBJECT(this));
+   m_twin = new KWinModule(this);
    m_curDesk = m_twin->currentDesktop();
    TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop()));
    m_useViewports = s.width() * s.height() > 1;
@@ -122,21 +122,21 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
       m_eScreen = 0;
    }
    
-   connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens()));
+   connect(m_buttonIdentifyScreens, TQ_SIGNAL(clicked()), TQ_SLOT(slotIdentifyScreens()));
 
    // preview monitor
    m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement");
-   connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &)));
+   connect(m_pMonitorArrangement, TQ_SIGNAL(imageDropped(const TQString &)), TQ_SLOT(slotImageDropped(const TQString &)));
    if( m_multidesktop)
    {
        // desktop
-       connect(m_comboDesktop, TQT_SIGNAL(activated(int)),
-	       TQT_SLOT(slotSelectDesk(int)));
+       connect(m_comboDesktop, TQ_SIGNAL(activated(int)),
+	       TQ_SLOT(slotSelectDesk(int)));
    }
    if (m_numScreens > 1)
    {
-       connect(m_comboScreen, TQT_SIGNAL(activated(int)),
-               TQT_SLOT(slotSelectScreen(int)));
+       connect(m_comboScreen, TQ_SIGNAL(activated(int)),
+               TQ_SLOT(slotSelectScreen(int)));
    }
 
    // background image settings
@@ -146,42 +146,42 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
    m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
    TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog"));
 
-   connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)),
-           TQT_SLOT(slotWallpaperTypeChanged(int)));
-   connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(slotWallpaper(int)));
-   connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotWallpaperSelection()));
-   connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(slotWallpaperPos(int)));
-   connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotSetupMulti()));
+   connect(m_buttonGroupBackground, TQ_SIGNAL(clicked(int)),
+           TQ_SLOT(slotWallpaperTypeChanged(int)));
+   connect(m_urlWallpaperBox, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(slotWallpaper(int)));
+   connect(m_urlWallpaperButton, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotWallpaperSelection()));
+   connect(m_comboWallpaperPos, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(slotWallpaperPos(int)));
+   connect(m_buttonSetupWallpapers, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotSetupMulti()));
 
    // set up the background colour stuff
-   connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)),
-           TQT_SLOT(slotPrimaryColor(const TQColor &)));
-   connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)),
-           TQT_SLOT(slotSecondaryColor(const TQColor &)));
-   connect(m_comboPattern, TQT_SIGNAL(activated(int)),
-           TQT_SLOT(slotPattern(int)));
+   connect(m_colorPrimary, TQ_SIGNAL(changed(const TQColor &)),
+           TQ_SLOT(slotPrimaryColor(const TQColor &)));
+   connect(m_colorSecondary, TQ_SIGNAL(changed(const TQColor &)),
+           TQ_SLOT(slotSecondaryColor(const TQColor &)));
+   connect(m_comboPattern, TQ_SIGNAL(activated(int)),
+           TQ_SLOT(slotPattern(int)));
 
    // blend
-   connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int)));
-   connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)),
-           TQT_SLOT(slotBlendBalance(int)));
-   connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)),
-           TQT_SLOT(slotBlendReverse(bool)));
+   connect(m_comboBlend, TQ_SIGNAL(activated(int)), TQ_SLOT(slotBlendMode(int)));
+   connect(m_sliderBlend, TQ_SIGNAL(valueChanged(int)),
+           TQ_SLOT(slotBlendBalance(int)));
+   connect(m_cbBlendReverse, TQ_SIGNAL(toggled(bool)),
+           TQ_SLOT(slotBlendReverse(bool)));
 
    // Crossfading background
-   connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)),
-           TQT_SLOT(slotCrossFadeBg(bool)));
+   connect(m_cbCrossFadeBg, TQ_SIGNAL(toggled(bool)),
+           TQ_SLOT(slotCrossFadeBg(bool)));
 
    // advanced options
-   connect(m_buttonAdvanced, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotAdvanced()));
+   connect(m_buttonAdvanced, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotAdvanced()));
 
-   connect(m_buttonGetNew, TQT_SIGNAL(clicked()),
-           TQT_SLOT(slotGetNewStuff()));
+   connect(m_buttonGetNew, TQ_SIGNAL(clicked()),
+           TQ_SLOT(slotGetNewStuff()));
 
    // renderers
    m_renderer.resize(m_numDesks+1);
@@ -198,19 +198,19 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
          // Setup the merged-screen renderer
          KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config);
          m_renderer[i].insert( 0, r );
-         connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+         connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
          
          // Setup the common-screen renderer
          r = new KBackgroundRenderer(eDesk, 0, true, _config);
          m_renderer[i].insert( 1, r );
-         connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+         connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
          
          // Setup the remaining renderers for each screen
          for (unsigned j=0; j < m_numScreens; ++j )
          {
             r = new KBackgroundRenderer(eDesk, j, true, _config);
             m_renderer[i].insert( j+2, r );
-            connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+            connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
          }
       }
    }
@@ -225,14 +225,14 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
       // set up the common desktop renderer
       KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config);
       m_renderer[0].insert(0, r);
-      connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
+      connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)));
 
       // set up all the other desktop renderers
       for (unsigned i = 0; i < m_numDesks; ++i)
       {
          r = new KBackgroundRenderer(i, 0, false, _config);
          m_renderer[i+1].insert(0, r);
-         connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
+         connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)));
       }
    }
 
@@ -285,7 +285,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
    updateUI();
 
 #if (TQT_VERSION-0 >= 0x030200)
-   connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+   connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
 #endif
 }
 
@@ -447,7 +447,7 @@ void BGDialog::slotIdentifyScreens()
       screenLabel->setNum(int(s + 1));
         // BUGLET: we should not allow the identification to be entered again
         //         until the timer fires.
-      TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
+      TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close()));
 
       TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
       TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
@@ -536,7 +536,7 @@ void BGDialog::loadWallpaperFilesList() {
    TQStringList hiddenfiles;
    for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
    {
-      KSimpleConfig fileConfig(*it);
+      TDESimpleConfig fileConfig(*it);
       fileConfig.setGroup("Wallpaper");
 
       int slash = (*it).findRev('/') + 1;
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index 1cf601bee..ac826a1ff 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 #include <tqapplication.h>
 #include <tqpixmap.h>
@@ -47,7 +47,7 @@ BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name)
         BGMonitorLabel * label = new BGMonitorLabel(this);
         m_pBGMonitor[screen] = label;
         
-        connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) );
+        connect( label->monitor(), TQ_SIGNAL(imageDropped(const TQString &)), this, TQ_SIGNAL(imageDropped(const TQString &)) );
     }
     
     parent->setFixedSize(200, 186);
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index ee67beb66..522065711 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -24,9 +24,9 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kimageeffect.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kpixmapio.h>
 #include <tdetempfile.h>
 #include <kcursor.h>
@@ -63,7 +63,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
     m_TilingEnabled = false;
 
     m_pTimer = new TQTimer(this);
-    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render()));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(render()));
 }
 
 
@@ -239,8 +239,8 @@ int KBackgroundRenderer::doBackground(bool quit)
         delete m_pProc;
         m_pProc = new KShellProcess;
         *m_pProc << file;
-        connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)),
-                TQT_SLOT(slotBackgroundDone(TDEProcess *)));
+        connect(m_pProc, TQ_SIGNAL(processExited(TDEProcess *)),
+                TQ_SLOT(slotBackgroundDone(TDEProcess *)));
         m_pProc->start(KShellProcess::NotifyOnExit);
         retval = Wait;
         break;
@@ -402,7 +402,7 @@ wp_load:
 	// HACK: Use KFileMetaInfo only when we're attached to DCOP.
 	// KFileMetaInfo needs tdesycoca and so on, but this code is
 	// used also in krootimage (which in turn is used by tdm).
-	if( kapp->dcopClient()->isAttached()) {
+	if( tdeApp->dcopClient()->isAttached()) {
 	    KFileMetaInfo metaInfo(file);
 	    if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) {
 		switch (metaInfo.item("Orientation").string().toInt()) {
@@ -1228,7 +1228,7 @@ void KVirtualBGRenderer::initRenderers()
         KCrossBGRender *r = new KCrossBGRender(m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig);
         m_renderer.insert( i, r );
         r->setSize(renderSize(i));
-        connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) );
+        connect( r, TQ_SIGNAL(imageDone(int,int)), this, TQ_SLOT(screenDone(int,int)) );
     }
 }
 
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 278a250c9..2f41cb4c0 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -23,8 +23,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <krandomsequence.h>
 #include <konq_defaults.h>
 
@@ -84,9 +84,9 @@ void KBackgroundPattern::init(bool force_rw)
     m_File = m_pDirs->findResource("dtop_pattern", m_Name + ".desktop");
     if (force_rw || m_File.isEmpty()) {
         m_File = m_pDirs->saveLocation("dtop_pattern") + m_Name + ".desktop";
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
     } else
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
 
     m_pConfig->setGroup("KDE Desktop Pattern");
 
@@ -251,10 +251,10 @@ void KBackgroundProgram::init(bool force_rw)
     m_File = m_pDirs->findResource("dtop_program", m_Name + ".desktop");
     if (force_rw || m_File.isEmpty()) {
         m_File = m_pDirs->saveLocation("dtop_program") + m_Name + ".desktop";
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
         m_bReadOnly = false;
     } else {
-        m_pConfig = new KSimpleConfig(m_File);
+        m_pConfig = new TDESimpleConfig(m_File);
         m_bReadOnly = (m_File != locateLocal("dtop_program", m_Name + ".desktop"));
     }
     m_pConfig->setGroup("KDE Desktop Program");
@@ -1275,6 +1275,6 @@ void TDEGlobalBackgroundSettings::writeSettings()
 
     // tell kdesktop to get it's butt in gear and pick up the new settings
     TQByteArray data;
-    kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
+    tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
 }
 
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index 348446c82..40b2c68d8 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -17,7 +17,7 @@
 
 template <class TQString, class T> class TQMap;
 class TDEStandardDirs;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TDEConfig;
 class TQString;
 class TQImage;
@@ -66,7 +66,7 @@ private:
     TQString m_Name, m_Comment;
     TQString m_Pattern, m_File;
     TDEStandardDirs *m_pDirs;
-    KSimpleConfig *m_pConfig;
+    TDESimpleConfig *m_pConfig;
 };
 
 
@@ -137,7 +137,7 @@ private:
     TQString m_PreviewCommand, m_Comment;
     TQString m_Executable, m_File;
     TDEStandardDirs *m_pDirs;
-    KSimpleConfig *m_pConfig;
+    TDESimpleConfig *m_pConfig;
 };
 
 
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index b10c3707b..f75151247 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -30,7 +30,7 @@
 #include <tdefiledialog.h>
 #include <kimageio.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 
 #include "bgsettings.h"
@@ -114,11 +114,11 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings,
    if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random)
       dlg->m_cbRandom->setChecked(true);
 
-   connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
-   connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
-   connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));
-   connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
-   connect(dlg->m_listImages,  TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *)));
+   connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
+   connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
+   connect(dlg->m_buttonMoveUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp()));
+   connect(dlg->m_buttonMoveDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown()));
+   connect(dlg->m_listImages,  TQ_SIGNAL(clicked ( TQListBoxItem * )), TQ_SLOT(slotItemSelected( TQListBoxItem *)));
    dlg->m_buttonRemove->setEnabled( false );
    dlg->m_buttonMoveUp->setEnabled( false );
    dlg->m_buttonMoveDown->setEnabled( false );
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 75ed22269..23478b5e1 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -65,7 +65,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
     // reparenting that is done.
     setAcceptDrops(true);
 
-    connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(m_base, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
     TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"),
@@ -100,7 +100,7 @@ void KBackground::save()
     m_base->save();
 
     // reconfigure kdesktop. kdesktop will notify all clients
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
 
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 8b24dac6b..b2ff888b4 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -40,17 +40,17 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
   {
     return new KBellConfig(parent, "kcmbell");
   }
 
-  KDE_EXPORT void init_bell()
+  TDE_EXPORT void init_bell()
   {
     XKeyboardState kbd;
     XKeyboardControl kbdc;
 
-    XGetKeyboardControl(kapp->getDisplay(), &kbd);
+    XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
     TDEConfig config("kcmbellrc", true, false);
     config.setGroup("General");
@@ -58,7 +58,7 @@ extern "C"
     kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent);
     kbdc.bell_pitch = config.readNumEntry("Pitch", kbd.bell_pitch);
     kbdc.bell_duration = config.readNumEntry("Duration", kbd.bell_duration);
-    XChangeKeyboardControl(kapp->getDisplay(),
+    XChangeKeyboardControl(tdeApp->getDisplay(),
                            KBBellPercent | KBBellPitch | KBBellDuration,
                            &kbdc);
   }
@@ -84,7 +84,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
 				  "more sophisticated system notification, see the "
 				  "\"System Notifications\" control module for the "
 				  "\"Something Special Happened in the Program\" event."));
-  connect(m_useBell, TQT_SIGNAL( toggled( bool )), TQT_SLOT( useBell( bool )));
+  connect(m_useBell, TQ_SIGNAL( toggled( bool )), TQ_SLOT( useBell( bool )));
   row++;
   grid->addMultiCellWidget(m_useBell, row, row, 0, 1);
 
@@ -124,13 +124,13 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
   m_testButton = new TQPushButton(i18n("&Test"), box, "test");
   boxLayout->addWidget(m_testButton, 0, AlignRight);
   grid->addLayout( boxLayout, ++row, 1 );
-  connect( m_testButton, TQT_SIGNAL(clicked()), TQT_SLOT(ringBell()));
+  connect( m_testButton, TQ_SIGNAL(clicked()), TQ_SLOT(ringBell()));
   TQWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") );
 
   // watch for changes
-  connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+  connect(m_volume, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(m_pitch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(m_duration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
   
   TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"),
@@ -154,7 +154,7 @@ void KBellConfig::load()
 void KBellConfig::load( bool useDefaults )
 {
   XKeyboardState kbd;
-  XGetKeyboardControl(kapp->getDisplay(), &kbd);
+  XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
   m_volume->setValue(kbd.bell_percent);
   m_pitch->setValue(kbd.bell_pitch);
@@ -179,7 +179,7 @@ void KBellConfig::save()
   kbd.bell_percent = bellVolume;
   kbd.bell_pitch = bellPitch;
   kbd.bell_duration = bellDuration;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
 
@@ -216,7 +216,7 @@ void KBellConfig::ringBell()
 
   // store the old state
   XKeyboardState old_state;
-  XGetKeyboardControl(kapp->getDisplay(), &old_state);
+  XGetKeyboardControl(tdeApp->getDisplay(), &old_state);
 
   // switch to the test state
   XKeyboardControl kbd;
@@ -226,17 +226,17 @@ void KBellConfig::ringBell()
     kbd.bell_duration = m_duration->value();
   else
     kbd.bell_duration = 0;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
   // ring bell
-  XBell(kapp->getDisplay(),0);
+  XBell(tdeApp->getDisplay(),0);
 
   // restore old state
   kbd.bell_percent = old_state.bell_percent;
   kbd.bell_pitch = old_state.bell_pitch;
   kbd.bell_duration = old_state.bell_duration;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
 }
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index a492c9deb..6ff8505b5 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -34,7 +34,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdemessagebox.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
@@ -70,14 +70,14 @@ Dtime::Dtime(TQWidget * parent, const char *name)
 
   setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" );
   setDateTimeAuto->setText(i18n("Set date and time &automatically:"));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck()));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(serverTimeCheck()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()));
   layout1->addWidget( setDateTimeAuto );
 
   timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" );
-  connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged()));
-  connect(timeServerList, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(configChanged()));
-  connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool)));
+  connect(timeServerList, TQ_SIGNAL(activated(int)), TQ_SLOT(configChanged()));
+  connect(timeServerList, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(configChanged()));
+  connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), timeServerList, TQ_SLOT(setEnabled(bool)));
   timeServerList->setEnabled(false);
   timeServerList->setEditable(true);
   layout1->addWidget( timeServerList );
@@ -164,12 +164,12 @@ Dtime::Dtime(TQWidget * parent, const char *name)
   // End Dialog
   // *************************************************************
 
-  connect( hour, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( minute, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( second, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) );
-  connect( cal, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(changeDate(TQDate)));
+  connect( hour, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( minute, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( second, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) );
+  connect( cal, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(changeDate(TQDate)));
 
-  connect( &internalTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
+  connect( &internalTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) );
 
   load();
 
@@ -225,17 +225,17 @@ void Dtime::set_time()
   time.setHMS( hour->value(), minute->value(), second->value() );
   kclock->setTime( time );
 
-  emit timeChanged( TRUE );
+  emit timeChanged( true );
 }
 
 void Dtime::changeDate(TQDate d)
 {
   date = d;
-  emit timeChanged( TRUE );
+  emit timeChanged( true );
 }
 
 void Dtime::configChanged(){
-  emit timeChanged( TRUE );
+  emit timeChanged( true );
 }
 
 void Dtime::load()
@@ -347,11 +347,11 @@ void Dtime::timeout()
   // get current time
   time = TQTime::currentTime();
 
-  ontimeout = TRUE;
+  ontimeout = true;
   second->setValue(time.second());
   minute->setValue(time.minute());
   hour->setValue(time.hour());
-  ontimeout = FALSE;
+  ontimeout = false;
 
   kclock->setTime( time );
 }
diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h
index 387937185..ed8819502 100644
--- a/kcontrol/clock/dtime.h
+++ b/kcontrol/clock/dtime.h
@@ -118,7 +118,7 @@ class KStrictIntValidator : public TQIntValidator
 public:
   KStrictIntValidator(int bottom, int top, TQWidget * parent,
 		      const char * name = 0 )
-    : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {};
+    : TQIntValidator(bottom, top, parent, name) {};
   
   TQValidator::State validate( TQString & input, int & d ) const; 
 };
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index a59599b71..e7dcf872f 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -63,11 +63,11 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
 
   dtime = new Dtime(this);
   layout->addWidget(dtime);
-  connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(dtime, TQ_SIGNAL(timeChanged(bool)), this, TQ_SIGNAL(changed(bool)));
 
   tzone = new Tzone(this);
   layout->addWidget(tzone);
-  connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(tzone, TQ_SIGNAL(zoneChanged(bool)), this, TQ_SIGNAL(changed(bool)));
 
   layout->addStretch();
 
@@ -89,7 +89,7 @@ void KclockModule::save()
 #endif
 
   // Tell the clock applet about the change so that it can update its timezone
-  kapp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
+  tdeApp->dcopClient()->send( "kicker", "ClockApplet", "reconfigure()", TQByteArray() );
 }
 
 void KclockModule::load()
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 518c6663d..17e80f26d 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -40,7 +40,7 @@
 
 #if defined(USE_SOLARIS)
 #include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -52,7 +52,7 @@ Tzone::Tzone(TQWidget * parent, const char *name)
     setTitle(i18n("To change the timezone, select your area from the list below"));
 
     tzonelist = new KTimezoneWidget(this, "ComboBox_1", &m_zoneDb);
-    connect( tzonelist, TQT_SIGNAL(selectionChanged()), TQT_SLOT(handleZoneChange()) );
+    connect( tzonelist, TQ_SIGNAL(selectionChanged()), TQ_SLOT(handleZoneChange()) );
 
     m_local = new TQLabel(this);
 
diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h
index 8508c9ee0..5887628e9 100644
--- a/kcontrol/clock/tzone.h
+++ b/kcontrol/clock/tzone.h
@@ -43,7 +43,7 @@ signals:
 	void zoneChanged(bool);
 
 protected slots:
-  void handleZoneChange() {emit zoneChanged( TRUE );}
+  void handleZoneChange() {emit zoneChanged( true );}
 
 private:
   void currentZone();
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index c767836fd..b91dabc06 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -31,11 +31,11 @@
 #include <tdeio/netaccess.h>
 #include <kipc.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #endif
@@ -136,10 +136,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " \"Widget color\" box will change to reflect the part of the preview"
        " image you clicked.") );
 
-    connect( cs, TQT_SIGNAL( widgetSelected( int ) ),
-         TQT_SLOT( slotWidgetColor( int ) ) );
-    connect( cs, TQT_SIGNAL( colorDropped( int, const TQColor&)),
-         TQT_SLOT( slotColorForWidget( int, const TQColor&)));
+    connect( cs, TQ_SIGNAL( widgetSelected( int ) ),
+         TQ_SLOT( slotWidgetColor( int ) ) );
+    connect( cs, TQ_SIGNAL( colorDropped( int, const TQColor&)),
+         TQ_SLOT( slotColorForWidget( int, const TQColor&)));
     topLayout->addMultiCellWidget( cs, 0, 0, 0, 1 );
 
     TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this );
@@ -149,7 +149,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     mSchemeList = new KColorSchemeList();
     readSchemeNames();
     sList->setCurrentItem( 0 );
-    connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int)));
+    connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int)));
 
     TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes,"
        " including any that you may have created. You can preview an existing"
@@ -160,22 +160,22 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " another color scheme.") );
 
     addBt = new TQPushButton(i18n("&Save Scheme..."), group);
-    connect(addBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
+    connect(addBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
 
     TQWhatsThis::add( addBt, i18n("Press this button if you want to save"
        " the current color settings as a color scheme. You will be"
        " prompted for a name.") );
 
     removeBt = new TQPushButton(i18n("R&emove Scheme"), group);
-    removeBt->setEnabled(FALSE);
-    connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+    removeBt->setEnabled(false);
+    connect(removeBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
 
     TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected"
        " color scheme. Note that this button is disabled if you do not have"
        " permission to delete the color scheme.") );
 
 	importBt = new TQPushButton(i18n("I&mport Scheme..."), group);
-	connect(importBt, TQT_SIGNAL(clicked()),TQT_SLOT(slotImport()));
+	connect(importBt, TQ_SIGNAL(clicked()),TQ_SLOT(slotImport()));
 
 	TQWhatsThis::add( importBt, i18n("Press this button to import a new color"
 		" scheme. Note that the color scheme will only be available for the"
@@ -221,7 +221,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     setColorName(i18n("Alternate Background in Lists"), CSM_Alternate_background);
 
     wcCombo->adjustSize();
-    connect(wcCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidgetColor(int)));
+    connect(wcCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidgetColor(int)));
     groupLayout->addWidget(wcCombo);
 
     TQWhatsThis::add( wcCombo, i18n("Click here to select an element of"
@@ -230,8 +230,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " of the preview image above.") );
 
     colorButton = new KColorButton( group );
-    connect( colorButton, TQT_SIGNAL( changed(const TQColor &)),
-             TQT_SLOT(slotSelectColor(const TQColor &)));
+    connect( colorButton, TQ_SIGNAL( changed(const TQColor &)),
+             TQ_SLOT(slotSelectColor(const TQColor &)));
 
     groupLayout->addWidget( colorButton );
 
@@ -241,7 +241,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
 
     cbShadeList = new TQCheckBox(i18n("Shade sorted column in lists"), this);
     stackLayout->addWidget(cbShadeList);
-    connect(cbShadeList, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShadeSortColumnChanged(bool)));
+    connect(cbShadeList, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotShadeSortColumnChanged(bool)));
 
     TQWhatsThis::add(cbShadeList,
        i18n("Check this box to show the sorted column in a list with a shaded background"));
@@ -257,7 +257,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     sb = new TQSlider( TQt::Horizontal,group,"Slider" );
     sb->setRange( 0, 10 );
     sb->setFocusPolicy( TQWidget::StrongFocus );
-    connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
+    connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int)));
 
     TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level"
        " of the current color scheme. Contrast does not affect all of the"
@@ -272,7 +272,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
 
     cbExportColors = new TQCheckBox(i18n("Apply colors to &non-TDE applications"), this);
     topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 );
-    connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
+    connect(cbExportColors, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the"
        " current color scheme to non-TDE applications."));
@@ -371,8 +371,8 @@ void KColorScheme::save()
     cfg->sync();
 
     // KDE-1.x support
-    KSimpleConfig *config =
-    new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+    TDESimpleConfig *config =
+    new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
     config->setGroup( "General" );
     config->writeEntry("background", cs->back );
     config->writeEntry("selectBackground", cs->select );
@@ -396,7 +396,7 @@ void KColorScheme::save()
         flags |= KRdbExportColors;
     else
     {
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
         // Undo the property xrdb has placed on the root window (if any),
         // i.e. remove all entries, including ours
         XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER );
@@ -443,7 +443,7 @@ void KColorScheme::slotSave( )
     KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
     if (!entry) return;
     sCurrentScheme = entry->path;
-    KSimpleConfig *config = new KSimpleConfig(sCurrentScheme );
+    TDESimpleConfig *config = new TDESimpleConfig(sCurrentScheme );
     int i = sCurrentScheme.findRev('/');
     if (i >= 0)
       sCurrentScheme = sCurrentScheme.mid(i+1);
@@ -550,8 +550,8 @@ void KColorScheme::slotAdd()
             valid = true;
     }
 
-    disconnect(sList, TQT_SIGNAL(highlighted(int)), this,
-               TQT_SLOT(slotPreviewScheme(int)));
+    disconnect(sList, TQ_SIGNAL(highlighted(int)), this,
+               TQ_SLOT(slotPreviewScheme(int)));
 
     if (exists != -1)
     {
@@ -561,7 +561,7 @@ void KColorScheme::slotAdd()
     else
     {
        sFile = TDEGlobal::dirs()->saveLocation("data", "tdedisplay/color-schemes/") + sFile + ".kcsrc";
-       KSimpleConfig *config = new KSimpleConfig(sFile);
+       TDESimpleConfig *config = new TDESimpleConfig(sFile);
        config->setGroup( "Color Scheme");
        config->writeEntry("Name", sName);
        delete config;
@@ -574,7 +574,7 @@ void KColorScheme::slotAdd()
     TQPixmap preview = mkColorPreview(cs);
     int current = sList->currentItem();
     sList->changeItem(preview, sList->text(current), current);
-    connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int)));
+    connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int)));
     slotPreviewScheme(current);
 }
 
@@ -595,7 +595,7 @@ void KColorScheme::slotImport()
 	else
 	{
 		TQString sFile = location + file.fileName( false );
-		KSimpleConfig *config = new KSimpleConfig(sFile);
+		TDESimpleConfig *config = new TDESimpleConfig(sFile);
 		config->setGroup( "Color Scheme");
 		TQString sName = config->readEntry("Name", i18n("Untitled Theme"));
 		delete config;
@@ -605,7 +605,7 @@ void KColorScheme::slotImport()
 		TQPixmap preview = mkColorPreview(cs);
 		int current = sList->currentItem();
 		sList->changeItem(preview, sList->text(current), current);
-		connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int)));
+		connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int)));
 		slotPreviewScheme(current);
 	}
 }
@@ -798,7 +798,7 @@ void KColorScheme::readScheme( int index )
       KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes);
       if (!entry) return;
       sCurrentScheme = entry->path;
-      config = new KSimpleConfig(sCurrentScheme, true);
+      config = new TDESimpleConfig(sCurrentScheme, true);
       config->setGroup("Color Scheme");
       int i = sCurrentScheme.findRev('/');
       if (i >= 0)
@@ -865,7 +865,7 @@ void KColorScheme::readSchemeNames()
 
     // And add them
     for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-       KSimpleConfig *config = new KSimpleConfig(*it);
+       TDESimpleConfig *config = new TDESimpleConfig(*it);
        config->setGroup("Color Scheme");
        TQString str = config->readEntry("Name");
        if (str.isEmpty()) {
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index d83b821bd..3ee662627 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -324,9 +324,7 @@ void WidgetCanvas::drawSampleWidgets()
 
     TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() );
     pm.fill( back );
-#ifndef __osf__
     TQPainter::redirect( vertScrollBar, &pm );
-#endif
     vertScrollBar->repaint();
     TQPainter::redirect( vertScrollBar, 0 );
     vertScrollBar->hide();
@@ -346,7 +344,7 @@ void WidgetCanvas::drawSampleWidgets()
 
     // Inactive window
 
-    qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, FALSE,
+    qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, false,
                     &brush);
 
     paint.setBrush( iaTitle );
@@ -394,7 +392,7 @@ void WidgetCanvas::drawSampleWidgets()
 
     // Active window
 
-    qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, FALSE,
+    qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, false,
                     &brush);
 
     paint.setBrush( aTitle );paint.setPen( aTitle );
@@ -434,16 +432,16 @@ void WidgetCanvas::drawSampleWidgets()
     
     // Menu bar
 
-    //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
-    kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
+    //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, false, 2, &brush);
+    tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
 			TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
 
     paint.setFont( menuFont );
     paint.setPen(txt );
 	TQString file = i18n("File");
     textLen = paint.fontMetrics().width( file );
-    //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
-	kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
+    //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, false, 2, &brush);
+	tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
 			TQRect(30, 59, textLen + 10, 21), cg);
     paint.drawText( 35, 74, file );
 
@@ -465,7 +463,7 @@ void WidgetCanvas::drawSampleWidgets()
 
     brush.setColor( window );
     qDrawShadePanel ( &paint, 25, 80+5-4, width()-7-45-2,
-                      height(), cg, TRUE, 2, &brush);
+                      height(), cg, true, 2, &brush);
 
     // Standard text
     TQFont fnt = TDEGlobalSettings::generalFont();
@@ -528,7 +526,7 @@ void WidgetCanvas::drawSampleWidgets()
     cg2.setColor(TQColorGroup::Button, button);
     cg2.setColor(TQColorGroup::Background, window);
     //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
-	kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
+	tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
 			TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised);
     paint.setPen(buttonTxt);
     paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,
@@ -585,12 +583,12 @@ void WidgetCanvas::drawSampleWidgets()
     // Valance
 
     qDrawWinPanel ( &paint, 0, 0, width(), height(),
-                    parentWidget()->colorGroup(), TRUE, 0);
+                    parentWidget()->colorGroup(), true, 0);
 
     // Stop the painting
 
     hotspots[ spot++ ] =
         HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ?
 
-    repaint( FALSE );
+    repaint( false );
 }
diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui
index 1cbd35a5e..dba44f01c 100644
--- a/kcontrol/componentchooser/browserconfig_ui.ui
+++ b/kcontrol/componentchooser/browserconfig_ui.ui
@@ -166,9 +166,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectBrowser()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index e7b807327..3ad2073b1 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -33,11 +33,11 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kopenwith.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 #include <kurlrequester.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 class MyListBoxItem: public TQListBoxText
 {
@@ -53,7 +53,7 @@ public:
 CfgComponent::CfgComponent(TQWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){
 	m_lookupDict.setAutoDelete(true);
 	m_revLookupDict.setAutoDelete(true);
-	connect(ComponentSelector,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComponentChanged(const TQString&)));
+	connect(ComponentSelector,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(slotComponentChanged(const TQString&)));
 }
 
 CfgComponent::~CfgComponent(){}
@@ -126,9 +126,9 @@ void CfgComponent::defaults()
 CfgEmailClient::CfgEmailClient(TQWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){
 	pSettings = new KEMailSettings();
 
-	connect(kmailCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) );
-	connect(txtEMailClient, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) );
-	connect(chkRunTerminal, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
+	connect(kmailCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) );
+	connect(txtEMailClient, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()) );
+	connect(chkRunTerminal, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
 }
 
 CfgEmailClient::~CfgEmailClient() {
@@ -203,7 +203,7 @@ void CfgEmailClient::save(TDEConfig *)
 	if (!cfgName.isEmpty())
 		::chmod(TQFile::encodeName(cfgName), 0600);
 
-	kapp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
+	tdeApp->dcopClient()->emitDCOPSignal("KDE_emailSettingsChanged()", TQByteArray());
 
 	emit changed(false);
 }
@@ -252,9 +252,9 @@ void CfgFileManager::selectFileAssociations()
 //BEGIN Terminal Emulator Configuration
 
 CfgTerminalEmulator::CfgTerminalEmulator(TQWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){
-	connect(terminalLE,TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(configChanged()));
-	connect(terminalCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
-	connect(otherCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
+	connect(terminalLE,TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(configChanged()));
+	connect(terminalCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
+	connect(otherCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
 }
 
 CfgTerminalEmulator::~CfgTerminalEmulator() {
@@ -298,7 +298,7 @@ void CfgTerminalEmulator::save(TDEConfig *) {
 	delete config;
 
 	KIPC::sendMessageAll(KIPC::SettingsChanged);
-	kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
+	tdeApp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null);
 
 	emit changed(false);
 }
@@ -323,9 +323,9 @@ void CfgTerminalEmulator::selectTerminalApp()
 //BEGIN Browser Configuration
 
 CfgBrowser::CfgBrowser(TQWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){
-        connect(lineExec,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(configChanged()));
-	connect(radioKIO,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
-	connect(radioExec,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged()));
+        connect(lineExec,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(configChanged()));
+	connect(radioKIO,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
+	connect(radioExec,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged()));
 }
 
 CfgBrowser::~CfgBrowser() {
@@ -425,13 +425,13 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
 	TQStringList services=TDEGlobal::dirs()->findAllResources( "data","kcm_componentchooser/*.desktop",false,true,dummy);
 	for (TQStringList::Iterator it=services.begin();it!=services.end();++it)
 	{
-		KSimpleConfig cfg(*it);
+		TDESimpleConfig cfg(*it);
 		ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
 
 	}
 	ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
 	ServiceChooser->sort();
-	connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
+	connect(ServiceChooser,TQ_SIGNAL(highlighted(TQListBoxItem*)),this,TQ_SLOT(slotServiceSelected(TQListBoxItem*)));
 	ServiceChooser->setSelected(0,true);
 	slotServiceSelected(ServiceChooser->item(0));
 
@@ -443,7 +443,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	if (somethingChanged) {
 		if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice. Do you want to save that change now?</qt>"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard())==KMessageBox::Yes) save();
 	}
-	KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
+	TDESimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
 
 	ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
 	ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
@@ -504,7 +504,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 		configContainer->removeWidget(configWidget);
 		delete configWidget;
 		configWidget=newConfigWidget;
-		connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
+		connect(configWidget,TQ_SIGNAL(changed(bool)),this,TQ_SLOT(emitChanged(bool)));
 	        configContainer->setMinimumSize(configWidget->sizeHint());
 	}
 	
@@ -534,7 +534,7 @@ void ComponentChooser::load() {
 				configWidget->tqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
-			KSimpleConfig cfg(latestEditedService);
+			TDESimpleConfig cfg(latestEditedService);
 			plugin->load( &cfg );
 		}
 	}
@@ -547,7 +547,7 @@ void ComponentChooser::save() {
 				configWidget->tqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
-			KSimpleConfig cfg(latestEditedService);
+			TDESimpleConfig cfg(latestEditedService);
 			plugin->save( &cfg );
 		}
 	}
diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui
index ce89822d7..b8091e9ed 100644
--- a/kcontrol/componentchooser/emailclientconfig_ui.ui
+++ b/kcontrol/componentchooser/emailclientconfig_ui.ui
@@ -228,9 +228,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectEmailClient()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/filemanagerconfig_ui.ui b/kcontrol/componentchooser/filemanagerconfig_ui.ui
index fbcd23d43..ec78226c3 100644
--- a/kcontrol/componentchooser/filemanagerconfig_ui.ui
+++ b/kcontrol/componentchooser/filemanagerconfig_ui.ui
@@ -116,9 +116,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectFileAssociations()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index 30750bdd5..279a16fc1 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -27,7 +27,7 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ):
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	m_chooser=new ComponentChooser(this,"ComponentChooser");
-	connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool)));
+	connect(m_chooser,TQ_SIGNAL(changed(bool)),this,TQ_SIGNAL(changed(bool)));
 	setButtons( Help | Apply );
 
 	TDEAboutData *about =
@@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){
 
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * )
+    TDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * )
     {
         TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
         return new KCMComponentChooser( parent, "kcmcomponentchooser" );
diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
index cbb79cb9f..047d8e6be 100644
--- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
+++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
@@ -186,9 +186,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected">selectTerminalApp()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp
index 034d69897..d289f4aed 100644
--- a/kcontrol/crypto/certexport.cpp
+++ b/kcontrol/crypto/certexport.cpp
@@ -55,21 +55,21 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint());
 
    _filename = new KLineEdit(this);
    grid->addMultiCellWidget(_filename, 6, 6, 0, 4);
-   connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &)));
-   connect(_filename, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotExport()));
+   connect(_filename, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &)));
+   connect(_filename, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotExport()));
 
    _choose = new TQPushButton("...", this);
    grid->addWidget(_choose, 6, 5);
-   connect(_choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChoose()));
+   connect(_choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChoose()));
    
    _export = new TQPushButton(i18n("&Export"), this);
    grid->addWidget(_export, 8, 4);
-   connect(_export, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport()));
+   connect(_export, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExport()));
    _export->setEnabled(false);
 
    _cancel = new TQPushButton(i18n("&Cancel"), this);
    grid->addWidget(_cancel, 8, 5);
-   connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
+   connect(_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
 }
 
 
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 71521af04..a1efa58d0 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -62,11 +62,11 @@
 #include <kmdcodec.h>
 #include <tdemessagebox.h>
 #include <kpassdlg.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kpushbutton.h>
 #include <kresolver.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
 
@@ -265,7 +265,7 @@ TQString whatstr;
   grid = new TQGridLayout(tabSSL, 7, 2, KDialog::marginHint(),
                                        KDialog::spacingHint() );
   mUseTLS = new TQCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL);
-  connect(mUseTLS, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mUseTLS, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mUseTLS, 0, 0);
   whatstr = i18n("TLS is the newest revision of the SSL protocol."
                  " It integrates better with other protocols and has"
@@ -273,14 +273,14 @@ TQString whatstr;
   TQWhatsThis::add(mUseTLS, whatstr);
 
   mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL);
-  connect(mUseSSLv2, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mUseSSLv2, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mUseSSLv2, 1, 0);
   whatstr = i18n("SSL v2 is the second revision of the SSL protocol."
                 " It is most common to enable v2 and v3.");
   TQWhatsThis::add(mUseSSLv2, whatstr);
 
   mUseSSLv3 = new TQCheckBox(i18n("Enable SSLv&3"), tabSSL);
-  connect(mUseSSLv3, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mUseSSLv3, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mUseSSLv3, 1, 1);
   whatstr = i18n("SSL v3 is the third revision of the SSL protocol."
                 " It is most common to enable v2 and v3.");
@@ -296,8 +296,8 @@ TQString whatstr;
   SSLv2Box->setSelectionMode(TQListView::NoSelection);
 
   grid->addWidget( SSLv2Box, 2, 0 );
-  connect( mUseSSLv2, TQT_SIGNAL( toggled( bool ) ),
-	   SSLv2Box, TQT_SLOT( setEnabled( bool )));
+  connect( mUseSSLv2, TQ_SIGNAL( toggled( bool ) ),
+	   SSLv2Box, TQ_SLOT( setEnabled( bool )));
 #else
   TQLabel *nossllabel = new TQLabel(i18n("SSL ciphers cannot be configured"
                                " because this module was not linked"
@@ -308,9 +308,9 @@ TQString whatstr;
 
   // no need to parse kdeglobals.
   config = new TDEConfig("cryptodefaults", false, false);
-  policies = new KSimpleConfig("ksslpolicies", false);
-  pcerts = new KSimpleConfig("ksslcertificates", false);
-  authcfg = new KSimpleConfig("ksslauthmap", false);
+  policies = new TDESimpleConfig("ksslpolicies", false);
+  pcerts = new TDESimpleConfig("ksslcertificates", false);
+  authcfg = new TDESimpleConfig("ksslauthmap", false);
 
 #ifdef HAVE_SSL
   SSLv3Box = new TQListView(tabSSL, "v3ciphers");
@@ -321,8 +321,8 @@ TQString whatstr;
   TQWhatsThis::add(SSLv3Box, whatstr);
   SSLv3Box->setSelectionMode(TQListView::NoSelection);
   grid->addWidget(SSLv3Box, 2, 1);
-  connect( mUseSSLv3, TQT_SIGNAL( toggled( bool ) ),
-	   SSLv3Box, TQT_SLOT( setEnabled( bool )));
+  connect( mUseSSLv3, TQ_SIGNAL( toggled( bool ) ),
+	   SSLv3Box, TQ_SLOT( setEnabled( bool )));
 
   loadCiphers();
 
@@ -346,7 +346,7 @@ TQString whatstr;
 
   TQWhatsThis::add(cwcb, whatStr);
 
-  connect(cwcb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectCipher(int)));
+  connect(cwcb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectCipher(int)));
 
 
 
@@ -354,21 +354,21 @@ TQString whatstr;
 #endif
 
   mWarnOnEnter = new TQCheckBox(i18n("Warn on &entering SSL mode"), tabSSL);
-  connect(mWarnOnEnter, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnEnter, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnEnter, 5, 0);
   whatstr = i18n("If selected, you will be notified when entering an SSL"
                 " enabled site");
   TQWhatsThis::add(mWarnOnEnter, whatstr);
 
   mWarnOnLeave = new TQCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL);
-  connect(mWarnOnLeave, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnLeave, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnLeave, 5, 1);
   whatstr = i18n("If selected, you will be notified when leaving an SSL"
                 " based site.");
   TQWhatsThis::add(mWarnOnLeave, whatstr);
 
   mWarnOnUnencrypted = new TQCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL);
-  connect(mWarnOnUnencrypted, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnUnencrypted, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnUnencrypted, 6, 0);
   whatstr = i18n("If selected, you will be notified before sending"
                 " unencrypted data via a web browser.");
@@ -376,7 +376,7 @@ TQString whatstr;
 
 #if 0  // NOT IMPLEMENTED IN KDE 3.0
   mWarnOnMixed = new TQCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL);
-  connect(mWarnOnMixed, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnOnMixed, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addWidget(mWarnOnMixed, 6, 1);
   whatstr = i18n("If selected, you will be notified if you view a page"
                 " that has both encrypted and non-encrypted parts.");
@@ -396,9 +396,9 @@ TQString whatstr;
   oPath = new KURLRequester(oInfo);
   oPath->setMode(KFile::Directory);
   oTest = new TQPushButton(i18n("&Test"), oInfo);
-  connect(oTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTestOSSL()));
+  connect(oTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTestOSSL()));
 
-  connect(oPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()));
+  connect(oPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()));
 
   //
   //  Settings for the EGD
@@ -406,9 +406,9 @@ TQString whatstr;
   TQFrame *eFrame = new TQFrame(tabOSSL);
   TQVBoxLayout *egrid = new TQVBoxLayout(eFrame);
   mUseEGD = new TQCheckBox(i18n("Use EGD"), eFrame);
-  connect(mUseEGD, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEGD()));
+  connect(mUseEGD, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEGD()));
   mUseEFile = new TQCheckBox(i18n("Use entropy file"), eFrame);
-  connect(mUseEFile, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEFile()));
+  connect(mUseEFile, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEFile()));
   vbox->addWidget(eFrame);
   egrid->addWidget(mUseEGD);
   egrid->addWidget(mUseEFile);
@@ -419,7 +419,7 @@ TQString whatstr;
   grid2->addWidget(mEGDLabel, 0, 0);
   mEGDPath = new KURLRequester(egdframe);
   grid2->addWidget(mEGDPath, 0, 1);
-  connect(mEGDPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()));
+  connect(mEGDPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()));
   vbox->addWidget(egdframe);
   whatstr = i18n("If selected, OpenSSL will be asked to use the entropy gathering"
           " daemon (EGD) for initializing the pseudo-random number generator.");
@@ -454,35 +454,35 @@ TQString whatstr;
   grid->addMultiCellWidget(yourSSLBox, 0, 5, 0, 4);
   yourSSLBox->addColumn(i18n("Common Name"));
   yourSSLBox->addColumn(i18n("Email Address"));
-  connect(yourSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotYourCertSelect()));
+  connect(yourSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotYourCertSelect()));
 
   yourSSLImport = new TQPushButton(i18n("I&mport..."), tabYourSSLCert);
-  connect(yourSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourImport()));
+  connect(yourSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourImport()));
   grid->addWidget(yourSSLImport, 0, 5);
 
   yourSSLExport = new TQPushButton(i18n("&Export..."), tabYourSSLCert);
   yourSSLExport->setEnabled(false);
-  connect(yourSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourExport()));
+  connect(yourSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourExport()));
   grid->addWidget(yourSSLExport, 1, 5);
 
   yourSSLRemove = new TQPushButton(i18n("Remo&ve"), tabYourSSLCert);
   yourSSLRemove->setEnabled(false);
-  connect(yourSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourRemove()));
+  connect(yourSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourRemove()));
   grid->addWidget(yourSSLRemove, 2, 5);
 
   yourSSLUnlock = new TQPushButton(i18n("&Unlock"), tabYourSSLCert);
   yourSSLUnlock->setEnabled(false);
-  connect(yourSSLUnlock, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourUnlock()));
+  connect(yourSSLUnlock, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourUnlock()));
   grid->addWidget(yourSSLUnlock, 3, 5);
 
   yourSSLVerify = new TQPushButton(i18n("Verif&y"), tabYourSSLCert);
   yourSSLVerify->setEnabled(false);
-  connect(yourSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourVerify()));
+  connect(yourSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourVerify()));
   grid->addWidget(yourSSLVerify, 4, 5);
 
   yourSSLPass = new TQPushButton(i18n("Chan&ge Password..."), tabYourSSLCert);
   yourSSLPass->setEnabled(false);
-  connect(yourSSLPass, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourPass()));
+  connect(yourSSLPass, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourPass()));
   grid->addWidget(yourSSLPass, 5, 5);
 
   grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5);
@@ -579,14 +579,14 @@ TQString whatstr;
   hostCertBG->setEnabled(false);
   authRemove->setEnabled(false);
 
-  connect(defCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged()));
-  connect(defCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged()));
-  connect(hostAuthList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotAuthItemChanged()));
-  connect(authAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewHostAuth()));
-  connect(authRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveHostAuth()));
-  connect(authHost, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotAuthText(const TQString &)));
-  connect(hostCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAuthButtons()));
-  connect(hostCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAuthCombo()));
+  connect(defCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged()));
+  connect(defCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged()));
+  connect(hostAuthList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotAuthItemChanged()));
+  connect(authAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewHostAuth()));
+  connect(authRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveHostAuth()));
+  connect(authHost, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotAuthText(const TQString &)));
+  connect(hostCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAuthButtons()));
+  connect(hostCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAuthCombo()));
 
 #else
   nossllabel = new TQLabel(i18n("SSL certificates cannot be managed"
@@ -607,7 +607,7 @@ TQString whatstr;
 
   otherSSLBox = new TQListView(tabOtherSSLCert);
   otherSSLBox->setAllColumnsShowFocus(true);
-  connect(otherSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotOtherCertSelect()));
+  connect(otherSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotOtherCertSelect()));
   whatstr = i18n("This list box shows which site and person certificates TDE"
                 " knows about. You can easily manage them from here.");
   TQWhatsThis::add(otherSSLBox, whatstr);
@@ -616,21 +616,21 @@ TQString whatstr;
   grid->addMultiCellWidget(otherSSLBox, 0, 7, 0, 4);
 
   otherSSLExport = new TQPushButton(i18n("&Export..."), tabOtherSSLCert);
-  connect(otherSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotExportCert()));
+  connect(otherSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotExportCert()));
   grid->addWidget(otherSSLExport, 0, 5);
   whatstr = i18n("This button allows you to export the selected certificate"
                 " to a file of various formats.");
   TQWhatsThis::add(otherSSLExport, whatstr);
 
   otherSSLRemove = new TQPushButton(i18n("&Remove"), tabOtherSSLCert);
-  connect(otherSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveCert()));
+  connect(otherSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveCert()));
   grid->addWidget(otherSSLRemove, 1, 5);
   whatstr = i18n("This button removes the selected certificate"
                 " from the certificate cache.");
   TQWhatsThis::add(otherSSLRemove, whatstr);
 
   otherSSLVerify = new TQPushButton(i18n("&Verify"), tabOtherSSLCert);
-  connect(otherSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotVerifyCert()));
+  connect(otherSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotVerifyCert()));
   grid->addWidget(otherSSLVerify, 2, 5);
   whatstr = i18n("This button tests the selected certificate"
                 " for validity.");
@@ -675,9 +675,9 @@ TQString whatstr;
   cachePerm->setEnabled(false);
   cacheUntil->setEnabled(false);
   untilDate->setEnabled(false);
-  connect(cachePerm, TQT_SIGNAL(clicked()), TQT_SLOT(slotPermanent()));
-  connect(cacheUntil, TQT_SIGNAL(clicked()), TQT_SLOT(slotUntil()));
-  connect(untilDate, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotDatePick()));
+  connect(cachePerm, TQ_SIGNAL(clicked()), TQ_SLOT(slotPermanent()));
+  connect(cacheUntil, TQ_SIGNAL(clicked()), TQ_SLOT(slotUntil()));
+  connect(untilDate, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(slotDatePick()));
   whatstr = i18n("Select here to make the cache entry permanent.");
   TQWhatsThis::add(cachePerm, whatstr);
   whatstr = i18n("Select here to make the cache entry temporary.");
@@ -691,7 +691,7 @@ TQString whatstr;
   policyPrompt = new TQRadioButton(i18n("&Prompt"), policyGroup);
   policyGroup->setEnabled(false);
   grid->addMultiCellWidget(policyGroup, 16, 19, 3, 5);
-  connect(policyGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPolicyChanged(int)));
+  connect(policyGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPolicyChanged(int)));
   whatstr = i18n("Select this to always accept this certificate.");
   TQWhatsThis::add(policyAccept, whatstr);
   whatstr = i18n("Select this to always reject this certificate.");
@@ -729,19 +729,19 @@ TQString whatstr;
   caList->addColumn(i18n("Organization"));
   caList->addColumn(i18n("Organizational Unit"));
   caList->addColumn(i18n("Common Name"));
-  connect(caList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotCAItemChanged()));
+  connect(caList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotCAItemChanged()));
 
   caSSLImport = new TQPushButton(i18n("I&mport..."), tabSSLCA);
-  connect(caSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAImport()));
+  connect(caSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAImport()));
   grid->addWidget(caSSLImport, 0, 7);
 
   caSSLRemove = new TQPushButton(i18n("&Remove"), tabSSLCA);
-  connect(caSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARemove()));
+  connect(caSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARemove()));
   grid->addWidget(caSSLRemove, 1, 7);
   caSSLRemove->setEnabled(false);
 
   caSSLRestore = new TQPushButton(i18n("Res&tore"), tabSSLCA);
-  connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore()));
+  connect(caSSLRestore, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARestore()));
   grid->addWidget(caSSLRestore, 2, 7);
 
   caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString()));
@@ -754,11 +754,11 @@ TQString whatstr;
   caEmail = new TQCheckBox(i18n("Accept for email signing"), tabSSLCA);
   caCode = new TQCheckBox(i18n("Accept for code signing"), tabSSLCA);
   grid->addMultiCellWidget(caSite, 7, 7, 0, 3);
-  connect(caSite, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
+  connect(caSite, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked()));
   grid->addMultiCellWidget(caEmail, 8, 8, 0, 3);
-  connect(caEmail, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
+  connect(caEmail, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked()));
   grid->addMultiCellWidget(caCode, 9, 9, 0, 3);
-  connect(caCode, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked()));
+  connect(caCode, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked()));
   caSite->setEnabled(false);
   caEmail->setEnabled(false);
   caCode->setEnabled(false);
@@ -785,11 +785,11 @@ TQString whatstr;
 #ifdef HAVE_SSL
   grid = new TQGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint());
   mWarnSelfSigned = new TQCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts);
-  connect(mWarnSelfSigned, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnSelfSigned, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   mWarnExpired = new TQCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts);
-  connect(mWarnExpired, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnExpired, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   mWarnRevoked = new TQCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts);
-  connect(mWarnRevoked, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()));
+  connect(mWarnRevoked, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()));
   grid->addMultiCellWidget(mWarnSelfSigned, 0, 0, 0, 3);
   grid->addMultiCellWidget(mWarnExpired, 1, 1, 0, 3);
   grid->addMultiCellWidget(mWarnRevoked, 2, 2, 0, 3);
@@ -807,15 +807,15 @@ TQString whatstr;
   grid->addMultiCellWidget(macBox, 5, 8, 0, 2);
 
   macAdd = new TQPushButton(i18n("&Add"), tabSSLCOpts);
-  //connect(macAdd, TQT_SIGNAL(), TQT_SLOT());
+  //connect(macAdd, TQ_SIGNAL(), TQ_SLOT());
   grid->addWidget(macAdd, 4, 3);
 
   macRemove = new TQPushButton(i18n("&Remove"), tabSSLCOpts);
-  //connect(macRemove, TQT_SIGNAL(), TQT_SLOT());
+  //connect(macRemove, TQ_SIGNAL(), TQ_SLOT());
   grid->addWidget(macRemove, 5, 3);
 
   macClear = new KPushButton(KGuiItem::clear(), tabSSLCOpts);
-  //connect(macAdd, TQT_SIGNAL(), TQT_SLOT());
+  //connect(macAdd, TQ_SIGNAL(), TQ_SLOT());
   grid->addWidget(macClear, 6, 3);
 
 #else
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index f468a473a..bdb0d74ec 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -34,7 +34,7 @@
 #include <tqvbuttongroup.h>
 
 #include <tdecmodule.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 class TQGridLayout;
 class TQVButtonGroup;
@@ -354,7 +354,7 @@ private:
   TQLabel *cHash;
 
   TDEConfig *config;
-  KSimpleConfig *policies, *pcerts, *authcfg;
+  TDESimpleConfig *policies, *pcerts, *authcfg;
   TDEConfig *cacfg;
 
   bool ___lehack;       // to hack around a lineedit problem
diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp
index b5cfe00a9..335e5e634 100644
--- a/kcontrol/crypto/kdatetimedlg.cpp
+++ b/kcontrol/crypto/kdatetimedlg.cpp
@@ -58,11 +58,11 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint());
 
    _ok = new KPushButton(KStdGuiItem::ok(), this);
    grid->addWidget(_ok, 8, 4);
-   connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+   connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
 
    _cancel = new KPushButton(KStdGuiItem::cancel(), this);
    grid->addWidget(_cancel, 8, 5);
-   connect(_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+   connect(_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 
 }
 
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index 65748686a..d66e6b5f3 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -12,7 +12,7 @@
 #include <tdefontdialog.h>
 #include <kgenericfactory.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "cssconfig.h"
@@ -50,46 +50,46 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &)
   TDEFontChooser::getFontList(fonts, 0);
   customDialog->fontFamily->insertStringList(fonts);
 
-  connect(configDialog->useDefault, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(configDialog->useAccess, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(configDialog->useUser, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(configDialog->urlRequester, TQT_SIGNAL(textChanged(const TQString&)),
-	  TQT_SLOT(changed()));
-  connect(configDialog->customize, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotCustomize()));
-  connect(customDialog->basefontsize, TQT_SIGNAL(highlighted(int)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->basefontsize, TQT_SIGNAL(textChanged(const TQString&)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->dontScale, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->blackOnWhite, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->whiteOnBlack, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->customColor, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->foregroundColor, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->backgroundColor, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->fontFamily, TQT_SIGNAL(highlighted(int)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->fontFamily, TQT_SIGNAL(textChanged(const TQString&)),
-	  TQT_SLOT(changed()));
-  connect(customDialog->sameFamily, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->preview, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotPreview()));
-  connect(customDialog->sameColor, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->hideImages, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
-  connect(customDialog->hideBackground, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(changed()));
+  connect(configDialog->useDefault, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(configDialog->useAccess, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(configDialog->useUser, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(configDialog->urlRequester, TQ_SIGNAL(textChanged(const TQString&)),
+	  TQ_SLOT(changed()));
+  connect(configDialog->customize, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotCustomize()));
+  connect(customDialog->basefontsize, TQ_SIGNAL(highlighted(int)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->basefontsize, TQ_SIGNAL(textChanged(const TQString&)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->dontScale, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->blackOnWhite, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->whiteOnBlack, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->customColor, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->foregroundColor, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->backgroundColor, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->fontFamily, TQ_SIGNAL(highlighted(int)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->fontFamily, TQ_SIGNAL(textChanged(const TQString&)),
+	  TQ_SLOT(changed()));
+  connect(customDialog->sameFamily, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->preview, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotPreview()));
+  connect(customDialog->sameColor, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->hideImages, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
+  connect(customDialog->hideBackground, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(changed()));
 
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 0);
   vbox->addWidget(configDialog);
@@ -193,7 +193,7 @@ void CSSConfig::save()
     {
       CSSTemplate css(templ);
 
-      dest = kapp->dirs()->saveLocation("data", "kcmcss");
+      dest = tdeApp->dirs()->saveLocation("data", "kcmcss");
       dest += "/override.css";
 
       css.expand(dest, cssDict());
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp
index 3555d0ddc..30e940550 100644
--- a/kcontrol/display/display.cpp
+++ b/kcontrol/display/display.cpp
@@ -63,7 +63,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label )
     top->addWidget( kcm );
     m_tabs->addTab( page, label );
 
-    connect( kcm, TQT_SIGNAL( changed(bool) ), TQT_SLOT( moduleChanged(bool) ) );
+    connect( kcm, TQ_SIGNAL( changed(bool) ), TQ_SLOT( moduleChanged(bool) ) );
     m_modules.insert(kcm, false);
   }
   else
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 2c262fc3b..a5c3205b3 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -47,10 +47,10 @@
 #include <kurlrequester.h>
 #include <tdecmoduleloader.h>
 #include <kgenericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <unistd.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <string>
 #include <stdio.h>
 #include <tqstring.h>
@@ -64,7 +64,7 @@
 typedef KGenericFactory<KDisplayConfig, TQWidget> KDisplayCFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_displayconfig, KDisplayCFactory("kcmdisplayconfig") )
 
-KSimpleConfig *systemconfig;
+TDESimpleConfig *systemconfig;
 
 TQPoint moveTQRectOutsideTQRect(TQRect base, TQRect movable, int fallback_level = 0) {
 	TQPoint final_result;
@@ -434,8 +434,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor->screen_id == monitor_id) {
 					moved_monitor = monitor;
 					screendata = m_screenInfoArray[activeProfileName].at(moved_monitor->screen_id);
@@ -475,8 +475,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
 	primary_monitor = NULL;
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor->screen_id == j) {
 					monitor->is_primary = true;	// Prevent dragging of the primary monitor
 					primary_monitor = monitor;
@@ -548,8 +548,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move)
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor != monitor_to_move) {
 					other_monitors = other_monitors.unite(MonitorRegion(monitor->geometry()));
 				}
@@ -592,8 +592,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move)
 			monitors = base->monitorPhyArrange->childrenListObject();
 			if ( monitors.count() ) {
 				for ( i = 0; i < int(monitors.count()); ++i ) {
-					if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-						DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+					if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+						DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 						if (monitor != monitor_to_move) {
 							other_monitors2 = other_monitors2.unite(MonitorRegion(monitor->geometry()));
 						}
@@ -641,8 +641,8 @@ void KDisplayConfig::moveMonitor(DraggableMonitor* monitor, int realx, int realy
 	primary_monitor = NULL;
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				if (monitor->screen_id == j) {
 					monitor->is_primary = true;	// Prevent dragging of the primary monitor
 					primary_monitor = monitor;
@@ -745,18 +745,18 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 {
 #ifdef WITH_TDEHWLIB
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 #endif
 
 	m_randrsimple = new KRandrSimpleAPI();
 
 	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	if (getuid() != 0) {
-		systemconfig = new KSimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" );
+		systemconfig = new TDESimpleConfig( locateLocal("config", "tdedisplay/", true) + "tdedisplayconfigrc" );
 		systemconfig->setFileWriteMode(0600);
 	}
 	else {
-		systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" ));
+		systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdedisplay/tdedisplayconfigrc" ));
 		systemconfig->setFileWriteMode(0644);
 	}
 
@@ -769,7 +769,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 	setAboutData( about );
 
 	m_gammaApplyTimer = new TQTimer();
-	connect(m_gammaApplyTimer, SIGNAL(timeout()), this, SLOT(applyGamma()));
+	connect(m_gammaApplyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(applyGamma()));
 
 	base = new DisplayConfigBase(this);
 	profileRulesGrid = new TQGridLayout(base->profileRulesGridWidget, 1, 1, KDialog::marginHint());
@@ -792,54 +792,54 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 		base->nonRootWarningLabel->hide();
 	}
 
-	connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(processLockoutControls()));
-	connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile()));
-	connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile()));
-	connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile()));
-	connect(base->activateProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateProfile()));
-	connect(base->reloadProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reloadProfileFromDisk()));
-	connect(base->saveProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveProfile()));
-	connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-	connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockoutControls()));
-	connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
-	connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectDefaultProfile(int)));
-	connect(base->displayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int)));
-
-	connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-	connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-	connect(base->gammaTargetSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaTargetChanged(int)));
-	connect(base->rotationSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(rotationInfoChanged()));
-	connect(base->refreshRateDD, TQT_SIGNAL(activated(int)), TQT_SLOT(refreshInfoChanged()));
-	connect(base->orientationHFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged()));
-	connect(base->orientationVFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged()));
-	connect(base->resolutionSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resolutionSliderChanged(int)));
-	connect(base->gammaAllSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaAllSliderChanged(int)));
-	connect(base->gammaRedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaRedSliderChanged(int)));
-	connect(base->gammaGreenSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaGreenSliderChanged(int)));
-	connect(base->gammaBlueSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaBlueSliderChanged(int)));
-	connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(selectScreen(int)));
-	connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaselectScreen(int)));
-	connect(base->systemEnableDPMS, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->systemEnableDPMSStandby, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->systemEnableDPMSSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->systemEnableDPMSPowerDown, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged()));
-	connect(base->dpmsStandbyTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged()));
-	connect(base->dpmsSuspendTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged()));
-	connect(base->dpmsPowerDownTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged()));
-	connect(base->monitorPhyArrange, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay()));
-
-	connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(ensurePrimaryMonitorIsAvailable()));
-	connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(updateExtendedMonitorInformation()));
-
-	connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQT_SLOT(setEnabled(bool)));
-
-	connect(base->rescanHardware, TQT_SIGNAL(clicked()), TQT_SLOT(rescanHardware()));
-	connect(base->loadExistingProfile, TQT_SIGNAL(clicked()), TQT_SLOT(reloadProfile()));
-	connect(base->previewConfiguration, TQT_SIGNAL(clicked()), TQT_SLOT(activatePreview()));
-	connect(base->identifyMonitors, TQT_SIGNAL(clicked()), TQT_SLOT(identifyMonitors()));
+	connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(processLockoutControls()));
+	connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile()));
+	connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile()));
+	connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile()));
+	connect(base->activateProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateProfile()));
+	connect(base->reloadProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reloadProfileFromDisk()));
+	connect(base->saveProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveProfile()));
+	connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+	connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockoutControls()));
+	connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+	connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectDefaultProfile(int)));
+	connect(base->displayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int)));
+
+	connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+	connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+	connect(base->gammaTargetSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaTargetChanged(int)));
+	connect(base->rotationSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(rotationInfoChanged()));
+	connect(base->refreshRateDD, TQ_SIGNAL(activated(int)), TQ_SLOT(refreshInfoChanged()));
+	connect(base->orientationHFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged()));
+	connect(base->orientationVFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged()));
+	connect(base->resolutionSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resolutionSliderChanged(int)));
+	connect(base->gammaAllSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaAllSliderChanged(int)));
+	connect(base->gammaRedSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaRedSliderChanged(int)));
+	connect(base->gammaGreenSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaGreenSliderChanged(int)));
+	connect(base->gammaBlueSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaBlueSliderChanged(int)));
+	connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(selectScreen(int)));
+	connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaselectScreen(int)));
+	connect(base->systemEnableDPMS, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->systemEnableDPMSStandby, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->systemEnableDPMSSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->systemEnableDPMSPowerDown, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged()));
+	connect(base->dpmsStandbyTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged()));
+	connect(base->dpmsSuspendTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged()));
+	connect(base->dpmsPowerDownTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged()));
+	connect(base->monitorPhyArrange, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay()));
+
+	connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(ensurePrimaryMonitorIsAvailable()));
+	connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(updateExtendedMonitorInformation()));
+
+	connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQ_SLOT(setEnabled(bool)));
+
+	connect(base->rescanHardware, TQ_SIGNAL(clicked()), TQ_SLOT(rescanHardware()));
+	connect(base->loadExistingProfile, TQ_SIGNAL(clicked()), TQ_SLOT(reloadProfile()));
+	connect(base->previewConfiguration, TQ_SIGNAL(clicked()), TQ_SLOT(activatePreview()));
+	connect(base->identifyMonitors, TQ_SIGNAL(clicked()), TQ_SLOT(identifyMonitors()));
 
 	load();
 
@@ -926,14 +926,14 @@ void KDisplayConfig::identifyMonitors () {
 		idWidget->setPaletteBackgroundColor(TQt::black);
 		idWidget->show();
 		KDialog::centerOnScreen(idWidget, i);
-		TQTimer::singleShot(3000, idWidget, SLOT(close()));
+		TQTimer::singleShot(3000, idWidget, TQ_SLOT(close()));
 	}
 
 	m_randrsimple->freeScreenInfoStructure(randr_screen_info);
 }
 
 void KDisplayConfig::activatePreview() {
-	m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE);
+	m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true);
 }
 
 void KDisplayConfig::load()
@@ -1080,10 +1080,10 @@ void KDisplayConfig::renameProfile () {
 
 void KDisplayConfig::activateProfile() {
 	if (getuid() != 0) {
-		m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE, locateLocal("config", "/", true));
+		m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true, locateLocal("config", "/", true));
 	}
 	else {
-		m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE, KDE_CONFDIR);
+		m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true, KDE_CONFDIR);
 	}
 	rescanHardware();
 }
@@ -1329,9 +1329,9 @@ void KDisplayConfig::updateDragDropDisplay() {
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				TQWidget *monitor = TQT_TQWIDGET(monitors.at( i ));
-				if ( !monitor->close(TRUE) ) {
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				TQWidget *monitor = static_cast<TQWidget*>(monitors.at( i ));
+				if ( !monitor->close(true) ) {
 					Q_ASSERT("zombie monitor will not go away!");
 				}
 			}
@@ -1349,9 +1349,9 @@ void KDisplayConfig::updateDragDropDisplay() {
 			if (((j==0) && (screendata->is_primary==true)) || ((j==1) && (screendata->is_primary==false))) {	// This ensures that the primary monitor is always the first one created and placed on the configuration widget
 				bool isvisiblyrotated = ((screendata->current_rotation_index == ROTATION_90_DEGREES_INDEX) || (screendata->current_rotation_index == ROTATION_270_DEGREES_INDEX));
 				DraggableMonitor *m = new DraggableMonitor( base->monitorPhyArrange, 0, WStyle_Customize | WDestructiveClose | WStyle_NoBorder | WX11BypassWM );
-				connect(m, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay()));
-				connect(m, TQT_SIGNAL(monitorSelected(int)), this, TQT_SLOT(selectScreen(int)));
-				connect(m, TQT_SIGNAL(monitorDragComplete(int)), this, TQT_SLOT(updateDraggableMonitorInformation(int)));
+				connect(m, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay()));
+				connect(m, TQ_SIGNAL(monitorSelected(int)), this, TQ_SLOT(selectScreen(int)));
+				connect(m, TQ_SIGNAL(monitorDragComplete(int)), this, TQ_SLOT(updateDraggableMonitorInformation(int)));
 				m->screen_id = i;
 				if (isvisiblyrotated)
 					m->setFixedSize(screendata->current_y_pixel_count*base->monitorPhyArrange->resize_factor, screendata->current_x_pixel_count*base->monitorPhyArrange->resize_factor);
@@ -1381,8 +1381,8 @@ void KDisplayConfig::layoutDragDropDisplay() {
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+			if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+				DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
 				screendata = m_screenInfoArray[activeProfileName].at(monitor->screen_id);
 				moveMonitor(monitor, screendata->absolute_x_position, screendata->absolute_y_position);
 			}
@@ -1536,7 +1536,7 @@ void KDisplayConfig::gammaAllSliderChanged(int index) {
 	screendata->gamma_green = ((float)base->gammaAllSlider->value())/10.0;
 	screendata->gamma_blue = ((float)base->gammaAllSlider->value())/10.0;
 
-	m_gammaApplyTimer->start(10, TRUE);
+	m_gammaApplyTimer->start(10, true);
 
 	base->gammaAllSlider->blockSignals(false);
 	base->gammaRedSlider->blockSignals(false);
@@ -1558,7 +1558,7 @@ void KDisplayConfig::gammaRedSliderChanged(int index) {
 	screendata->gamma_red = ((float)index)/10.0;
 	gammaSetAverageAllSlider();
 	setGammaLabels();
-	m_gammaApplyTimer->start(10, TRUE);
+	m_gammaApplyTimer->start(10, true);
 
 	base->gammaAllSlider->blockSignals(false);
 	base->gammaRedSlider->blockSignals(false);
@@ -1580,7 +1580,7 @@ void KDisplayConfig::gammaGreenSliderChanged(int index) {
 	screendata->gamma_green = ((float)index)/10.0;
 	gammaSetAverageAllSlider();
 	setGammaLabels();
-	m_gammaApplyTimer->start(10, TRUE);
+	m_gammaApplyTimer->start(10, true);
 
 	base->gammaAllSlider->blockSignals(false);
 	base->gammaRedSlider->blockSignals(false);
@@ -1602,7 +1602,7 @@ void KDisplayConfig::gammaBlueSliderChanged(int index) {
 	screendata->gamma_blue = ((float)index)/10.0;
 	gammaSetAverageAllSlider();
 	setGammaLabels();
-	m_gammaApplyTimer->start(10, TRUE);
+	m_gammaApplyTimer->start(10, true);
 
 	base->gammaAllSlider->blockSignals(false);
 	base->gammaRedSlider->blockSignals(false);
@@ -1670,8 +1670,8 @@ void KDisplayConfig::createHotplugRulesGrid() {
 			int index = (*it2).outputs.findIndex(m_hardwareScreenInfoArray.at(j)->screenUniqueName);
 
 			TQCheckBox* cb = new TQCheckBox(base->profileRulesGridWidget, (TQString("%1:%2").arg(i).arg(j)).ascii());
-			connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(profileRuleCheckBoxStateChanged(int)));
-			connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
+			connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(profileRuleCheckBoxStateChanged(int)));
+			connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
 			cb->setTristate(true);
 			if (index < 0) {
 				cb->setNoChange();
@@ -1693,7 +1693,7 @@ void KDisplayConfig::createHotplugRulesGrid() {
 			cb->show();
 		}
 		KComboBox* combo = new KComboBox(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii());
-		connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
+		connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
 		combo->insertItem(i18n("<default>"));
 		for (TQStringList::Iterator it3 = availableProfileNames.begin(); it3 != availableProfileNames.end(); ++it3) {
 			combo->insertItem(*it3);
@@ -1703,8 +1703,8 @@ void KDisplayConfig::createHotplugRulesGrid() {
 		combo->show();
 		TQPushButton* button = new TQPushButton(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii());
 		button->setText(i18n("Delete Rule"));
-		connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfileRule()));
-		connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+		connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfileRule()));
+		connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 		profileRulesGrid->addWidget(button, i+1, j+2);
 		button->show();
 		i++;
@@ -1712,8 +1712,8 @@ void KDisplayConfig::createHotplugRulesGrid() {
 
 	TQPushButton* button = new TQPushButton(base->profileRulesGridWidget);
 	button->setText(i18n("Add New Rule"));
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewProfileRule()));
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+	connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewProfileRule()));
+	connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 	profileRulesGrid->addMultiCellWidget(button, i+2, i+2, 0, numberOfScreens+2);
 	button->show();
 }
@@ -1921,7 +1921,7 @@ TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label )
 		top->addWidget( kcm );
 		base->mainTabContainerWidget->addTab( page, label );
 
-		connect( kcm, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( changed() ) );
+		connect( kcm, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( changed() ) );
 		//m_modules.insert(kcm, false);
 		return kcm;
 	}
@@ -1992,7 +1992,7 @@ void KDisplayConfig::saveActiveSystemWideProfileToDisk()
 
 void KDisplayConfig::save()
 {
-	if (m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], TRUE)) {
+	if (m_randrsimple->applyDisplayConfiguration(m_screenInfoArray[activeProfileName], true)) {
 		saveActiveSystemWideProfileToDisk();
 
 		updateProfileConfigObjectFromGrid();
@@ -2020,8 +2020,8 @@ void KDisplayConfig::save()
 	else {
 		// Signal that settings were NOT applied
 		TQTimer *t = new TQTimer( this );
-		connect(t, SIGNAL(timeout()), SLOT(changed()) );
-		t->start( 100, FALSE );
+		connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(changed()) );
+		t->start( 100, false );
 	}
 }
 
diff --git a/kcontrol/displayconfig/displayconfigbase.ui b/kcontrol/displayconfig/displayconfigbase.ui
index edd6a2328..0595d65aa 100644
--- a/kcontrol/displayconfig/displayconfigbase.ui
+++ b/kcontrol/displayconfig/displayconfigbase.ui
@@ -913,9 +913,9 @@
 <includes>
 	<include location="local" impldecl="in implementation">DisplayConfigBase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">kcombobox.h</include>
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index b2d9eb8b0..ce03182e0 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -300,9 +300,9 @@ is configured with 'Browse local network' option above.</string>
         </widget>
     </grid>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot>radioButton2_2_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in declaration">tdecmodule.h</include>
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index d442552e3..0bad0dfa7 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -35,10 +35,10 @@
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdeparts/genericfactory.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
 
@@ -65,13 +65,13 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); 
 	addConfig(DNSSD::Configuration::self(),this);
 	// it is host-wide setting so it has to be in global config file
-	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
+	domain = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
 	domain->setGroup("publishing");
 	load();
-	connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
-	connect(secretedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
-	connect(domainedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
-	connect(enableZeroconf,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableZeroconfChanged(bool)));
+	connect(hostedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged()));
+	connect(secretedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged()));
+	connect(domainedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged()));
+	connect(enableZeroconf,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableZeroconfChanged(bool)));
 	m_enableZeroconfChanged=false;
 	if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false);
 	kcfg_PublishType->hide(); //unused with Avahi
@@ -119,10 +119,10 @@ void KCMDnssd::load()
 {
 	if (geteuid()==0) loadMdnsd();
 	enableZeroconf->setChecked(false);
-	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus");
+	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
 	avahiStatus.start();
 	while (avahiStatus.isRunning()) {
-	  kapp->processEvents();
+	  tdeApp->processEvents();
 	}
 	int exitStatus = avahiStatus.exitStatus();
 	if (exitStatus == 0) { // disabled
diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h
index 03699af04..ebc26530d 100644
--- a/kcontrol/dnssd/kcmdnssd.h
+++ b/kcontrol/dnssd/kcmdnssd.h
@@ -26,7 +26,7 @@
 #include <configdialog.h>
 #include <tdeaboutdata.h>
 
-class KSimpleConfig;
+class TDESimpleConfig;
 class KCMDnssd: public ConfigDialog
 {
 	TQ_OBJECT
@@ -45,7 +45,7 @@ private:
 	bool saveMdnsd();
 	TQMap<TQString,TQString> mdnsdLines;
 	bool m_wdchanged;
-	KSimpleConfig* domain;
+	TDESimpleConfig* domain;
 	bool m_enableZeroconfChanged;
 };
 
diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp
index 9eeec46e1..f6117ed17 100644
--- a/kcontrol/ebrowsing/main.cpp
+++ b/kcontrol/ebrowsing/main.cpp
@@ -61,7 +61,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
 #if 0
     opts = new FilterOptions(this);
     tab->addTab(opts, i18n("&Filters"));
-    connect(opts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(opts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 #endif
 
     modules.setAutoDelete(true);
@@ -75,7 +75,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
         {
             modules.append(module);
             helper.insert(it.current()->configName(), module);
-            connect(module, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+            connect(module, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
         }
     }
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index eb96f682a..622cec32c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -38,8 +38,8 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kservice.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 
 #include "ikwsopts.h"
@@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults )
       m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true);
 
     // Connect all the signals/slots...
-    connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
-            TQT_SLOT(setWebShortcutState()));
-    connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
-            TQT_SLOT(configChanged()));
-
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-           this, TQT_SLOT(updateSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-           this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)),
-           this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-
-
-    connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this,
-            TQT_SLOT(configChanged()));
-    connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this,
-            TQT_SLOT(configChanged()));
-
-    connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider()));
-    connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider()));
+    connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this,
+            TQ_SLOT(setWebShortcutState()));
+    connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this,
+            TQ_SLOT(configChanged()));
+
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+           this, TQ_SLOT(updateSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+           this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(returnPressed(TQListViewItem *)),
+           this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(executed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(spacePressed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(pressed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(clicked(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+
+
+    connect(m_dlg->cmbDefaultEngine, TQ_SIGNAL(activated(const TQString &)), this,
+            TQ_SLOT(configChanged()));
+    connect(m_dlg->cmbDelimiter, TQ_SIGNAL(activated(const TQString &)), this,
+            TQ_SLOT(configChanged()));
+
+    connect(m_dlg->pbNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(addSearchProvider()));
+    connect(m_dlg->pbChange, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSearchProvider()));
 
     emit changed( useDefaults );
 }
@@ -223,7 +223,7 @@ void FilterOptions::save()
   // kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl;
 
   int changedProviderCount = 0;
-  TQString path = kapp->dirs()->saveLocation("services", "searchproviders/");
+  TQString path = tdeApp->dirs()->saveLocation("services", "searchproviders/");
 
   m_favoriteEngines.clear();
 
@@ -274,7 +274,7 @@ void FilterOptions::save()
         }
       }
 
-      KSimpleConfig service(path + name + ".desktop");
+      TDESimpleConfig service(path + name + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
       service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
@@ -291,7 +291,7 @@ void FilterOptions::save()
   for (TQStringList::ConstIterator it = m_deletedProviders.begin();
       it != m_deletedProviders.end(); ++it)
   {
-      TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
+      TQStringList matches = tdeApp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
 
       // Shouldn't happen
       if (!matches.count())
@@ -304,7 +304,7 @@ void FilterOptions::save()
           TQFile::remove(matches[0]);
           continue;
       }
-      KSimpleConfig service(path + *it + ".desktop");
+      TDESimpleConfig service(path + *it + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
       service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
@@ -332,7 +332,7 @@ void FilterOptions::defaults()
 
 void FilterOptions::configChanged()
 {
-  // kdDebug () << "FilterOptions::configChanged: TRUE" << endl;
+  // kdDebug () << "FilterOptions::configChanged: true" << endl;
   emit changed(true);
 }
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
index f6227b90f..f29678e15 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kurl.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 
 #include "ikwsopts.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index ae86c5836..a33f4e78b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -33,9 +33,9 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprotocolinfo.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstaticdeleter.h>
 
 #include "kuriikwsfiltereng.h"
@@ -449,7 +449,7 @@ void KURISearchFilterEngine::loadConfig()
   // contains the sycoca based search provider configuration (malte).
   // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
   {
-    KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc");
+    TDESimpleConfig oldConfig(tdeApp->dirs()->saveLocation("config") + TQString(name()) + "rc");
     oldConfig.setGroup("General");
 
     if (oldConfig.hasKey("SearchEngines"))
@@ -498,7 +498,7 @@ void KURISearchFilterEngine::loadConfig()
           delete provider;
         }
 
-        KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
+        TDESimpleConfig desktop(tdeApp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
         desktop.setGroup("Desktop Entry");
         desktop.writeEntry("Type", "Service");
         desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
index 78f84780c..fb816ef84 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 
 #include "ikwsopts.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index a1f6ca619..bf295462f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -43,11 +43,11 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
 
     enableButtonSeparator(true);
 
-    m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40);
+    m_dlg->leQuery->setMinimumWidth(tdeApp->fontMetrics().maxWidth() * 40);
 
-    connect(m_dlg->leName, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
-    connect(m_dlg->leQuery, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
-    connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
+    connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
+    connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
+    connect(m_dlg->leShortcut, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
 
     // Data init
     TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames();
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index c2e3af8fa..01e9b93b5 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -22,8 +22,8 @@
 
 #include "localdomainurifilter.h"
 
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <tqregexp.h>
@@ -84,8 +84,8 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
 
         TDEProcess proc;
         proc << helper << host;
-        connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                 TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) );
+        connect( &proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                 TQ_SLOT(receiveOutput(TDEProcess *, char *, int)) );
         if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ))
             return last_result = false;
 
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
index cae4c5abb..28beeada0 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
@@ -32,7 +32,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kmimetype.h>
 
@@ -379,7 +379,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setRef(ref);
     u.setQuery(query);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
+    if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it's a file will get
       // an access denied error later on.
@@ -514,7 +514,7 @@ bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setPath(path);
     u.setRef(ref);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
+    if (tdeApp && !tdeApp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it exists and will get
       // an access denied error later on.
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 34a9404a4..05aa07174 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -28,7 +28,7 @@
 #include <tdelocale.h>
 #include <knuminput.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurllabel.h>
 #include <dcopref.h>
 
@@ -80,11 +80,11 @@ static const int DFLT_OFF   = 60;
 
 extern "C" {
 
-    KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) {
+    TDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) {
 	return new KEnergy(parent, "kcmenergy");
     }
 
-    KDE_EXPORT void init_energy() {
+    TDE_EXPORT void init_energy() {
 #ifdef HAVE_DPMS
         TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
         cfg->setGroup("DisplayEnergy");
@@ -176,7 +176,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name)
         TDEGlobal::locale()->insertCatalogue("kpowersave");
         // ### these i18n strings need to be synced with kpowersave !!
         m_pCBEnable= new TQCheckBox(i18n("&Enable display power management" ), this);
-        connect(m_pCBEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeEnable(bool)));
+        connect(m_pCBEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeEnable(bool)));
         hbox->addWidget(m_pCBEnable);
 
         TQWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the"
@@ -198,7 +198,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name)
     logo->setPixmap(TQPixmap(locate("data", "kcontrol/pics/energybig.png")));
     logo->setTipText(i18n("Learn more about the Energy Star program"));
     logo->setUseTips(true); 
-connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString &)));
+connect(logo, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(openURL(const TQString &)));
 
     hbox->addStretch();
     hbox->addWidget(logo);
@@ -210,7 +210,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
     m_pStandbySlider->setRange(0, 120, 10);
     m_pStandbySlider->setSuffix(i18n(" min"));
     m_pStandbySlider->setSpecialValueText(i18n("Disabled"));
-    connect(m_pStandbySlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeStandby(int)));
+    connect(m_pStandbySlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeStandby(int)));
     top->addWidget(m_pStandbySlider);
     TQWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity"
        " after which the display should enter \"standby\" mode. This is the"
@@ -221,7 +221,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
     m_pSuspendSlider->setRange(0, 120, 10);
     m_pSuspendSlider->setSuffix(i18n(" min"));
     m_pSuspendSlider->setSpecialValueText(i18n("Disabled"));
-    connect(m_pSuspendSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeSuspend(int)));
+    connect(m_pSuspendSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeSuspend(int)));
     top->addWidget(m_pSuspendSlider);
     TQWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity"
        " after which the display should enter \"suspend\" mode. This is the"
@@ -233,7 +233,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
     m_pOffSlider->setRange(0, 120, 10);
     m_pOffSlider->setSuffix(i18n(" min"));
     m_pOffSlider->setSpecialValueText(i18n("Disabled"));
-    connect(m_pOffSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeOff(int)));
+    connect(m_pOffSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeOff(int)));
     top->addWidget(m_pOffSlider);
     TQWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity"
        " after which the display should be powered off. This is the"
@@ -247,13 +247,13 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
         if(m_bKPowersave) {
             TQPushButton* btnKPowersave = new TQPushButton(this);
             btnKPowersave->setText(i18n("Configure KPowersave..."));
-            connect(btnKPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchKPowersave()));
+            connect(btnKPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchKPowersave()));
             top->addWidget(btnKPowersave);
         }
         if(m_bTDEPowersave) {
             TQPushButton* btnTDEPowersave = new TQPushButton(this);
             btnTDEPowersave->setText(i18n("Configure TDEPowersave..."));
-            connect(btnTDEPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchTDEPowersave()));
+            connect(btnTDEPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchTDEPowersave()));
             top->addWidget(btnTDEPowersave);
 		}
     }
diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp
index 5a0fd097b..ef46b8b8b 100644
--- a/kcontrol/filetypes/control.cpp
+++ b/kcontrol/filetypes/control.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	  KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *)
+	  TDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *)
           {
         return new FileTypesView(parent, "filetypes");
 	  }
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index 7000a97e5..e9cb1fbf9 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -37,7 +37,7 @@ FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
   // The order of those two items is very important. If you change it, fix typeslistitem.cpp !
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
   new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
-  connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
+  connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) ));
 
   TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
     " will do when you click on a file belonging to this group. Konqueror can display the file in"
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index 589677b58..7928cef73 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -30,7 +30,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   iconButton = new TDEIconButton(firstWidget);
   iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType);
-  connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString)));
+  connect(iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(updateIcon(TQString)));
 
   iconButton->setFixedSize(70, 70);
   hBox->addWidget(iconButton);
@@ -46,7 +46,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   grid->addRowSpacing(0, fontMetrics().lineSpacing());
 
   extensionLB = new TQListBox(gb);
-  connect(extensionLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableExtButtons(int)));
+  connect(extensionLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableExtButtons(int)));
   grid->addMultiCellWidget(extensionLB, 1, 2, 0, 0);
   grid->setRowStretch(0, 0);
   grid->setRowStretch(1, 1);
@@ -59,16 +59,16 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   addExtButton = new TQPushButton(i18n("Add..."), gb);
   addExtButton->setEnabled(false);
-  connect(addExtButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(addExtension()));
+  connect(addExtButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(addExtension()));
   grid->addWidget(addExtButton, 1, 1);
 
   TQWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") );
 
   removeExtButton = new TQPushButton(i18n("Remove"), gb);
   removeExtButton->setEnabled(false);
-  connect(removeExtButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(removeExtension()));
+  connect(removeExtButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(removeExtension()));
   grid->addWidget(removeExtButton, 2, 1);
 
   TQWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") );
@@ -78,8 +78,8 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   gb->setColumnLayout(1, TQt::Horizontal);
   description = new KLineEdit(gb);
-  connect(description, TQT_SIGNAL(textChanged(const TQString &)),
-          TQT_SLOT(updateDescription(const TQString &)));
+  connect(description, TQ_SIGNAL(textChanged(const TQString &)),
+          TQ_SLOT(updateDescription(const TQString &)));
 
   wtstr = i18n("You can enter a short description for files of the selected"
     " file type (e.g. 'HTML Page'). This description will be used by applications"
@@ -88,7 +88,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   TQWhatsThis::add( description, wtstr );
 
   serviceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_APPLICATIONS, firstWidget );
-  connect( serviceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect( serviceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   firstLayout->addWidget(serviceListWidget, 5);
 
   // Second tab - Embedding
@@ -106,10 +106,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
   new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed );
   m_rbGroupSettings = new TQRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed );
-  connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) ));
+  connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) ));
 
   m_chkAskSave = new TQCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed);
-  connect(m_chkAskSave, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAskSaveToggled(bool) ));
+  connect(m_chkAskSave, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAskSaveToggled(bool) ));
 
   TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager"
     " will do when you click on a file of this type. Konqueror can display the file in"
@@ -121,7 +121,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
 
   embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
   embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
-  connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect( embedServiceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   secondLayout->addWidget(embedServiceListWidget, 3);
 
   addTab( firstWidget, i18n("&General") );
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 3dfa28c50..e414014fe 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -11,12 +11,12 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kipc.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "newtypedlg.h"
 #include "filetypedetails.h"
@@ -66,8 +66,8 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
   patternFilterLBL->setBuddy( patternFilterLE );
   leftLayout->addMultiCellWidget(patternFilterLE, 1, 1, 0, 2);
 
-  connect(patternFilterLE, TQT_SIGNAL(textChanged(const TQString &)),
-          this, TQT_SLOT(slotFilter(const TQString &)));
+  connect(patternFilterLE, TQ_SIGNAL(textChanged(const TQString &)),
+          this, TQ_SLOT(slotFilter(const TQString &)));
 
   wtstr = i18n("Enter a part of a filename pattern. Only file types with a "
                "matching file pattern will appear in the list.");
@@ -81,10 +81,10 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   typesLV->addColumn(i18n("Known Types"));
   leftLayout->addMultiCellWidget(typesLV, 2, 2, 0, 2);
-  connect(typesLV, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-          this, TQT_SLOT(updateDisplay(TQListViewItem *)));
-  connect(typesLV, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-          this, TQT_SLOT(slotDoubleClicked(TQListViewItem *)));
+  connect(typesLV, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+          this, TQ_SLOT(updateDisplay(TQListViewItem *)));
+  connect(typesLV, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+          this, TQ_SLOT(slotDoubleClicked(TQListViewItem *)));
 
   TQWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of"
     " the file types which are known on your system. Click on the '+' sign"
@@ -93,13 +93,13 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
     " file type using the controls on the right.") );
 
   TQPushButton *addTypeB = new TQPushButton(i18n("Add..."), this);
-  connect(addTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(addType()));
+  connect(addTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(addType()));
   leftLayout->addWidget(addTypeB, 3, 0);
 
   TQWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") );
 
   m_removeTypeB = new TQPushButton(i18n("&Remove"), this);
-  connect(m_removeTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(removeType()));
+  connect(m_removeTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(removeType()));
   leftLayout->addWidget(m_removeTypeB, 3, 2);
   m_removeTypeB->setEnabled(false);
 
@@ -112,16 +112,16 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   // File Type Details
   m_details = new FileTypeDetails( m_widgetStack );
-  connect( m_details, TQT_SIGNAL( changed(bool) ),
-           this, TQT_SLOT( setDirty(bool) ) );
-  connect( m_details, TQT_SIGNAL( embedMajor(const TQString &, bool &) ),
-           this, TQT_SLOT( slotEmbedMajor(const TQString &, bool &)));
+  connect( m_details, TQ_SIGNAL( changed(bool) ),
+           this, TQ_SLOT( setDirty(bool) ) );
+  connect( m_details, TQ_SIGNAL( embedMajor(const TQString &, bool &) ),
+           this, TQ_SLOT( slotEmbedMajor(const TQString &, bool &)));
   m_widgetStack->addWidget( m_details, 1 /*id*/ );
 
   // File Group Details
   m_groupDetails = new FileGroupDetails( m_widgetStack );
-  connect( m_groupDetails, TQT_SIGNAL( changed(bool) ),
-           this, TQT_SLOT( setDirty(bool) ) );
+  connect( m_groupDetails, TQ_SIGNAL( changed(bool) ),
+           this, TQ_SLOT( setDirty(bool) ) );
   m_widgetStack->addWidget( m_groupDetails, 2 /*id*/ );
 
   // Widget shown on startup
@@ -132,9 +132,9 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   m_widgetStack->raiseWidget( m_emptyWidget );
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); // this takes some time
+  TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); // this takes some time
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) );
 }
 
 FileTypesView::~FileTypesView()
@@ -362,7 +362,7 @@ bool FileTypesView::sync( TQValueList<TypesListItem *>& itemsModified )
     loc = m_ptr->desktopEntryPath();
     loc = locateLocal("mime", loc);
 
-    KDesktopFile config(loc, false, "mime");
+    TDEDesktopFile config(loc, false, "mime");
     config.writeEntry("Type", "MimeType");
     config.writeEntry("MimeType", m_ptr->name());
     config.writeEntry("Hidden", true);
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 19aa01a59..b78886ef7 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -27,9 +27,9 @@
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
 #include <tdesycoca.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
@@ -58,11 +58,11 @@ void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem )
 
   // This code is very similar to kcdialog.cpp
   setMainWidget( m_details );
-  connect(m_details, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
+  connect(m_details, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool)));
   // TODO setHelp()
   enableButton(Apply, false);
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) );
 }
 
 void FileTypeDialog::save()
@@ -159,7 +159,7 @@ int main(int argc, char ** argv)
   }
 
   FileTypeDialog dlg( mime, createType );
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   if( args->isSet( "parent" )) {
     bool ok;
     long id = args->getOption("parent").toLong(&ok);
diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp
index d0463d7ad..bc8555634 100644
--- a/kcontrol/filetypes/kservicelistwidget.cpp
+++ b/kcontrol/filetypes/kservicelistwidget.cpp
@@ -35,7 +35,7 @@
 #include "kserviceselectdlg.h"
 #include "typeslistitem.h"
 #include <kpropertiesdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 KServiceListItem::KServiceListItem( KService *pService, int kind )
     : TQListBoxText(), desktopPath(pService->desktopEntryPath())
@@ -74,9 +74,9 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
   grid->setRowStretch(6, 1);
 
   servicesLB = new TQListBox(gb);
-  connect(servicesLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int)));
+  connect(servicesLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int)));
   grid->addMultiCellWidget(servicesLB, 1, 6, 0, 0);
-  connect( servicesLB, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQT_SLOT( editService()));
+  connect( servicesLB, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQ_SLOT( editService()));
 
   TQString wtstr =
     (kind == SERVICELIST_APPLICATIONS ?
@@ -96,7 +96,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servUpButton = new TQPushButton(i18n("Move &Up"), gb);
   servUpButton->setEnabled(false);
-  connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(promoteService()));
+  connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(promoteService()));
   grid->addWidget(servUpButton, 2, 1);
 
   TQWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ?
@@ -109,7 +109,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servDownButton = new TQPushButton(i18n("Move &Down"), gb);
   servDownButton->setEnabled(false);
-  connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(demoteService()));
+  connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(demoteService()));
   grid->addWidget(servDownButton, 3, 1);
 
   TQWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ?
@@ -122,7 +122,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servNewButton = new TQPushButton(i18n("Add..."), gb);
   servNewButton->setEnabled(false);
-  connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addService()));
+  connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addService()));
   grid->addWidget(servNewButton, 1, 1);
 
   TQWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) );
@@ -130,7 +130,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servEditButton = new TQPushButton(i18n("Edit..."), gb);
   servEditButton->setEnabled(false);
-  connect(servEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(editService()));
+  connect(servEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(editService()));
   grid->addWidget(servEditButton, 4, 1);
 
   TQWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) );
@@ -138,7 +138,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n
 
   servRemoveButton = new TQPushButton(i18n("Remove"), gb);
   servRemoveButton->setEnabled(false);
-  connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeService()));
+  connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeService()));
   grid->addWidget(servRemoveButton, 5, 1);
 
   TQWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) );
diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp
index f8c4f0dd4..e9618683d 100644
--- a/kcontrol/filetypes/kserviceselectdlg.cpp
+++ b/kcontrol/filetypes/kserviceselectdlg.cpp
@@ -50,7 +50,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
     m_listbox->sort();
     m_listbox->setMinimumHeight(350);
     m_listbox->setMinimumWidth(300);
-    connect(m_listbox,TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotOk()));
+    connect(m_listbox,TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotOk()));
     setMainWidget(vbox);
 }
 
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index 63d65e4ec..1c5d8b6f7 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -20,8 +20,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 #include <kstaticdeleter.h>
 
 #include "typeslistitem.h"
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 7239b62ac..6236ad49f 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -28,9 +28,9 @@
 #include <kipc.h>
 #include <tdemessagebox.h>
 #include <knuminput.h>
-#include <kprocio.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdeprocio.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <stdlib.h>
 
 #ifdef HAVE_FREETYPE2
@@ -186,7 +186,7 @@ void FontUseItem::writeFont()
     config->setGroup(_rcgroup);
     config->writeEntry(_rckey, font(), true, true);
   } else {
-    config = new KSimpleConfig(locateLocal("config", _rcfile));
+    config = new TDESimpleConfig(locateLocal("config", _rcfile));
     config->setGroup(_rcgroup);
     config->writeEntry(_rckey, font());
     config->sync();
@@ -270,13 +270,13 @@ FontAASettings::FontAASettings(TQWidget *parent)
   enableWidgets();
   setMainWidget(mw);
 
-  connect(excludeRange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useSubPixel, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(excludeFrom, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed()));
-  connect(excludeTo, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed()));
-  connect(subPixelType, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+  connect(excludeRange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useSubPixel, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(excludeFrom, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed()));
+  connect(excludeTo, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed()));
+  connect(subPixelType, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed()));
 #ifdef HAVE_FONTCONFIG
-  connect(hintingStyle, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+  connect(hintingStyle, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed()));
 #endif
 }
 
@@ -596,7 +596,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
       );
 
     fontUseList.append(i);
-    connect(i, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(fontSelected()));
+    connect(i, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(fontSelected()));
 
     TQLabel * fontUse = new TQLabel(name+":", this);
     TQWhatsThis::add(fontUse, *quickHelpIt++);
@@ -612,7 +612,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
    TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this);
    TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts"));
    hblay->addWidget( fontAdjustButton );
-   connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff()));
+   connect(fontAdjustButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyFontDiff()));
 
    layout->addSpacing(KDialog::spacingHint());
 
@@ -627,11 +627,11 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
    TQWhatsThis::add(cbAA, i18n("If this option is selected, TDE will smooth the edges of curves in "
                               "fonts."));
    aaSettingsButton = new TQPushButton( i18n( "Configure..." ), this);
-   connect(aaSettingsButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCfgAa()));
+   connect(aaSettingsButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCfgAa()));
    label->setBuddy( cbAA );
    lay->addWidget( cbAA, 0, 1 );
    lay->addWidget( aaSettingsButton, 0, 2 );
-   connect(cbAA, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseAntiAliasing()));
+   connect(cbAA, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseAntiAliasing()));
 
    label = new TQLabel( i18n( "Force fonts DPI:" ), this );
    lay->addWidget( label, 1, 0 );
@@ -645,10 +645,10 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
        " is also often misused when poor quality fonts are used that do not"
        " look well with DPI values other than 96 or 120 DPI.</p>");
    TQWhatsThis::add(comboForceDpi, whatsthis);
-   connect(comboForceDpi, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseFontDPI()));
+   connect(comboForceDpi, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseFontDPI()));
    sbDpiValue = new KIntSpinBox(64, 512, 1, 96, 10, this);
    TQWhatsThis::add(sbDpiValue, whatsthis);
-   connect(sbDpiValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+   connect(sbDpiValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
    lay->addWidget( comboForceDpi, 1, 1 );
    lay->addWidget( sbDpiValue, 1, 2 );
 
@@ -736,7 +736,7 @@ void TDEFonts::save()
   // otherwise don't explicitly remove it and leave any possible system-wide value
   if(dpi == DPINone)
   {
-      KProcIO proc;
+      TDEProcIO proc;
       proc << "xrdb" << "-quiet" << "-remove" << "-nocpp";
       proc.writeStdin( TQCString( "Xft.dpi" ), true );
       proc.closeWhenDone();
@@ -744,7 +744,7 @@ void TDEFonts::save()
   }
 
   // KDE-1.x support
-  KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+  TDESimpleConfig* config = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
   config->setGroup( "General" );
   for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) {
       if("font"==i->rcKey())
@@ -757,7 +757,7 @@ void TDEFonts::save()
 
   KIPC::sendMessageAll(KIPC::FontChanged);
 
-  kapp->processEvents(); // Process font change ourselves
+  tdeApp->processEvents(); // Process font change ourselves
 
   bool aaSave = false;
   // Don't overwrite global settings unless explicitly asked for - e.g. the system
diff --git a/kcontrol/hwmanager/cryptpassworddlg.cpp b/kcontrol/hwmanager/cryptpassworddlg.cpp
index b0f0e1cd8..eb9d23090 100644
--- a/kcontrol/hwmanager/cryptpassworddlg.cpp
+++ b/kcontrol/hwmanager/cryptpassworddlg.cpp
@@ -31,7 +31,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <tqfile.h>
-#include <tqinternal_p.h>
+#include <private/tqinternal_p.h>
 #undef Unsorted // Required for --enable-final (tqdir.h)
 #include <tqfiledialog.h>
 
@@ -73,11 +73,11 @@ CryptPasswordDialog::CryptPasswordDialog(TQWidget *parent, TQString passwordProm
 		}
 	}
 
-	connect(m_base->textPasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-	connect(m_base->filePasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-	connect(m_base->cardKeyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-	connect(m_base->textPasswordEntry, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
-	connect(m_base->filePasswordURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
+	connect(m_base->textPasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+	connect(m_base->filePasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+	connect(m_base->cardKeyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+	connect(m_base->textPasswordEntry, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts()));
+	connect(m_base->filePasswordURL, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts()));
 
 	m_base->textPasswordEntry->setFocus();
 
diff --git a/kcontrol/hwmanager/cryptpassworddlgbase.ui b/kcontrol/hwmanager/cryptpassworddlgbase.ui
index f7a6a70a7..2c3a425a8 100644
--- a/kcontrol/hwmanager/cryptpassworddlgbase.ui
+++ b/kcontrol/hwmanager/cryptpassworddlgbase.ui
@@ -137,9 +137,9 @@
 	<includes>
 		<include location="local" impldecl="in implementation">CryptPasswordDialogBase.ui.h</include>
 	</includes>
-	<Q_SLOTS>
+	<slots>
 		<slot>enableSupport_toggled(bool)</slot>
-	</Q_SLOTS>
+	</slots>
 	<includes>
 		<include location="global" impldecl="in implementation">kdialog.h</include>
 		<include location="global" impldecl="in implementation">kpassdlg.h</include>
diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp
index 44a71b3a3..3ad111378 100644
--- a/kcontrol/hwmanager/deviceiconview.cpp
+++ b/kcontrol/hwmanager/deviceiconview.cpp
@@ -22,7 +22,7 @@
 #include <tqcursor.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservicegroup.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
@@ -43,8 +43,8 @@ DeviceIconView::DeviceIconView(TQWidget * parent, const char * name)
 	
 	header()->hide();
 	
-	connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
-	connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)));
 }
 
 void DeviceIconView::slotItemSelected(TQListViewItem* item)
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 89a7e867f..5770c8d97 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -28,8 +28,8 @@
 #include <tqslider.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
-#include <tqinternal_p.h>
-#include <kprocess.h>
+#include <private/tqinternal_p.h>
+#include <tdeprocess.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #undef Unsorted // Required for --enable-final (tqdir.h)
@@ -299,20 +299,20 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
 		}
 
 		if (m_device->type() == TDEGenericDeviceType::CPU) {
-			connect(base->comboCPUGovernor, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setCPUGovernor(const TQString &)));
+			connect(base->comboCPUGovernor, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setCPUGovernor(const TQString &)));
 		}
 		if (m_device->type() == TDEGenericDeviceType::Disk) {
 			TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
-			connect(base->buttonDiskMount, TQT_SIGNAL(clicked()), this, TQT_SLOT(mountDisk()));
-			connect(base->buttonDiskUnmount, TQT_SIGNAL(clicked()), this, TQT_SLOT(unmountDisk()));
-			connect(base->buttonDiskUnlock, TQT_SIGNAL(clicked()), this, TQT_SLOT(unlockDisk()));
-			connect(base->buttonDiskLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(lockDisk()));
-			connect(base->buttonDiskEject, TQT_SIGNAL(clicked()), this, TQT_SLOT(ejectDisk()));
-			connect(base->buttonDiskSafeRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(safeRemoveDisk()));
+			connect(base->buttonDiskMount, TQ_SIGNAL(clicked()), this, TQ_SLOT(mountDisk()));
+			connect(base->buttonDiskUnmount, TQ_SIGNAL(clicked()), this, TQ_SLOT(unmountDisk()));
+			connect(base->buttonDiskUnlock, TQ_SIGNAL(clicked()), this, TQ_SLOT(unlockDisk()));
+			connect(base->buttonDiskLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(lockDisk()));
+			connect(base->buttonDiskEject, TQ_SIGNAL(clicked()), this, TQ_SLOT(ejectDisk()));
+			connect(base->buttonDiskSafeRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(safeRemoveDisk()));
 			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
-				connect(base->cryptLUKSAddKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSAddKey()));
-				connect(base->cryptLUKSDelKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSDelKey()));
-				connect(base->cryptLUKSKeySlotList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processLockouts()));
+				connect(base->cryptLUKSAddKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSAddKey()));
+				connect(base->cryptLUKSDelKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSDelKey()));
+				connect(base->cryptLUKSKeySlotList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(processLockouts()));
 				base->cryptLUKSKeySlotList->setAllColumnsShowFocus(true);
 				base->cryptLUKSKeySlotList->setFullWidth(true);
 				cryptLUKSPopulateList();
@@ -332,10 +332,10 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
 			m_sensorDataGridWidgets.setAutoDelete(true);
 		}
 		if (m_device->type() == TDEGenericDeviceType::Backlight) {
-			connect(base->sliderBacklightBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setBacklightBrightness(int)));
+			connect(base->sliderBacklightBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setBacklightBrightness(int)));
 		}
 		if (m_device->type() == TDEGenericDeviceType::RootSystem) {
-			connect(base->comboSystemHibernationMethod, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setHibernationMethod(int)));
+			connect(base->comboSystemHibernationMethod, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setHibernationMethod(int)));
 		}
 
 		TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint());
@@ -345,8 +345,8 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(processHardwareRemoved(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(processHardwareUpdated(TDEGenericDevice*)));
 
 	populateDeviceInformation();
 }
@@ -493,9 +493,6 @@ void DevicePropertiesDialog::populateDeviceInformation()
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)) {
 				status_text += i18n("Contains a filesystem") + "<br>";
 			}
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
-				status_text += i18n("Hotpluggable") + "<br>";
-			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) {
 				status_text += i18n("Hidden") + "<br>";
 			}
@@ -537,8 +534,7 @@ void DevicePropertiesDialog::populateDeviceInformation()
 				showGroup = true;
 			}
 			if (isMonitoredDevice(sdevice) &&
-					(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) ||
-					 sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)))
+			    sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
 			{
 				base->buttonDiskEject->setEnabled(true);
 				base->buttonDiskSafeRemove->setEnabled(true);
@@ -885,8 +881,8 @@ void DevicePropertiesDialog::populateDeviceInformation()
 		if (m_device->type() == TDEGenericDeviceType::CryptographicCard) {
 			TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(m_device);
 
-			connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted()));
-			connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved()));
+			connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted()));
+			connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved()));
 
 			updateCryptographicCardStatusDisplay();
 		}
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index e7d7cee22..dce403fe7 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -1759,9 +1759,9 @@
 <includes>
 	<include location="local" impldecl="in implementation">DevicePropertiesDialogBase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kactivelabel.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index 8aade89ca..f1726a2a1 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -31,13 +31,13 @@
 #include <tqvaluevector.h>
 
 #include <kcmultidialog.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <khelpmenu.h>
-#include "kprocess.h"
+#include "tdeprocess.h"
 #include <kpropertiesdialog.h>
 #include <krun.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include <tdeaction.h>
 #include <tdeapplication.h>
@@ -149,16 +149,16 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
 {
 	// Create notifier
 	d->m_hardwareNotifierContainer = new TDEPassivePopupStackContainer();
-	connect(d->m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString)));
+	connect(d->m_hardwareNotifierContainer, TQ_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQ_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString)));
 
 	initMenus();
 
 	setPixmap(KSystemTray::loadIcon("hwinfo"));
 	setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
-	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitApp()));
+	connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitApp()));
 	TQToolTip::add(this, i18n("Device monitor"));
 
-	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+	globalKeys = new TDEGlobalAccel(this);
 	TDEGlobalAccel* keys = globalKeys;
 	#include "hwdevicetray_bindings.cpp"
 	// the keys need to be read from tdeglobals, not kickerrc
@@ -166,13 +166,13 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
 	globalKeys->setEnabled(true);
 	globalKeys->updateConnections();
 
-	connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+	connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	doDiskNotifications(true);
-	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(deviceAdded(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(deviceRemoved(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(deviceAdded(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(deviceRemoved(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 }
 
 HwDeviceSystemTray::~HwDeviceSystemTray()
@@ -182,13 +182,13 @@ HwDeviceSystemTray::~HwDeviceSystemTray()
 }
 
 /*!
- * \b TQT_SLOT which called if hwdevicetray is exited by the user. In this case the user
+ * \b TQ_SLOT which called if hwdevicetray is exited by the user. In this case the user
  * is asked through a yes/no box if "HwDeviceTray should start automatically on log in" and the
  * result is written to the KDE configfile.
  */
 void HwDeviceSystemTray::quitApp()
 {
-	KSimpleConfig *config = new KSimpleConfig("tdehwdevicetrayrc");
+	TDESimpleConfig *config = new TDESimpleConfig("tdehwdevicetrayrc");
 
 	TQString tmp1 = i18n("Start device monitor automatically when you log in?");
 	int tmp2 = KMessageBox::questionYesNo(0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
@@ -231,7 +231,7 @@ void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e)
 			break;
 
 		case TQt::MidButton:
-			TQTimer::singleShot(0, this, TQT_SLOT(slotHardwareConfig()));
+			TQTimer::singleShot(0, this, TQ_SLOT(slotHardwareConfig()));
 			break;
 
 		case TQt::RightButton:
@@ -301,13 +301,13 @@ void HwDeviceSystemTray::initMenus()
 
 	// Global Configuration
 	d->m_deviceManagerAction = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"),
-	        TDEShortcut(), this, TQT_SLOT(slotHardwareConfig()), actionCollection());
+	        TDEShortcut(), this, TQ_SLOT(slotHardwareConfig()), actionCollection());
 	d->m_shortcutKeysAction = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"),
-	        TDEShortcut(), this, TQT_SLOT(slotEditShortcutKeys()), actionCollection());
+	        TDEShortcut(), this, TQ_SLOT(slotEditShortcutKeys()), actionCollection());
 
 	// Help & Quit
 	d->m_helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
-	d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+	d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents()));
 	d->m_quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
 
 	// LMB menu
@@ -352,7 +352,7 @@ void HwDeviceSystemTray::addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int
 	SDActions::Details ad = SDActions::Data[actionType];
 	actionMenu->popupMenu()->insertItem(SmallIcon(ad.iconName), i18n(ad.actionName), actionMenuIdx);
 	actionMenu->popupMenu()->connectItem(actionMenuIdx, this,
-	        TQT_SLOT(slotExecuteDeviceAction(int)));
+	        TQ_SLOT(slotExecuteDeviceAction(int)));
 	d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid };
 }
 
@@ -364,7 +364,7 @@ void HwDeviceSystemTray::addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int
 	actionMenu->popupMenu()->insertItem(sdevice->icon(TDEIcon::SizeSmall),
 	        getDeviceLabel(sdevice), actionMenuIdx);
 	actionMenu->popupMenu()->connectItem(actionMenuIdx, this,
-	        TQT_SLOT(slotExecuteDeviceAction(int)));
+	        TQ_SLOT(slotExecuteDeviceAction(int)));
 	actionMenu->setEnabled(true);
 	d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid };
 }
@@ -426,8 +426,7 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
 				(*rmbMenuEntries[SDActions::Open])[deviceLabel] = sdevice;
 			}
 
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) ||
-			    sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable))
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
 			{
 				(*rmbMenuEntries[SDActions::Eject])[deviceLabel] = sdevice;
 
@@ -487,8 +486,7 @@ void HwDeviceSystemTray::populateLMBMenu()
 		    (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
 		     sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) ||
 		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable) ||
-		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) ||
-		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)))
+		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)))
 		{
 			TQString deviceLabel = getDeviceLabel(sdevice);
 			TDEActionMenu *actionMenu = new TDEActionMenu(deviceLabel,
@@ -523,8 +521,7 @@ void HwDeviceSystemTray::populateLMBMenu()
 			}
 
 
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable) ||
-					sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable))
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
 			{
 				addDeviceToLMBMenu(sdevice, SDActions::Eject, actionMenu, actionMenuIdx);
 
@@ -763,7 +760,7 @@ void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point,
 }
 
 void HwDeviceSystemTray::slotHelpContents() {
-	kapp->invokeHelp(TQString::null, "hwdevicetray");
+	tdeApp->invokeHelp(TQString::null, "hwdevicetray");
 }
 
 #include "hwdevicetray.moc"
diff --git a/kcontrol/hwmanager/hwdevicetray_app.h b/kcontrol/hwmanager/hwdevicetray_app.h
index 8c4a4ae06..b4e03973f 100644
--- a/kcontrol/hwmanager/hwdevicetray_app.h
+++ b/kcontrol/hwmanager/hwdevicetray_app.h
@@ -21,11 +21,11 @@
 #define TDEHWDEVICEAPP_H
 
 #include <tqtimer.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 class HwDeviceSystemTray;
 
-class HwDeviceApp : public KUniqueApplication
+class HwDeviceApp : public TDEUniqueApplication
 {
 	TQ_OBJECT
 	
diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
index bcbbbda1b..09974ac68 100644
--- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
@@ -18,7 +18,7 @@
 */
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index f5b0206c3..662844ec3 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -44,7 +44,7 @@
 
 #include <unistd.h>
 #include <kpassdlg.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <string>
 #include <stdio.h>
 #include <tqstring.h>
@@ -59,8 +59,8 @@ using namespace std;
 typedef KGenericFactory<TDEHWManager, TQWidget> TDEHWManagerFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_hwmanager, TDEHWManagerFactory("kcmhwmanager") )
 
-KSimpleConfig *config;
-KSimpleConfig *systemconfig;
+TDESimpleConfig *config;
+TDESimpleConfig *systemconfig;
 
 /**** TDEHWManager ****/
 
@@ -68,8 +68,8 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
   : TDECModule(TDEHWManagerFactory::instance(), parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
-	systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
+	config = new TDESimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
+	systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
 
 	TDEAboutData *about =
 	new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager"), 0,
@@ -95,11 +95,11 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	hwdevices->setTriggerlessHardwareUpdatesEnabled(true);
 
-	connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-	connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView()));
+	connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+	connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(populateTreeView()));
 
-	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(scheduleDeviceUpdate()));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(scheduleDeviceUpdate()));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate()));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate()));
 
 	load();
 
@@ -138,7 +138,7 @@ void TDEHWManager::scheduleDeviceUpdate()
 	if (!deviceUpdateScheduled)
 	{
 		deviceUpdateScheduled = true;
-		TQTimer::singleShot(1000, this, TQT_SLOT(populateTreeView()));
+		TQTimer::singleShot(1000, this, TQ_SLOT(populateTreeView()));
 	}
 }
 
@@ -166,7 +166,7 @@ void TDEHWManager::populateTreeView()
 		for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
 			if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
 				TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-				connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+				connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
 				cdevice->enableCardMonitoring(true);
 				cdevice->enablePINEntryCallbacks(true);
 			}
@@ -188,7 +188,7 @@ void TDEHWManager::populateTreeView()
 				for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
 					if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
 						TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-						connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+						connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
 						cdevice->enableCardMonitoring(true);
 						cdevice->enablePINEntryCallbacks(true);
 					}
@@ -211,7 +211,7 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con
 		for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) {
 			if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) {
 				TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-				connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+				connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
 				cdevice->enableCardMonitoring(true);
 				cdevice->enablePINEntryCallbacks(true);
 			}
diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui
index 6c785921d..ee84b81c3 100644
--- a/kcontrol/hwmanager/hwmanagerbase.ui
+++ b/kcontrol/hwmanager/hwmanagerbase.ui
@@ -74,9 +74,9 @@
 	<include location="local" impldecl="in implementation">TDEHWManagerBase.ui.h</include>
 	<include location="local" impldecl="in implementation">deviceiconview.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
diff --git a/kcontrol/hwmanager/passworddlg.cpp b/kcontrol/hwmanager/passworddlg.cpp
index 07b6027ae..22b82648f 100644
--- a/kcontrol/hwmanager/passworddlg.cpp
+++ b/kcontrol/hwmanager/passworddlg.cpp
@@ -30,7 +30,7 @@ PasswordDlg::PasswordDlg() :
 	enableButton( User1, false );
 	unlockDialog->encryptedIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("drive-harddisk-locked",
 				  TDEIcon::NoGroup, TDEIcon::SizeLarge));
-	connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+	connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
 
 	setMainWidget(unlockDialog);
 }
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 2ca108e3f..82fc0edfd 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -42,7 +42,7 @@
 #include <kgenericfactory.h>
 
 #include <unistd.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <string>
 #include <stdio.h>
 #include <tqstring.h>
@@ -55,8 +55,8 @@ using namespace std;
 typedef KGenericFactory<KICCConfig, TQWidget> KICCCFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_iccconfig, KICCCFactory("kcmiccconfig") )
 
-KSimpleConfig *config;
-KSimpleConfig *systemconfig;
+TDESimpleConfig *config;
+TDESimpleConfig *systemconfig;
 
 /**** KICCConfig ****/
 
@@ -66,12 +66,12 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   if (getuid() != 0) {
-      config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
+      config = new TDESimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
   }
   else {
       config = NULL;
   }
-  systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
+  systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
 
   TDEAboutData *about =
   new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE Color Profile Control Module"),
@@ -87,23 +87,23 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
   setRootOnlyMsg(i18n("<b>The global color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global profile, click on the \"Administrator Mode\" button below."));
 //   setUseRootOnlyMsg(true);	// Setting this hides the Apply button!
 
-  connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-  connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->systemIccFile, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccFile, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->randrScreenList, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccProfileList, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->addProfileButton, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->renameProfileButton, TQT_SLOT(setEnabled(bool)));
-  connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->deleteProfileButton, TQT_SLOT(setEnabled(bool)));
-  connect(base->iccProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int)));
-  connect(base->randrScreenList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectScreen(int)));
-  connect(base->iccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateArray()));
-  connect(base->systemIccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-
-  connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile()));
-  connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile()));
-  connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile()));
+  connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+  connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->systemIccFile, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccFile, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->randrScreenList, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccProfileList, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->addProfileButton, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->renameProfileButton, TQ_SLOT(setEnabled(bool)));
+  connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->deleteProfileButton, TQ_SLOT(setEnabled(bool)));
+  connect(base->iccProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int)));
+  connect(base->randrScreenList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectScreen(int)));
+  connect(base->iccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateArray()));
+  connect(base->systemIccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+
+  connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile()));
+  connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile()));
+  connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile()));
 
   load();
 
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index 499d626f0..bca12d092 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -185,9 +185,9 @@
 <includes>
 	<include location="local" impldecl="in implementation">ICCConfigBase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>enableSupport_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index c271d4419..c2fed475f 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -52,7 +52,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
                                         KDialog::spacingHint());
     g_vlay->addSpacing(fontMetrics().lineSpacing());
     mpUsageList = new TQListBox(gbox);
-    connect(mpUsageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsage(int)));
+    connect(mpUsageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsage(int)));
     g_vlay->addWidget(mpUsageList);
 
     KSeparator *sep = new KSeparator( KSeparator::HLine, this );
@@ -65,11 +65,11 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
     TQPushButton *push;
 
     mPreviewButton1 = addPreviewIcon(0, i18n("Default"), this, g_lay);
-    connect(mPreviewButton1, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup0()));
+    connect(mPreviewButton1, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup0()));
     mPreviewButton2 = addPreviewIcon(1, i18n("Active"), this, g_lay);
-    connect(mPreviewButton2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup1()));
+    connect(mPreviewButton2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup1()));
     mPreviewButton3 = addPreviewIcon(2, i18n("Disabled"), this, g_lay);
-    connect(mPreviewButton3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup2()));
+    connect(mPreviewButton3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup2()));
 
     m_pTab1 = new TQWidget(this, "General Tab");
     top->addWidget(m_pTab1, 0, 1);
@@ -83,30 +83,30 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
     lbl->setFixedSize(lbl->sizeHint());
     grid->addWidget(lbl, 0, 0, TQt::AlignLeft);
     mpSizeBox = new TQComboBox(m_pTab1);
-    connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
+    connect(mpSizeBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSize(int)));
     lbl->setBuddy(mpSizeBox);
     grid->addWidget(mpSizeBox, 0, 1, TQt::AlignLeft);
 
     mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1);
-    connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool)));
+    connect(mpDPCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDPCheck(bool)));
     grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, TQt::AlignLeft);
 
     mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1);
-    connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool)));
+    connect(mpAnimatedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnimatedCheck(bool)));
     grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, TQt::AlignLeft);
 
     mpRoundedCheck = new TQCheckBox(i18n("Rounded text selection"), m_pTab1);
-    connect(mpRoundedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRoundedCheck(bool)));
+    connect(mpRoundedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRoundedCheck(bool)));
     grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, TQt::AlignLeft);
 
     mpActiveEffectCheck = new TQCheckBox(i18n("Show icon activation effect"), m_pTab1);
-    connect(mpActiveEffectCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveEffect(bool)));
+    connect(mpActiveEffectCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveEffect(bool)));
     grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, TQt::AlignLeft);
 
     top->activate();
 
-    mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
-    mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
+    mpSystrayConfig = new TDESimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
+    mpKickerConfig = new TDESimpleConfig( TQString::fromLatin1( "kickerrc" ));
 
     init();
     read();
@@ -477,8 +477,8 @@ void TDEIconConfig::save()
     g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
     g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);
 
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
-    kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
+    tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
 
     mpConfig->sync();
     mpSystrayConfig->sync();
@@ -497,10 +497,10 @@ void TDEIconConfig::save()
     }
 
     // Signal kicker to reload icon configuration
-    kapp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray());
+    tdeApp->dcopClient()->send("kicker", "kicker", "configure()", TQByteArray());
 
     // Signal system tray to reload icon configuration
-    kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
+    tdeApp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
 }
 
 void TDEIconConfig::defaults()
@@ -698,12 +698,12 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
     mpEffectBox->insertItem(i18n("Desaturate"));
     mpEffectBox->insertItem(i18n("To Monochrome"));
     mpEffectBox->setMinimumWidth( 100 );
-    connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int)));
+    connect(mpEffectBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotEffectType(int)));
     top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, TQt::AlignLeft);
     lbl->setBuddy(mpEffectBox);
 
     mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page);
-    connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool)));
+    connect(mpSTCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSTCheck(bool)));
     top->addWidget(mpSTCheck, 3, 0, TQt::AlignLeft);
 
     frame = new TQGroupBox(i18n("Preview"), page);
@@ -726,23 +726,23 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
     grid->addWidget(mpEffectLabel, 1, 0);
     mpEffectSlider = new TQSlider(0, 100, 5, 10, TQt::Horizontal, mpEffectGroup);
     mpEffectLabel->setBuddy( mpEffectSlider );
-    connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int)));
+    connect(mpEffectSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotEffectValue(int)));
     grid->addWidget(mpEffectSlider, 1, 1);
 
     mpEffectColor = new TQLabel(i18n("Co&lor:"), mpEffectGroup);
     grid->addWidget(mpEffectColor, 2, 0);
     mpEColButton = new KColorButton(mpEffectGroup);
     mpEffectColor->setBuddy( mpEColButton );
-    connect(mpEColButton, TQT_SIGNAL(changed(const TQColor &)),
-		TQT_SLOT(slotEffectColor(const TQColor &)));
+    connect(mpEColButton, TQ_SIGNAL(changed(const TQColor &)),
+		TQ_SLOT(slotEffectColor(const TQColor &)));
     grid->addWidget(mpEColButton, 2, 1);
 
     mpEffectColor2 = new TQLabel(i18n("&Second color:"), mpEffectGroup);
     grid->addWidget(mpEffectColor2, 3, 0);
     mpECol2Button = new KColorButton(mpEffectGroup);
     mpEffectColor2->setBuddy( mpECol2Button );
-    connect(mpECol2Button, TQT_SIGNAL(changed(const TQColor &)),
-		TQT_SLOT(slotEffectColor2(const TQColor &)));
+    connect(mpECol2Button, TQ_SIGNAL(changed(const TQColor &)),
+		TQ_SLOT(slotEffectColor2(const TQColor &)));
     grid->addWidget(mpECol2Button, 3, 1);
 
     init();
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 3fe37a3a4..2d17ecf0c 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -18,7 +18,7 @@
 
 #include <tdecmodule.h>
 #include <kdialogbase.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 class TQCheckBox;
 class TQColor;
@@ -107,8 +107,8 @@ private:
     TDEIconTheme *mpTheme;
     TDEIconLoader *mpLoader;
     TDEConfig *mpConfig;
-    KSimpleConfig *mpSystrayConfig;
-    KSimpleConfig *mpKickerConfig;
+    TDESimpleConfig *mpSystrayConfig;
+    TDESimpleConfig *mpKickerConfig;
 
     typedef TQLabel *QLabelPtr;
     QLabelPtr mpPreview[3];
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 826f6300d..b6a37f11f 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -28,10 +28,10 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservice.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #undef Unsorted
 #include <kipc.h>
 
@@ -82,15 +82,15 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
   m_iconThemes->addColumn(i18n("Description"));
   m_iconThemes->setAllColumnsShowFocus( true );
   m_iconThemes->setFullWidth(true);
-  connect(m_iconThemes,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-		TQT_SLOT(themeSelected(TQListViewItem *)));
+  connect(m_iconThemes,TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+		TQ_SLOT(themeSelected(TQListViewItem *)));
 
   TQPushButton *installButton=new TQPushButton( i18n("Install New Theme..."),
 	this, "InstallNewTheme");
-  connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(installNewTheme()));
+  connect(installButton,TQ_SIGNAL(clicked()),TQ_SLOT(installNewTheme()));
   m_removeButton=new TQPushButton( i18n("Remove Theme"),
 	this, "RemoveTheme");
-  connect(m_removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeSelectedTheme()));
+  connect(m_removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeSelectedTheme()));
 
   topLayout->addWidget(
 	new TQLabel(i18n("Select the icon theme you want to use:"), this));
@@ -214,7 +214,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString
 
   KTar archive(archiveName);
   archive.open(IO_ReadOnly);
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   const KArchiveDirectory* rootDir = archive.directory();
 
@@ -225,7 +225,7 @@ bool IconThemesConfig::installThemes(const TQStringList &themes, const TQString
     progressDiag.setLabel(
         i18n("<qt>Installing <strong>%1</strong> theme</qt>")
         .arg(*it));
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     if (progressDiag.wasCancelled())
       break;
@@ -419,7 +419,7 @@ void IconThemesConfig::save()
   if (!selected)
      return;
 
-  KSimpleConfig *config = new KSimpleConfig("kdeglobals", false);
+  TDESimpleConfig *config = new TDESimpleConfig("kdeglobals", false);
   config->setGroup("Icons");
   config->writeEntry("Theme", m_themeNames[selected->text(0)]);
   delete config;
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index 359bfec91..214e85a70 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -45,11 +45,11 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
 
   tab1 = new IconThemesConfig(this, "themes");
   tab->addTab(tab1, i18n("&Theme"));
-  connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(tab1, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   tab2 = new TDEIconConfig(this, "effects");
   tab->addTab(tab2, i18n("Ad&vanced"));
-  connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(tab2, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
 	      I18N_NOOP("Icons Control Panel Module"),
diff --git a/kcontrol/info/Makefile.am b/kcontrol/info/Makefile.am
index 30eb5ebe8..6db9c62b9 100644
--- a/kcontrol/info/Makefile.am
+++ b/kcontrol/info/Makefile.am
@@ -7,7 +7,7 @@ endif
 kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp
 
 kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO)
-kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB)
+kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB)
 METASOURCES = AUTO
 
 AM_CPPFLAGS= $(all_includes) $(GLINC)
diff --git a/kcontrol/info/configure.in.in b/kcontrol/info/configure.in.in
index 9bc6d1c4b..cee8a2deb 100644
--- a/kcontrol/info/configure.in.in
+++ b/kcontrol/info/configure.in.in
@@ -1,11 +1,7 @@
-# libmach for Tru64
 # linux/raw.h for Linux
 # devinfo.h, libdevinfo for the list of {IRQ,DMA,IOPORTS/MEMRANGES} for FreeBSD
 
 case "$host" in
-  *-*-osf*)
-    AC_CHECK_LIB(mach, vm_statistics, LIB_TRU64_MACH="-lmach")dnl
-    ;;
   *-*-linux*)
     AC_CHECK_HEADERS(linux/raw.h sys/raw.h)dnl
     ;;
@@ -14,7 +10,6 @@ case "$host" in
     AC_CHECK_LIB(devinfo, devinfo_foreach_rman, LIBDEVINFO="-ldevinfo")
     ;;
 esac
-AC_SUBST(LIB_TRU64_MACH)
 
 AC_HAVE_GL( have_gl=yes, have_gl=no )
 AM_CONDITIONAL(COMPILE_GL_INFO, test x$have_gl = xyes)
diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp
index 9aa0d3767..f4625813f 100644
--- a/kcontrol/info/info_aix.cpp
+++ b/kcontrol/info/info_aix.cpp
@@ -265,7 +265,7 @@ struct model _4C_models[] =
 };
 
 
-/*  all GetInfo_ functions should return TRUE, when the Information 
+/*  all GetInfo_ functions should return true, when the Information 
     was filled into the lBox-Widget.
     returning false indicates, that information was not available.
 */
diff --git a/kcontrol/info/info_fbsd.cpp b/kcontrol/info/info_fbsd.cpp
index 3ccd1c086..ec7b90bf8 100644
--- a/kcontrol/info/info_fbsd.cpp
+++ b/kcontrol/info/info_fbsd.cpp
@@ -21,8 +21,8 @@
 
 
 /*
- * all following functions should return TRUE, when the Information
- * was filled into the lBox-Widget. Returning FALSE indicates that
+ * all following functions should return true, when the Information
+ * was filled into the lBox-Widget. Returning false indicates that
  * information was not available.
  */
 
diff --git a/kcontrol/info/info_generic.cpp b/kcontrol/info/info_generic.cpp
index 367e1657b..c914159ab 100644
--- a/kcontrol/info/info_generic.cpp
+++ b/kcontrol/info/info_generic.cpp
@@ -25,7 +25,7 @@
 #define INFO_CD_ROM_AVAILABLE
 
 
-/*  all following functions should return TRUE, when the Information 
+/*  all following functions should return true, when the Information 
     was filled into the lBox-Widget.
     returning false indicates, that information was not available.
 */
diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp
index bbda9691d..6354aa46d 100644
--- a/kcontrol/info/info_linux.cpp
+++ b/kcontrol/info/info_linux.cpp
@@ -293,7 +293,7 @@ static void cleanPassword(TQString & str)
 
     while (index >= 0)
     {
-	index = str.find(passwd, index, FALSE);
+	index = str.find(passwd, index, false);
 	if (index >= 0) {
 	    index += passwd.length();
 	    while (index < (int) str.length() &&
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index 2fced7e40..73b252501 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -24,8 +24,8 @@
 
 
 /*
- * all following functions should return TRUE, when the Information
- * was filled into the lBox-Widget. Returning FALSE indicates that
+ * all following functions should return true, when the Information
+ * was filled into the lBox-Widget. Returning false indicates that
  * information was not available.
  */
 
@@ -179,7 +179,7 @@ bool GetInfo_IRQ (TQListView *lBox)
 	lBox->addColumn(i18n("IRQ"));
 	lBox->addColumn(i18n("Device"));
 	lBox->setSorting(0);
-	lBox->setShowSortIndicator(FALSE);
+	lBox->setShowSortIndicator(false);
 	(void) GetDmesgInfo(lBox, "[ (]irq ", AddIRQLine);
 	return true;
 }
diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp
index 7b484da76..84000b79a 100644
--- a/kcontrol/info/info_openbsd.cpp
+++ b/kcontrol/info/info_openbsd.cpp
@@ -24,8 +24,8 @@
 
 
 /*
- * all following functions should return TRUE, when the Information
- * was filled into the lBox-Widget. Returning FALSE indicates that
+ * all following functions should return true, when the Information
+ * was filled into the lBox-Widget. Returning false indicates that
  * information was not available.
  */
 
diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp
index 5f18aebea..96bfa75bb 100644
--- a/kcontrol/info/info_osx.cpp
+++ b/kcontrol/info/info_osx.cpp
@@ -31,8 +31,8 @@
 #define INFO_XSERVER_AVAILABLE
 
 /*
- * all following functions should return TRUE, when the Information
- * was filled into the lBox-Widget. Returning FALSE indicates that
+ * all following functions should return true, when the Information
+ * was filled into the lBox-Widget. Returning false indicates that
  * information was not available.
  */
 
diff --git a/kcontrol/info/info_sgi.cpp b/kcontrol/info/info_sgi.cpp
index 7961d4e16..f2740c0d4 100644
--- a/kcontrol/info/info_sgi.cpp
+++ b/kcontrol/info/info_sgi.cpp
@@ -15,7 +15,7 @@
 #define INFO_XSERVER_AVAILABLE
 
 
-/*  all following functions should return TRUE, when the Information 
+/*  all following functions should return true, when the Information 
     was filled into the lBox-Widget.
     returning false indicates, that information was not available.
 */
diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp
index 780b6532e..85ef53687 100644
--- a/kcontrol/info/main.cpp
+++ b/kcontrol/info/main.cpp
@@ -34,7 +34,7 @@
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_CPU_AVAILABLE
     return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU);
@@ -43,7 +43,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_IRQ_AVAILABLE
     return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ);
@@ -52,7 +52,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_PCI_AVAILABLE
     return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI);
@@ -61,7 +61,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_DMA_AVAILABLE
     return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA);
@@ -70,7 +70,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_IOPORTS_AVAILABLE
     return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports);
@@ -79,7 +79,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_SOUND_AVAILABLE
     return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound);
@@ -88,7 +88,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_SCSI_AVAILABLE
     return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI);
@@ -97,7 +97,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_DEVICES_AVAILABLE
     return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices);
@@ -106,7 +106,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_PARTITIONS_AVAILABLE
     return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions);
@@ -115,7 +115,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_XSERVER_AVAILABLE
     return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video);
@@ -124,12 +124,12 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/)
   { 
     return new KMemoryWidget(parent, "kcminfo");
   }
 
-  KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * )
+  TDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * )
   { 
 #ifdef INFO_OPENGL_AVAILABLE
     return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL);
@@ -139,7 +139,7 @@ extern "C"
   }
 
 /* create_cdinfo function for CD-ROM Info ~Jahshan */
-  KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_CD_ROM_AVAILABLE
     return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM);
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 76d68d675..71e7a1dc8 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -252,8 +252,8 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 
     timer = new TQTimer(this);
     timer->start(100);
-    TQObject::connect(timer, TQT_SIGNAL(timeout()), this,
-		     TQT_SLOT(update_Values()));
+    TQObject::connect(timer, TQ_SIGNAL(timeout()), this,
+		     TQ_SLOT(update_Values()));
 
     update();
 }
@@ -459,8 +459,6 @@ void KMemoryWidget::update_Values()
 #include "memory_hpux.cpp"
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #include "memory_netbsd.cpp"
-#elif __osf__
-#include "memory_tru64.cpp"
 #else
 
 /* Default for unsupported systems */
diff --git a/kcontrol/info/memory_fbsd.cpp b/kcontrol/info/memory_fbsd.cpp
index 80a28749e..f307563f3 100644
--- a/kcontrol/info/memory_fbsd.cpp
+++ b/kcontrol/info/memory_fbsd.cpp
@@ -11,9 +11,9 @@
 
 void KMemoryWidget::update()
 {
-    char blah[10], buf[80], *used_str, *total_str;
+    char buf[80], *used_str, *total_str;
     /* Stuff for sysctl */
-    int memory;
+    unsigned long memory;
     size_t len;
     /* Stuff for swap display */
     int used, total, _free;
@@ -22,7 +22,6 @@ void KMemoryWidget::update()
     len=sizeof(memory);
     sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
   
-    snprintf(blah, 10, "%d", memory);
     // Numerical values
 
     // total physical memory (without swap space)
diff --git a/kcontrol/info/memory_tru64.cpp b/kcontrol/info/memory_tru64.cpp
deleted file mode 100644
index c3cbb2fae..000000000
--- a/kcontrol/info/memory_tru64.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This is memory_tru64.cpp to retrieve memory information under Tru64/Alpha.
- *
- * Implemented by Tom Leitner, Tom@radar.tu-graz.ac.at
- *
- * WARNING: This module requires linking with -lmach
- *
- * This routine is based on m_decosf1.c from the "top" program written by:
- *
- * AUTHOR:  Anthony Baxter, <anthony@aaii.oz.au>
- *
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/mbuf.h>
-#include <net/route.h>
-#include <sys/table.h>
-extern "C" {
-#include <mach/mach_traps.h>
-}
-#include <mach/vm_statistics.h>
-
-#define pagetob(size) (MEMORY(1024L) * ((long) (size) << (long) pageshift))
-#define LOG1024       10
-
-extern "C" void vm_statistics(task_t, vm_statistics_data_t*);
-
-void KMemoryWidget::update()
-{
-  int pageshift;          /* log base 2 of the pagesize */
-  int pagesize;
-  vm_statistics_data_t vmstats;
-  int swap_pages=0,swap_free=0,i;
-  struct tbl_swapinfo swbuf;
-
-  /* get the page size with "getpagesize" and calculate pageshift from it */
-
-  pagesize = getpagesize();
-  pageshift = 0;
-  while (pagesize > 1) {
-      pageshift++;
-      pagesize >>= 1;
-  }
-
-  /* we only need the amount of log(2)1024 for our conversion */
-
-  pageshift -= LOG1024;
-
-  /* memory information */
-  /* this is possibly bogus - we work out total # pages by */
-  /* adding up the free, active, inactive, wired down, and */
-  /* zero filled. Anyone who knows a better way, TELL ME!  */
-  /* Change: dont use zero filled. */
-
-  (void) ::vm_statistics(::task_self(), &vmstats);
-
-  /* thanks DEC for the table() command. No thanks at all for   */
-  /* omitting the man page for it from OSF/1 1.2, and failing   */
-  /* to document SWAPINFO in the 1.3 man page. Lets hear it for */
-  /* include files. */
-
-  i=0;
-  while(table(TBL_SWAPINFO,i,&swbuf,1,sizeof(struct tbl_swapinfo))>0) {
-      swap_pages += swbuf.size;
-      swap_free  += swbuf.free;
-      i++;
-  }
-  Memory_Info[TOTAL_MEM]    = pagetob((vmstats.free_count +
-                                       vmstats.active_count +
-                                       vmstats.inactive_count +
-                                       vmstats.wire_count));
-  Memory_Info[FREE_MEM]     = pagetob(vmstats.free_count);
-  Memory_Info[SHARED_MEM]   = NO_MEMORY_INFO; 		    /* FIXME ?? */
-  Memory_Info[BUFFER_MEM]   = NO_MEMORY_INFO; 		    /* FIXME ?? */
-#ifdef __GNUC__
-#warning "FIXME: Memory_Info[CACHED_MEM]"
-#endif
-  Memory_Info[CACHED_MEM]   = NO_MEMORY_INFO; /* cached memory in ram */
-  Memory_Info[SWAP_MEM]     = pagetob(swap_pages);
-  Memory_Info[FREESWAP_MEM] = pagetob(swap_free);
-}
diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt
index 2fc6f6ce8..9cf3248d5 100644
--- a/kcontrol/input/CMakeLists.txt
+++ b/kcontrol/input/CMakeLists.txt
@@ -17,8 +17,6 @@ else( )
   include_directories( core )
 endif( )
 
-add_subdirectory( pics )
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
@@ -34,7 +32,7 @@ link_directories(
 ##### other data ################################
 
 tde_create_translated_desktop(
-  SOURCE mouse.desktop
+  SOURCE mouse.desktop touchpad.desktop
   PO_DIR kcontrol-desktops
 )
 
@@ -47,18 +45,41 @@ install( FILES
     mouse_cursor_theme.upd
   DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
+install(
+    DIRECTORY pics/
+    DESTINATION ${DATA_INSTALL_DIR}/kcminput/pics
+    FILES_MATCHING PATTERN *.png
+)
+
+add_subdirectory(icons)
+
 
 ##### kcm_input (module) ########################
 
 tde_add_kpart( kcm_input AUTOMOC
   SOURCES
-    mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp
-    logitechmouse_base.ui
-  LINK themepage-static tdeio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES}
+    mouse.cpp kmousedlg.ui main.cpp
+    logitechmouse.cpp logitechmouse_base.ui
+    touchpad.cpp touchpad_settings.cpp
+  LINK
+    themepage-static tdeio-shared
+    ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES}
+    ${XINPUT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
+##### tdesyndaemon (executable) ####################
+
+tde_add_executable( tdesyndaemon AUTOMOC
+  SOURCES
+    tdesyndaemon.cpp tdesyndaemon_iface.skel
+    touchpad_settings.cpp
+  LINK tdecore-shared ${XINPUT_LIBRARIES}
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
 ##### kapplymousetheme (executable) #############
 
 tde_add_executable( kapplymousetheme
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 48b6711d9..38d6432bb 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -20,9 +20,9 @@
  */
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdemessagebox.h>
@@ -66,8 +66,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	listview->addColumn( i18n("Name") );
 	listview->addColumn( i18n("Description") );
 
-	connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-			TQT_SLOT(selectionChanged(TQListViewItem*)) );
+	connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+			TQ_SLOT(selectionChanged(TQListViewItem*)) );
 
 	insertThemes();
 }
diff --git a/kcontrol/input/icons/CMakeLists.txt b/kcontrol/input/icons/CMakeLists.txt
new file mode 100644
index 000000000..546096f2e
--- /dev/null
+++ b/kcontrol/input/icons/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons()
\ No newline at end of file
diff --git a/kcontrol/input/icons/cr128-device-input-touchpad.png b/kcontrol/input/icons/cr128-device-input-touchpad.png
new file mode 100644
index 000000000..5b5b16553
--- /dev/null
+++ b/kcontrol/input/icons/cr128-device-input-touchpad.png
diff --git a/kcontrol/input/icons/cr16-device-input-touchpad.png b/kcontrol/input/icons/cr16-device-input-touchpad.png
new file mode 100644
index 000000000..bde3c5e48
--- /dev/null
+++ b/kcontrol/input/icons/cr16-device-input-touchpad.png
diff --git a/kcontrol/input/icons/cr32-device-input-touchpad.png b/kcontrol/input/icons/cr32-device-input-touchpad.png
new file mode 100644
index 000000000..6e00abaa4
--- /dev/null
+++ b/kcontrol/input/icons/cr32-device-input-touchpad.png
diff --git a/kcontrol/input/icons/cr48-device-input-touchpad.png b/kcontrol/input/icons/cr48-device-input-touchpad.png
new file mode 100644
index 000000000..7c6a41c56
--- /dev/null
+++ b/kcontrol/input/icons/cr48-device-input-touchpad.png
diff --git a/kcontrol/input/icons/cr64-device-input-touchpad.png b/kcontrol/input/icons/cr64-device-input-touchpad.png
new file mode 100644
index 000000000..b124147fa
--- /dev/null
+++ b/kcontrol/input/icons/cr64-device-input-touchpad.png
diff --git a/kcontrol/input/icons/crsc-device-input-touchpad.svg b/kcontrol/input/icons/crsc-device-input-touchpad.svg
new file mode 100644
index 000000000..2802b4716
--- /dev/null
+++ b/kcontrol/input/icons/crsc-device-input-touchpad.svg
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0.3, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128.338"
+   height="128"
+   viewBox="0 0 128.338 128"
+   overflow="visible"
+   enable-background="new 0 0 128.338 128"
+   xml:space="preserve"
+   id="svg1704"
+   sodipodi:version="0.32"
+   inkscape:version="0.42"
+   sodipodi:docname="touchpad.svg"
+   sodipodi:docbase="/home/kombrisn/Project/kdereview/ksynaptics"><metadata
+   id="metadata2067"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2065">
+			
+			
+			
+		
+				<linearGradient
+   id="XMLID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="6.1904001"
+   y1="15.246600"
+   x2="118.40850"
+   y2="84.415398"
+   gradientTransform="matrix(1.000000,0.000000,0.000000,1.043928,0.287175,3.271150)">
+					<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop1712" />
+					<stop
+   offset="1"
+   style="stop-color:#DCDCE0"
+   id="stop1714" />
+					
+					
+					
+				</linearGradient>
+				
+				<linearGradient
+   id="XMLID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="116.84180"
+   y1="84.442398"
+   x2="16.851700"
+   y2="20.812099"
+   gradientTransform="matrix(1.000000,0.000000,0.000000,1.130136,0.287175,3.541282)">
+					<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop1719" />
+					<stop
+   offset="1"
+   style="stop-color:#DCDCE0"
+   id="stop1721" />
+					
+					
+					
+				</linearGradient>
+				
+				
+				
+					<linearGradient
+   id="XMLID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="94.294899"
+   y1="35.819801"
+   x2="96.824898"
+   y2="32.868401"
+   gradientTransform="matrix(0.985500,-0.169900,0.169900,0.985500,0.979900,-9.081100)">
+					<stop
+   offset="0"
+   style="stop-color:#97FF86"
+   id="stop1728" />
+					<stop
+   offset="1"
+   style="stop-color:#94FF7F"
+   id="stop1730" />
+					
+					
+					
+				</linearGradient>
+				
+				
+					<linearGradient
+   id="XMLID_4_"
+   gradientUnits="userSpaceOnUse"
+   x1="94.387703"
+   y1="35.655800"
+   x2="96.723297"
+   y2="32.931099"
+   gradientTransform="matrix(0.985500,-0.169900,0.169900,0.985500,0.979900,-9.081100)">
+					<stop
+   offset="0"
+   style="stop-color:#3DDF00"
+   id="stop1735" />
+					<stop
+   offset="1"
+   style="stop-color:#94FF7F"
+   id="stop1737" />
+					
+					
+					
+				</linearGradient>
+				
+				
+				
+				
+				<linearGradient
+   id="XMLID_5_"
+   gradientUnits="userSpaceOnUse"
+   x1="64.881302"
+   y1="55.002399"
+   x2="64.881302"
+   y2="-3.4971001"
+   gradientTransform="matrix(1.000000,0.000000,0.000000,0.919938,0.000000,1.052981)">
+					<stop
+   offset="0"
+   style="stop-color:#9E9EAC"
+   id="stop1748" />
+					<stop
+   offset="1"
+   style="stop-color:#42425B"
+   id="stop1750" />
+					
+					
+					
+				</linearGradient>
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				<linearGradient
+   id="XMLID_18_"
+   gradientUnits="userSpaceOnUse"
+   x1="63.074699"
+   y1="54.390099"
+   x2="62.435501"
+   y2="69.409203"
+   gradientTransform="matrix(1.000000,0.000000,0.000000,1.043928,0.287175,3.271150)">
+					<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop1887" />
+					<stop
+   offset="1"
+   style="stop-color:#FFFFFF;stop-opacity:0"
+   id="stop1889" />
+					
+					
+					
+				</linearGradient>
+				
+				
+				<linearGradient
+   id="XMLID_20_"
+   gradientUnits="userSpaceOnUse"
+   x1="81.798798"
+   y1="104.17290"
+   x2="88.452904"
+   y2="114.22480">
+					<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop1905" />
+					<stop
+   offset="1"
+   style="stop-color:#DCDCE0"
+   id="stop1907" />
+					
+					
+					
+				</linearGradient>
+				
+				<linearGradient
+   id="XMLID_21_"
+   gradientUnits="userSpaceOnUse"
+   x1="72.246101"
+   y1="100.22750"
+   x2="72.246101"
+   y2="83.708900">
+					<stop
+   offset="0"
+   style="stop-color:#9E9E9E"
+   id="stop1912" />
+					<stop
+   offset="1"
+   style="stop-color:#616161"
+   id="stop1914" />
+					
+					
+					
+				</linearGradient>
+				
+				<linearGradient
+   id="XMLID_22_"
+   gradientUnits="userSpaceOnUse"
+   x1="64.685097"
+   y1="-1.2637000"
+   x2="63.526699"
+   y2="114.37610"
+   gradientTransform="matrix(1.000000,0.000000,0.000000,1.130136,0.287175,3.541282)">
+					<stop
+   offset="0"
+   style="stop-color:#9E9EAC"
+   id="stop1919" />
+					<stop
+   offset="1"
+   style="stop-color:#42425B"
+   id="stop1921" />
+					
+					
+					
+				</linearGradient>
+				
+			<linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_5_"
+   id="linearGradient3115"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.259073,0.000000,0.000000,0.145048,44.66793,81.50629)"
+   x1="64.881302"
+   y1="55.002399"
+   x2="64.881302"
+   y2="-3.4971001" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_5_"
+   id="linearGradient3119"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.404572,0.000000,0.000000,0.210813,10.52265,95.00541)"
+   x1="64.881302"
+   y1="55.002399"
+   x2="64.881302"
+   y2="-3.4971001" /></defs><sodipodi:namedview
+   inkscape:window-height="725"
+   inkscape:window-width="1016"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:zoom="3.4822022"
+   inkscape:cx="72.564336"
+   inkscape:cy="56.149095"
+   inkscape:window-x="0"
+   inkscape:window-y="25"
+   inkscape:current-layer="Layer_1" />
+	<g
+   id="Layer_1">
+		<path
+   d="M 127.81817,87.825173 C 129.67917,103.42042 21.989175,123.45549 17.081175,104.65643 C 12.174175,85.855280 2.1931746,29.250351 1.0841746,23.409573 C -0.025825402,17.568794 111.16117,1.8931647 111.81917,6.5772713 C 112.47617,11.261378 125.95317,72.227839 127.81817,87.825173 z "
+   id="path1716"
+   style="fill:url(#XMLID_1_)" /><path
+   d="M 124.82002,86.233211 C 125.79544,93.680770 113.50726,100.54412 78.405838,105.83457 C 29.797840,113.16268 23.126889,113.85833 20.519977,104.00664 C 15.541863,85.199327 5.9298363,31.448190 4.7737780,25.598871 C 3.6187343,19.749533 108.25665,2.3575140 108.96323,7.0548317 C 109.66973,11.748770 122.77228,70.595456 124.82002,86.233211 z "
+   id="path1723"
+   style="fill:#d1d1d1;fill-opacity:1.0000000" /><path
+   id="path1741"
+   style="fill:#ffffff;stroke:#000000"
+   d="" /><path
+   d="M 114.73417,76.613763 C 115.45017,83.738518 30.508175,97.270824 28.334175,89.492570 C 24.565175,76.010462 15.476175,33.639362 15.033175,28.504056 C 14.823175,26.071543 100.47617,13.639662 101.93817,17.161979 C 103.71217,21.441081 113.46517,64.025506 114.73417,76.613763 z "
+   id="path1743"
+   style="fill:#d1d1d1;fill-opacity:1.0000000" /><path
+   d="M 112.96317,76.297478 C 113.74417,80.063057 31.345175,93.277308 30.371175,88.823042 C 29.397175,84.365887 17.551175,29.530614 17.551175,29.530614 L 100.67117,17.956091 C 100.67117,17.956091 112.18317,72.529006 112.96317,76.297478 z "
+   id="path1745"
+   style="fill:#f5f5f9" /><path
+   d="M 100.55617,17.107495 L 16.577175,28.749806 L 29.576175,88.599713 C 30.796175,94.163016 93.202175,82.438115 93.831175,82.314230 C 114.27417,78.285566 113.96517,76.797985 113.76017,75.814588 L 113.76017,75.812667 L 113.76017,75.814588 L 101.31617,17.000897 L 100.55617,17.107495 z M 100.02717,18.758335 C 100.32417,20.162365 112.00617,75.368026 112.11117,75.867407 C 109.52617,78.403689 71.541175,85.378704 46.885175,87.817029 C 33.642175,89.127906 31.482175,88.366349 31.138175,88.139706 C 30.836175,86.757764 20.006175,36.893566 18.523175,30.057801 C 20.184175,29.828278 98.550175,18.962890 100.02717,18.758335 z "
+   id="path1752"
+   style="fill:#000000;fill-opacity:1.0000000" /><path
+   a:adobe-blending-mode="screen"
+   d="M 105.98917,63.463016 C 105.98917,63.463016 92.840175,40.295114 63.690175,65.440217 C 43.907175,82.504270 28.755175,73.564067 27.010175,64.061187 C 23.959175,47.461682 22.534175,47.426188 21.429175,39.568540 L 100.28317,27.111343 L 105.98917,63.463016 z "
+   id="path1891"
+   style="fill:url(#XMLID_18_)" /><path
+   d="M 0.94217460,22.023236 C 0.26817460,22.617231 0.21417460,23.195568 0.28717460,23.575557 L 1.3971746,29.664791 C 4.3371746,45.885351 12.147175,88.974538 16.296175,104.87879 C 19.460175,116.99567 58.779175,113.52356 84.434175,108.23084 C 106.44117,103.69392 129.60417,95.921879 128.62517,87.721824 C 127.36017,77.145786 120.80717,45.925020 116.47017,25.266721 C 114.43717,15.589505 112.83217,7.9458614 112.62217,6.4551317 C 112.57417,6.1148110 112.36417,5.6502629 111.62217,5.3579630 C 102.72017,1.8461880 7.5561746,16.176193 0.94217460,22.023236 z M 14.952175,19.164960 C 45.879175,12.067291 107.28317,4.7493528 111.05917,6.9760519 C 111.37117,8.9083634 112.84817,15.952792 114.88117,25.630008 C 119.21117,46.260120 125.75517,77.434954 127.01017,87.929566 C 127.68117,93.555292 110.04317,101.21877 84.118175,106.56578 C 53.475175,112.88676 20.315175,113.81585 17.864175,104.43303 C 13.732175,88.593504 5.9331746,45.552337 2.9951746,29.349525 C 2.9951746,29.349525 1.9641746,23.699784 1.9101746,23.400177 C 2.1691746,23.060900 3.8551746,21.710057 14.952175,19.164960 z "
+   id="path1923"
+   style="fill:#000000;fill-opacity:1.0000000" /><g
+   id="g1925">
+				<linearGradient
+   y2="132.29289"
+   x2="35.785999"
+   y1="52.338402"
+   x1="36.586899"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_23_">
+					<stop
+   id="stop1928"
+   style="stop-color:#9E9EAC"
+   offset="0" />
+					<stop
+   id="stop1930"
+   style="stop-color:#42425B"
+   offset="1" />
+					
+					
+					
+				</linearGradient>
+				
+				
+				
+					<linearGradient
+   gradientTransform="matrix(0.962300,0.272200,-0.272200,0.962300,33.15460,32.60870)"
+   y2="51.923401"
+   x2="30.674400"
+   y1="38.364300"
+   x1="8.6763000"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_24_">
+					<stop
+   id="stop1937"
+   style="stop-color:#FFFFFF"
+   offset="0" />
+					<stop
+   id="stop1939"
+   style="stop-color:#DCDCE0"
+   offset="1" />
+					
+					
+					
+				</linearGradient>
+				
+				
+					<linearGradient
+   gradientTransform="matrix(0.962300,0.272200,-0.272200,0.962300,33.15460,32.60870)"
+   y2="74.467400"
+   x2="18.130600"
+   y1="62.927700"
+   x1="14.248000"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_25_">
+					<stop
+   id="stop1944"
+   style="stop-color:#FFFFFF"
+   offset="0" />
+					<stop
+   id="stop1946"
+   style="stop-color:#DCDCE0"
+   offset="1" />
+					
+					
+					
+				</linearGradient>
+				
+				
+				
+					<linearGradient
+   gradientTransform="matrix(-0.279700,0.981500,-1.218600,-0.347400,50.63740,141.2638)"
+   y2="22.446800"
+   x2="-56.447201"
+   y1="21.737301"
+   x1="-68.426804"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_26_">
+					<stop
+   id="stop1953"
+   style="stop-color:#DCDCE0"
+   offset="0" />
+					<stop
+   id="stop1955"
+   style="stop-color:#BEBEC2"
+   offset="1" />
+					
+					
+					
+				</linearGradient>
+				
+				
+					<linearGradient
+   gradientTransform="matrix(-0.274100,0.961700,-0.961700,-0.274100,24.23770,133.5791)"
+   y2="-1.5967000"
+   x2="-67.696297"
+   y1="3.6680000"
+   x1="-56.356400"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_27_">
+					<stop
+   id="stop1960"
+   style="stop-color:#0054BF"
+   offset="0" />
+					<stop
+   id="stop1962"
+   style="stop-color:#0047BF"
+   offset="1" />
+					
+					
+					
+				</linearGradient>
+				
+				
+					<linearGradient
+   gradientTransform="matrix(-0.274100,0.961700,-0.816500,-0.232800,9.573000,128.7048)"
+   y2="-19.257999"
+   x2="-66.917702"
+   y1="-14.327600"
+   x1="-56.297901"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_28_">
+					<stop
+   id="stop1967"
+   style="stop-color:#0054BF"
+   offset="0" />
+					<stop
+   id="stop1969"
+   style="stop-color:#5FA0FF"
+   offset="1" />
+					
+					
+					
+				</linearGradient>
+				
+				
+					<linearGradient
+   gradientTransform="matrix(-9.010000e-2,0.996000,-0.996000,-9.010000e-2,18.98860,131.3304)"
+   y2="-15.773900"
+   x2="-62.960201"
+   y1="-16.911600"
+   x1="-65.541496"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_29_">
+					<stop
+   id="stop1974"
+   style="stop-color:#BFE2FF"
+   offset="0" />
+					<stop
+   id="stop1976"
+   style="stop-color:#5FA0FF"
+   offset="1" />
+					
+					
+					
+				</linearGradient>
+				
+			</g>
+		<path
+   d="M 128.16900,118.23606 L 0.16900000,118.23606 L 0.16900000,-1.7097435e-14 L 128.16900,-1.7097435e-14 L 128.16900,118.23606 z "
+   id="path2062"
+   style="fill:none" />
+	<path
+   sodipodi:type="arc"
+   style="fill:#cccccc;fill-opacity:1.0000000"
+   id="path3123"
+   sodipodi:cx="79.111282"
+   sodipodi:cy="83.275467"
+   sodipodi:rx="34.713203"
+   sodipodi:ry="5.3321223"
+   d="M 113.82449 83.275467 A 34.713203 5.3321223 0 1 1  44.398079,83.275467 A 34.713203 5.3321223 0 1 1  113.82449 83.275467 z"
+   transform="matrix(1.267730,-0.246140,0.133394,1.354468,-35.04176,4.335442)" /><path
+   sodipodi:type="arc"
+   style="fill:#79799c;fill-opacity:1.0000000"
+   id="path3127"
+   sodipodi:cx="79.111282"
+   sodipodi:cy="83.275467"
+   sodipodi:rx="34.713203"
+   sodipodi:ry="5.3321223"
+   d="M 113.82449 83.275467 A 34.713203 5.3321223 0 1 1  44.398079,83.275467 A 34.713203 5.3321223 0 1 1  113.82449 83.275467 z"
+   transform="matrix(1.216726,-0.238824,0.191990,0.958919,-35.88576,36.67426)" /><rect
+   style="fill:#cccccc;fill-opacity:1.0000000"
+   id="rect3857"
+   width="3.3490131"
+   height="11.841051"
+   x="35.321518"
+   y="104.04992"
+   transform="matrix(0.991862,-0.127320,0.360903,0.932603,0.000000,0.000000)" /></g>
+</svg>
\ No newline at end of file
diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui
index bd559b819..0bcc7f846 100644
--- a/kcontrol/input/kmousedlg.ui
+++ b/kcontrol/input/kmousedlg.ui
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KMouseDlg</class>
 <widget class="TQWidget">
     <property name="name">
@@ -12,6 +12,9 @@
             <height>434</height>
         </rect>
     </property>
+    <property name="caption">
+        <string>KMouseDlg</string>
+    </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
@@ -132,7 +135,18 @@
                 <string>Re&amp;verse scroll direction</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Change the direction of scrolling for the mouse wheel or the 4th and 5th mouse buttons.</string>
+                <string>Change the direction of scrolling for the mouse wheel, if present.</string>
+            </property>
+        </widget>
+        <widget class="TQCheckBox">
+            <property name="name">
+                <cstring>cbRevHistButtons</cstring>
+            </property>
+            <property name="text">
+                <string>Swap &amp;history navigation buttons</string>
+            </property>
+            <property name="whatsThis" stdset="0">
+                <string>Swap the two history navigation buttons on the mouse, if present.</string>
             </property>
         </widget>
         <widget class="TQGroupBox">
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 2798ce1de..870f26047 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -68,18 +68,18 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
 
     if ( mouseCapabilityFlags & HAS_RES ) {
         updateResolution();
-        resolutionSelector->setEnabled( TRUE );
+        resolutionSelector->setEnabled( true );
 
-        connect( button400cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
-        connect( button800cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
+        connect( button400cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
+        connect( button800cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
 
         if ( 4 == resolution() ) {
-            button800cpi->setChecked( TRUE );
+            button800cpi->setChecked( true );
         } else if ( 3 == resolution() ) {
-            button400cpi->setChecked( TRUE );
+            button400cpi->setChecked( true );
         } else {
             // it must have failed, try to help out
-            resolutionSelector->setEnabled(FALSE);
+            resolutionSelector->setEnabled(false);
             permissionProblemText->show();
         }
     }
@@ -90,22 +90,22 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
 
         // Do a name
         cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) );
-        cordlessNameLabel->setEnabled( TRUE );
+        cordlessNameLabel->setEnabled( true );
 
         // Display the battery power level - the level gets updated in updateGUI()
-        batteryBox->setEnabled( TRUE );
+        batteryBox->setEnabled( true );
 
         // Channel
-        channelSelector->setEnabled( TRUE );
+        channelSelector->setEnabled( true );
         // if the channel is changed, we need to turn off the timer, otherwise it
         // just resets the button to reflect the current status. The timer is
         // started again when we applyChanges()
-        connect( channel1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) );
-        connect( channel1, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
+        connect( channel1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) );
+        connect( channel1, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
         if ( isDualChannelCapable() ) {
-            channel2->setEnabled( TRUE );
-            connect( channel2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) );
-            connect( channel2, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) );
+            channel2->setEnabled( true );
+            connect( channel2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) );
+            connect( channel2, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) );
         }
 
         updateGUI();
@@ -124,7 +124,7 @@ void LogitechMouse::initCordlessStatusReporting()
 {
     updateCordlessStatus();
     doUpdate = new TQTimer( this ); // will be automatically deleted
-    connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) );
+    connect( doUpdate, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateGUI() ) );
     doUpdate->start( 20000 );
 }
 
@@ -144,8 +144,8 @@ void LogitechMouse::updateCordlessStatus()
 
     if (0 > result) {
         // We probably have a permission problem
-        channelSelector->setEnabled( FALSE );
-        batteryBox->setEnabled( FALSE );
+        channelSelector->setEnabled( false );
+        batteryBox->setEnabled( false );
         cordlessNameLabel->hide();
         permissionProblemText->show();
     } else {
@@ -198,9 +198,9 @@ void LogitechMouse::updateGUI()
 
     if ( isDualChannelCapable() ) {
         if ( 2 == channel() ) {
-            channel2->setChecked( TRUE );
+            channel2->setChecked( true );
         } else if ( 1 == channel() ) {
-            channel1->setChecked( TRUE );
+            channel1->setChecked( true );
         } // else it might have failed - we don't do anything
     }
 }
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index 254f2ee5c..71d9ec66f 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -38,15 +38,17 @@
 #endif
 
 #include "mouse.h"
+#include "touchpad_settings.h"
+#include "touchpad.h"
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *)
   {
     return new MouseConfig(parent, "kcminput");
   }
 
-  KDE_EXPORT void init_mouse()
+  TDE_EXPORT void init_mouse()
   {
     TDEConfig *config = new TDEConfig("kcminputrc", true, false); // Read-only, no globals
     MouseSettings settings;
@@ -91,6 +93,23 @@ extern "C"
 
     delete config;
   }
+
+  TDE_EXPORT TDECModule *create_touchpad(TQWidget *parent, const char *)
+  {
+      return new TouchpadConfig(parent, "kcminput");
+  }
+
+  TDE_EXPORT void init_touchpad()
+  {
+      TouchpadSettings settings;
+      settings.apply();
+  }
+
+  TDE_EXPORT bool test_touchpad()
+  {
+      TouchpadSettings settings;
+      return settings.foundTouchpad();
+  }
 }
 
 
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 0d07e782e..576e2c376 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -61,7 +61,7 @@
 #include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
 
@@ -102,8 +102,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
 
     tabwidget->addTab(tab1, i18n("&General"));
 
-    connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed()));
-    connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotHandedChanged(int)));
+    connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed()));
+    connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotHandedChanged(int)));
 
     wtstr = i18n("If you are left-handed, you may prefer to swap the"
          " functions of the left and right buttons on your pointing device"
@@ -113,7 +113,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
          " a three-button mouse, the middle button is unaffected.");
     TQWhatsThis::add( tab1->handedBox, wtstr );
 
-    connect(tab1->doubleClick, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+    connect(tab1->doubleClick, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
 
     wtstr = i18n("The default behavior in TDE is to select and activate"
          " icons with a single click of the left button on your pointing"
@@ -127,7 +127,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     TQWhatsThis::add( tab1->singleClick, wtstr );
 
 
-    connect(tab1->cbAutoSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->cbAutoSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     wtstr = i18n("If you check this option, pausing the mouse pointer"
          " over an icon on the screen will automatically select that icon."
@@ -149,35 +149,33 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     wtstr = i18n("Show feedback when clicking an icon");
     TQWhatsThis::add( tab1->cbVisualActivate, wtstr );
 
-    connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->slAutoSelect, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(tab1->cbVisualActivate, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
-    connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->cb_pointershape, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
-    connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-    connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick()));
+    connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClick()));
 
-    connect( tab1->doubleClick, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) );
-    connect( tab1->cbAutoSelect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) );
+    connect( tab1->doubleClick, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) );
+    connect( tab1->cbAutoSelect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) );
 
-    // Only allow setting reversing scroll polarity if we have scroll buttons
     unsigned char map[20];
-    if ( XGetPointerMapping(kapp->getDisplay(), map, 20) >= 5 )
-    {
-      tab1->cbScrollPolarity->setEnabled( true );
-      tab1->cbScrollPolarity->show();
-    }
-    else
-    {
-      tab1->cbScrollPolarity->setEnabled( false );
-      tab1->cbScrollPolarity->hide();
-    }
-    connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-    connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScrollPolarityChanged()));
+    int buttonCount = XGetPointerMapping(tdeApp->getDisplay(), map, 20);
+
+    // Only allow setting reversing scroll polarity if we have scroll buttons
+    tab1->cbScrollPolarity->setEnabled(buttonCount >= 5);
+    connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotScrollPolarityChanged()));
+
+    // Only allow setting reversing history buttons (8, 9) if we have actually have them
+    tab1->cbRevHistButtons->setEnabled(buttonCount >= 9);
+    connect(tab1->cbRevHistButtons, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(tab1->cbRevHistButtons, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRevHistButtonsChanged()));
 
     // Cursor theme tab
     themetab = new ThemePage(this);
-    connect(themetab, TQT_SIGNAL(changed(bool)), TQT_SLOT(changed()));
+    connect(themetab, TQ_SIGNAL(changed(bool)), TQ_SLOT(changed()));
     tabwidget->addTab(themetab, i18n("&Cursor Theme"));
 
     // Advanced tab
@@ -191,7 +189,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     accel->setLabel(i18n("Pointer acceleration:"));
     accel->setSuffix("x");
     lay->addWidget(accel);
-    connect(accel, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed()));
+    connect(accel, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed()));
 
     wtstr = i18n("This option allows you to change the relationship"
          " between the distance that the mouse pointer moves on the"
@@ -210,8 +208,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     thresh->setRange(0,20,1);
     thresh->setSteps(1,1);
     lay->addWidget(thresh);
-    connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotThreshChanged(int)));
+    connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotThreshChanged(int)));
     slotThreshChanged(thresh->value());
 
     wtstr = i18n("The threshold is the smallest distance that the"
@@ -231,7 +229,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     doubleClickInterval->setSuffix(i18n(" msec"));
     doubleClickInterval->setSteps(100, 100);
     lay->addWidget(doubleClickInterval);
-    connect(doubleClickInterval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+    connect(doubleClickInterval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
     wtstr = i18n("The double click interval is the maximal time"
          " (in milliseconds) between two mouse clicks which"
@@ -245,16 +243,17 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
 
     doubleClickLabel = new TQLabel(i18n("Double-click on the image below to test your double-click interval:"), tab2);
     lay->addWidget(doubleClickLabel);
-    wtstr = i18n("The image will change when your double-click"
+    wtstr = i18n("<p>The image will change when your double-click"
          " test time is less than or equal to the interval you"
-         " configured. When changing the interval, be sure to select"
-         " the Apply button before testing. For example, the image"
-         " will not change when you configure a double-click interval"
-         " of 700 milliseconds and the time between two successive"
-         " clicks on the image is 800 milliseconds, but the image will"
-         " change when the time between clicks is 600 milliseconds."
+         " configured. For example, if you configure a double-click interval"
+         " of 700 milliseconds the image will not change when the time between"
+         " two successive clicks on the image is 800 milliseconds, but the image"
+         " will change when the time between clicks is 600 milliseconds."
          " The goal is to select a comfortable interval that you find"
-         " is not too fast or slow.");
+         " is not too fast or slow.</p>"
+         ""
+         " <p>When changing the interval it is not necessary to push"
+         " the <i>Apply</i> button before testing.</p>");
     TQWhatsThis::add( doubleClickLabel, wtstr );
     doubleClickStatus = false;  // First image will be displayed
     doubleClickButton = new TQPushButton( tab2 );
@@ -267,9 +266,9 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     lay->addWidget(doubleClickButton);
     // Use the same What's This help for the pushbutton.
     TQWhatsThis::add( doubleClickButton, wtstr );
-    connect(doubleClickButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotDoubleClickButtonPressed()));
+    connect(doubleClickButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotDoubleClickButtonPressed()));
     doubleClickTimer=new TQTimer();
-    connect(doubleClickTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoubleClickTimerDone()) );
+    connect(doubleClickTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDoubleClickTimerDone()) );
 
     lay->addSpacing(10);
 
@@ -279,7 +278,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     dragStartTime->setSuffix(i18n(" msec"));
     dragStartTime->setSteps(100, 100);
     lay->addWidget(dragStartTime);
-    connect(dragStartTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+    connect(dragStartTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
     wtstr = i18n("If you click with the mouse (e.g. in a multi-line"
          " editor) and begin to move the mouse within the"
@@ -291,8 +290,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     dragStartDist->setRange(1, 20, 1);
     dragStartDist->setSteps(1,1);
     lay->addWidget(dragStartDist);
-    connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDragStartDistChanged(int)));
+    connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDragStartDistChanged(int)));
     slotDragStartDistChanged(dragStartDist->value());
 
     wtstr = i18n("If you click with the mouse and begin to move the"
@@ -305,8 +304,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     wheelScrollLines->setRange(1, 12, 1);
     wheelScrollLines->setSteps(1,1);
     lay->addWidget(wheelScrollLines);
-    connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWheelScrollLinesChanged(int)));
+    connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWheelScrollLinesChanged(int)));
     slotWheelScrollLinesChanged(wheelScrollLines->value());
 
     wtstr = i18n("If you use the wheel of a mouse, this value determines the number of lines to scroll for each wheel movement. Note that if this number exceeds the number of visible lines, it will be ignored and the wheel movement will be handled as a page up/down movement.");
@@ -365,13 +364,13 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
   mk_curve->setRange(-1000, 1000, 100);
   hbox->addWidget(mk_curve);
 
-  connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess()));
-  connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-  connect(mk_delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_interval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_time_to_max, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_max_speed, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(mk_curve, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+  connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess()));
+  connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect(mk_delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_interval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_time_to_max, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_max_speed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(mk_curve, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
   vbox->addStretch();
 }
@@ -435,7 +434,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
   load();
 
   TDEAboutData* about = new TDEAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0,
-        TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers")); 
+        TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers"));
   about->addAuthor("Patrick Dowler", 0, 0);
   about->addAuthor("Dirk A. Mueller", 0, 0);
   about->addAuthor("David Faure", 0, 0);
@@ -521,9 +520,12 @@ void MouseConfig::load( bool useDefaults )
 
   tab1->rightHanded->setEnabled(settings->handedEnabled);
   tab1->leftHanded->setEnabled(settings->handedEnabled);
-  if ( tab1->cbScrollPolarity->isEnabled() )
-    tab1->cbScrollPolarity->setEnabled(settings->handedEnabled);
+  if (tab1->cbScrollPolarity->isEnabled())
+      tab1->cbScrollPolarity->setEnabled(settings->handedEnabled);
+  if (tab1->cbRevHistButtons->isEnabled())
+      tab1->cbRevHistButtons->setEnabled(settings->handedEnabled);
   tab1->cbScrollPolarity->setChecked( settings->reverseScrollPolarity );
+  tab1->cbRevHistButtons->setChecked( settings->reverseHistoryButtons );
 
   setAccel(settings->accelRate);
   setThreshold(settings->thresholdMove);
@@ -596,6 +598,7 @@ void MouseConfig::save()
 //  settings->changeCursor = tab1->singleClick->isChecked();
   settings->changeCursor = tab1->cb_pointershape->isChecked();
   settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked();
+  settings->reverseHistoryButtons = tab1->cbRevHistButtons->isChecked();
 
   settings->apply();
   TDEConfig config( "kcminputrc" );
@@ -621,7 +624,7 @@ void MouseConfig::save()
   themetab->save();
 
   // restart kaccess
-  kapp->startServiceByDesktopName("kaccess");
+  tdeApp->startServiceByDesktopName("kaccess");
 
   TDECModule::changed(false);
 
@@ -683,14 +686,14 @@ void MouseSettings::load(TDEConfig *config)
 {
   int accel_num, accel_den, threshold;
   double accel;
-  XGetPointerControl( kapp->getDisplay(),
+  XGetPointerControl( tdeApp->getDisplay(),
               &accel_num, &accel_den, &threshold );
   accel = float(accel_num) / float(accel_den);
 
   // get settings from X server
   int h = RIGHT_HANDED;
   unsigned char map[20];
-  num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20);
+  num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 20);
 
   handedEnabled = true;
 
@@ -745,6 +748,7 @@ void MouseSettings::load(TDEConfig *config)
   else if (key == NULL)
     handed = h;
   reverseScrollPolarity = config->readBoolEntry( "ReverseScrollPolarity", false );
+  reverseHistoryButtons = config->readBoolEntry( "ReverseHistoryButtons", false );
   m_handedNeedsApply = false;
 
   // SC/DC/AutoSelect/ChangeCursor
@@ -777,14 +781,14 @@ void MouseConfig::slotWheelScrollLinesChanged(int value)
 
 void MouseSettings::apply(bool force)
 {
-  XChangePointerControl( kapp->getDisplay(),
+  XChangePointerControl( tdeApp->getDisplay(),
                          true, true, int(tqRound(accelRate*10)), 10, thresholdMove);
 
-  // 256 might seems extreme, but X has already been known to return 32, 
+  // 256 might seems extreme, but X has already been known to return 32,
   // and we don't want to truncate things. Xlib limits the table to 256 bytes,
   // so it's a good uper bound..
   unsigned char map[256];
-  num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 256);
+  num_buttons = XGetPointerMapping(tdeApp->getDisplay(), map, 256);
 
   int remap=(num_buttons>=1);
   if (handedEnabled && (m_handedNeedsApply || force)) {
@@ -835,10 +839,25 @@ void MouseSettings::apply(bool force)
                   map[pos+1] = reverseScrollPolarity ? (unsigned char) 4 : (unsigned char) 5;
               }
           }
+          // 8,9 => history navigation buttons
+          // Logic is same as above with buttons 4 and 5, we find the buttons
+          // in the mapping, then, if needed, reverse them.
+          if (num_buttons >= 9)
+          {
+              int pos;
+              for( pos = 0; pos < num_buttons; ++pos )
+                  if( map[pos] == 8 || map[pos] == 9 )
+                      break;
+              if( pos < num_buttons - 1 )
+              {
+                  map[pos] = reverseHistoryButtons ? (unsigned char) 9 : (unsigned char) 8;
+                  map[pos+1] = reverseHistoryButtons ? (unsigned char) 8 : (unsigned char) 9;
+              }
+          }
       }
       int retval;
       if (remap)
-          while ((retval=XSetPointerMapping(kapp->getDisplay(), map,
+          while ((retval=XSetPointerMapping(tdeApp->getDisplay(), map,
                                             num_buttons)) == MappingBusy)
               /* keep trying until the pointer is free */
           { };
@@ -864,6 +883,7 @@ void MouseSettings::save(TDEConfig *config)
   else
       config->writeEntry("MouseButtonMapping",TQString("LeftHanded"));
   config->writeEntry( "ReverseScrollPolarity", reverseScrollPolarity );
+  config->writeEntry( "ReverseHistoryButtons", reverseHistoryButtons );
 
   config->setGroup("KDE");
   config->writeEntry("DoubleClickInterval", doubleClickInterval, true, true);
@@ -890,6 +910,11 @@ void MouseConfig::slotScrollPolarityChanged()
   settings->m_handedNeedsApply = true;
 }
 
+void MouseConfig::slotRevHistButtonsChanged()
+{
+    settings->m_handedNeedsApply = true;
+}
+
 TQString MouseConfig::handbookSection() const
 {
   int index = tabwidget->currentPageIndex();
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 7db5fbf91..22d0aa84c 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -83,6 +83,7 @@ public:
  bool changeCursor;
  int wheelScrollLines;
  bool reverseScrollPolarity;
+ bool reverseHistoryButtons;
 
  #ifdef HAVE_LIBUSB
  TQPtrList <LogitechMouse> logitechMouseList;
@@ -111,6 +112,7 @@ private slots:
   /** No descriptions */
   void slotHandedChanged(int val);
   void slotScrollPolarityChanged();
+  void slotRevHistButtonsChanged();
   void checkAccess();
   void slotThreshChanged(int value);
   void slotDragStartDistChanged(int value);
diff --git a/kcontrol/input/pics/CMakeLists.txt b/kcontrol/input/pics/CMakeLists.txt
deleted file mode 100644
index 0c9331efe..000000000
--- a/kcontrol/input/pics/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-install( FILES
-    mouse_rh.png mouse_lh.png doubleclick_1.png doubleclick_2.png
-  DESTINATION ${DATA_INSTALL_DIR}/kcminput/pics )
diff --git a/kcontrol/input/pics/mouse0.png b/kcontrol/input/pics/mouse0.png
new file mode 100644
index 000000000..02e708b04
--- /dev/null
+++ b/kcontrol/input/pics/mouse0.png
diff --git a/kcontrol/input/pics/mouse1.png b/kcontrol/input/pics/mouse1.png
new file mode 100644
index 000000000..f3aeea106
--- /dev/null
+++ b/kcontrol/input/pics/mouse1.png
diff --git a/kcontrol/input/pics/mouse2.png b/kcontrol/input/pics/mouse2.png
new file mode 100644
index 000000000..40c34fe59
--- /dev/null
+++ b/kcontrol/input/pics/mouse2.png
diff --git a/kcontrol/input/pics/mouse3.png b/kcontrol/input/pics/mouse3.png
new file mode 100644
index 000000000..74e5c1423
--- /dev/null
+++ b/kcontrol/input/pics/mouse3.png
diff --git a/kcontrol/input/tdesyndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp
new file mode 100644
index 000000000..c879c92a6
--- /dev/null
+++ b/kcontrol/input/tdesyndaemon.cpp
@@ -0,0 +1,207 @@
+/*******************************************************************************
+ tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
+                on keyboard input
+
+ Copyright © 2004 Nadeem Hasan <nhasan@kde.org>
+                  Stefan Kombrink <katakombi@web.de>
+             2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+// TQt
+#include <tqdatetime.h>
+#include <tqtimer.h>
+
+// TDE
+#include <tdesimpleconfig.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
+#include <kdebug.h>
+
+// DCOP
+#include <dcopclient.h>
+
+// tdecm_touchpad
+#include "touchpad_settings.h"
+
+// TDESynDaemon
+#include "tdesyndaemon.h"
+#include "tdesyndaemon.moc"
+
+const unsigned int TDESynDaemon::TIME_OUT = 300;
+const unsigned int TDESynDaemon::POLL_INTERVAL = 100;
+const unsigned int TDESynDaemon::KEYMAP_SIZE = 32;
+
+unsigned char* TDESynDaemon::m_keyboard_mask;
+
+TDESynDaemon::TDESynDaemon() : DCOPObject("tdesyndaemon"), TQObject()
+{
+    m_typing = false;
+    m_time = new TQTime();
+    d_settings = new TouchpadSettings;
+
+    m_keyboard_mask = new unsigned char[ KEYMAP_SIZE ];
+
+    // open a connection to the X server
+    m_display = XOpenDisplay(NULL);
+
+    if (!m_display) kdError() << "Can't open display!" << endl;
+
+    // setup keymap
+    XModifierKeymap *modifiers;
+
+    for (unsigned int i = 0; i < KEYMAP_SIZE; ++i)
+        m_keyboard_mask[i] = 0xFF;
+
+    modifiers = XGetModifierMapping(m_display);
+    for (int i = 0; i < 8 * modifiers->max_keypermod; ++i)
+    {
+        KeyCode kc = modifiers->modifiermap[i];
+        if (kc != 0) clearBit(m_keyboard_mask, kc);
+    }
+
+    XFreeModifiermap(modifiers);
+
+    m_poll = new TQTimer(this);
+    connect(m_poll, TQ_SIGNAL(timeout()), this, TQ_SLOT(poll()));
+    m_poll->start(POLL_INTERVAL);
+}
+
+TDESynDaemon::~TDESynDaemon()
+{
+    setTouchpadOn(true);
+    m_poll->stop();
+    delete m_keyboard_mask;
+}
+
+void TDESynDaemon::stop()
+{
+    tdeApp->quit();
+}
+
+void TDESynDaemon::poll()
+{
+    // do nothing if the user has explicitly disabled the touchpad in the settings
+    if (!touchpadEnabled()) return;
+
+    if (hasKeyboardActivity())
+    {
+        m_time->start();
+
+        if (!m_typing)
+        {
+            setTouchpadOn(false);
+        }
+    }
+
+    else
+    {
+        if (m_typing && (m_time->elapsed() > TIME_OUT))
+        {
+            setTouchpadOn(true);
+        }
+    }
+}
+
+bool TDESynDaemon::touchpadEnabled()
+{
+    // We can't read from our own TouchpadSettings
+    // as it contains the currently applied value
+    // so we revert to this
+    TDESimpleConfig cfg("kcminputrc");
+    cfg.setGroup("Touchpad");
+    return cfg.readBoolEntry("Enabled", true);
+}
+
+void TDESynDaemon::setTouchpadOn(bool on)
+{
+    m_typing = !on;
+    if (!d_settings->setTouchpadEnabled(on))
+    {
+        kdWarning() << "unable to turn off touchpad!" << endl;
+    }
+}
+
+void TDESynDaemon::clearBit(unsigned char *ptr, int bit)
+{
+    int byteNum = bit / 8;
+    int bitNum = bit % 8;
+    ptr[byteNum] &= ~(1 << bitNum);
+}
+
+bool TDESynDaemon::hasKeyboardActivity()
+{
+    static unsigned char oldKeyState[KEYMAP_SIZE];
+    unsigned char keyState[KEYMAP_SIZE];
+
+    bool result = false;
+
+    XQueryKeymap(m_display, (char*)keyState);
+
+    // find pressed keys
+    for (unsigned int i = 0; i < KEYMAP_SIZE; ++i)
+    {
+        if ((keyState[i] & ~oldKeyState[i]) & m_keyboard_mask[i])
+        {
+            result = true;
+            break;
+        }
+    }
+
+    // ignore any modifiers
+    for (unsigned int i = 0; i < KEYMAP_SIZE; ++i)
+    {
+        if (keyState[i] & ~m_keyboard_mask[i])
+        {
+            result = false;
+            break;
+        }
+    }
+
+    // back up key states...
+    for (unsigned int i = 0; i < KEYMAP_SIZE; ++i)
+    {
+        oldKeyState[i] = keyState[i];
+    }
+
+    return result;
+}
+
+extern "C" TDE_EXPORT int main(int argc, char *argv[])
+{
+    TDEAboutData aboutData( "tdesyndaemon", I18N_NOOP("TDE Synaptics helper daemon"),
+        "0.1", I18N_NOOP("TDE Synaptics helper daemon"), TDEAboutData::License_GPL_V2,
+        "© 2024 Mavridis Philippe" );
+
+    aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"), "nhasan@kde.org");
+    aboutData.addAuthor("Mavridis Philippe", I18N_NOOP("Author"), "mavridisf@gmail.com");
+
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+
+    TDEApplication app;
+    app.disableSessionManagement();
+    if (app.dcopClient()->isApplicationRegistered("tdesyndaemon"))
+    {
+        kdWarning() << "TDESynDaemon already running, exiting..." << endl;
+        return 255;
+    }
+    app.dcopClient()->registerAs("tdesyndaemon", false);
+    app.dcopClient()->setDefaultObject("tdesyndaemon");
+
+    TDESynDaemon tdesyndaemon;
+    return app.exec();
+}
diff --git a/kcontrol/input/tdesyndaemon.h b/kcontrol/input/tdesyndaemon.h
new file mode 100644
index 000000000..47b799284
--- /dev/null
+++ b/kcontrol/input/tdesyndaemon.h
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
+                on keyboard input
+
+ Copyright © 2004 Nadeem Hasan <nhasan@kde.org>
+                  Stefan Kombrink <katakombi@web.de>
+             2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+#ifndef __TDESYNDAEMON_H__
+#define __TDESYNDAEMON_H__
+
+// TQt
+#include <tqobject.h>
+#include <tqthread.h>
+
+// DCOP
+#include <dcopobject.h>
+
+// X11
+#include <X11/Xlib.h>
+#undef Bool /* fix problems in --enable-final mode */
+#undef None /* fix problems in --enable-final mode */
+
+// TDESynDaemon
+#include "tdesyndaemon_iface.h"
+
+
+class TQTimer;
+
+class TDESynDaemon : public TQObject, public virtual TDESynDaemonIface
+{
+    TQ_OBJECT
+
+    public:
+        TDESynDaemon();
+        ~TDESynDaemon();
+
+        bool touchpadEnabled();
+
+    public slots:
+        void poll();
+        void setTouchpadOn(bool on);
+        virtual void stop();
+
+    protected:
+        void clearBit(unsigned char* ptr, int bit);
+        bool hasKeyboardActivity();
+
+    private:
+        TouchpadSettings *d_settings;
+
+        TQTimer *m_poll;
+        TQTime *m_time;
+        Display *m_display;
+        bool m_typing;
+
+        static const unsigned int POLL_INTERVAL;
+        static const unsigned int TIME_OUT;
+        static const unsigned int KEYMAP_SIZE;
+        static unsigned char *m_keyboard_mask;
+};
+
+#endif
+
diff --git a/kcontrol/input/tdesyndaemon_iface.h b/kcontrol/input/tdesyndaemon_iface.h
new file mode 100644
index 000000000..68dc8a387
--- /dev/null
+++ b/kcontrol/input/tdesyndaemon_iface.h
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
+                on keyboard input
+
+ Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+#ifndef __TDESYNDAEMON_IFACE_H__
+#define __TDESYNDAEMON_IFACE_H__
+
+// DCOP
+#include <dcopobject.h>
+
+class TDESynDaemonIface : virtual public DCOPObject
+{
+    K_DCOP
+    k_dcop:
+        virtual void stop() = 0;
+};
+
+#endif
diff --git a/kcontrol/input/touchpad.cpp b/kcontrol/input/touchpad.cpp
new file mode 100644
index 000000000..d18e3b698
--- /dev/null
+++ b/kcontrol/input/touchpad.cpp
@@ -0,0 +1,528 @@
+/*******************************************************************************
+ tdecm_touchpad
+ A touchpad module for the TDE Control Centre
+
+ Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+// TQt
+#include <tqwhatsthis.h>
+#include <tqtooltip.h>
+#include <tqtabwidget.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqslider.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+
+// TDE
+#include <tdeglobal.h>
+#include <kiconloader.h>
+#include <tdeaboutdata.h>
+#include <kdialog.h>
+#include <kdebug.h>
+
+// TouchpadConfig
+#include "touchpad_settings.h"
+#include "touchpad.h"
+#include "touchpad.moc"
+
+
+/******************************* TouchpadConfig *******************************/
+TouchpadConfig::TouchpadConfig(TQWidget *parent, const char *name)
+: TDECModule(parent, name),
+  m_error(nullptr)
+{
+    TDEGlobal::iconLoader()->addAppDir("kcminput");
+
+    d_settings = new TouchpadSettings;
+    d_settings->apply();
+
+    if (!d_settings->supportedTouchpad())
+    {
+        TQString error_str;
+
+        if (!d_settings->foundTouchpad())
+        {
+            error_str = i18n(
+                "<qt><h1>Touchpad not found</h1>"
+                "Please check your system installation.</qt>"
+            );
+        }
+
+        else IF_DRIVER(None)
+        {
+            error_str = i18n(
+                "<qt><h1>Unsupported driver</h1>"
+                "<p>This module only supports the following drivers:"
+                "<p>Libinput, Synaptics</qt>"
+            );
+        }
+
+        else error_str = i18n("<qt><h1>Unknown error</h1></qt>");
+
+        m_error = new TQLabel(error_str, this);
+        m_error->setAlignment(TQt::AlignCenter);
+        new TQVBoxLayout(this);
+        layout()->add(m_error);
+        return;
+    }
+
+    initWidgets();
+    load();
+
+    kdDebug() << "managed touchpad: " << d_settings->touchpad().name
+              << " (xid = " <<  d_settings->touchpad().id << ")" << endl;
+
+    TDEAboutData* about = new TDEAboutData(
+        "tdecm_touchpad",
+        I18N_NOOP("Touchpad"),
+        0, 0,
+        TDEAboutData::License_GPL,
+        I18N_NOOP("(c) 2024 Mavridis Philippe")
+    );
+    about->addAuthor("Mavridis Philippe", 0, 0);
+    setAboutData(about);
+}
+
+TouchpadConfig::~TouchpadConfig()
+{
+    DEL(m_error)
+    DEL(d_settings);
+}
+
+void TouchpadConfig::initWidgets()
+{
+    // Create containers
+    m_container = new TQTabWidget(this);
+
+    TQFrame *touchpadWidget = new TQFrame(this);
+    touchpadWidget->setMargin(0);
+    new TQVBoxLayout(touchpadWidget);
+
+    // Enable option
+    TQFrame *enableCheckBox = new TQFrame(touchpadWidget);
+    enableCheckBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
+
+    m_enabled = new TQCheckBox(i18n("Enable touchpad"), enableCheckBox);
+    TQWhatsThis::add(m_enabled, i18n(
+        "This option determines whether the touchpad is enabled or disabled"
+    ));
+
+    // Compute margin for idented checkboxes based on checkbox height
+    int lmargin = m_enabled->height() / 2;
+
+    // Align the Enable checkbox with the other options below
+    new TQHBoxLayout(enableCheckBox);
+    enableCheckBox->layout()->addItem(new TQSpacerItem(lmargin, lmargin, TQSizePolicy::Fixed));
+    enableCheckBox->layout()->add(m_enabled);
+
+    // Settings frame
+    TQFrame *settingsFrame = new TQFrame(touchpadWidget);
+    TQGridLayout *grid = new TQGridLayout(settingsFrame, 3, 2, KDialog::spacingHint());
+
+    connect(m_enabled, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+    connect(m_enabled, TQ_SIGNAL(toggled(bool)), settingsFrame, TQ_SLOT(setEnabled(bool)));
+
+    // Behaviour
+    m_behaviour = new TQGroupBox(2, TQt::Vertical, i18n("Behaviour"), settingsFrame);
+
+    m_offWhileTyping = new TQCheckBox(i18n("Disable touchpad while typing"), m_behaviour);
+    TQWhatsThis::add(m_offWhileTyping, i18n(
+        "If this option is checked, the touchpad is disabled while you are typing, so as "
+        "to prevent accidental cursor movement and clicks."
+    ));
+    connect(m_offWhileTyping, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+
+    m_mbEmulation = new TQCheckBox(i18n("Middle button emulation"), m_behaviour);
+    TQWhatsThis::add(m_mbEmulation, i18n(
+        "If this option is enabled, a simultaneous left and right button click is "
+        "automatically transformed into a middle button click."
+    ));
+    IF_DRIVER(LibInput)
+    {
+        connect(m_mbEmulation, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+    }
+    else
+    {
+        DISABLE_UNSUPPORTED_OPTION(m_mbEmulation);
+    }
+
+    // Speed
+    m_speed = new TQGroupBox(4, TQt::Vertical, i18n("Speed"), settingsFrame);
+
+    TQLabel *accelLabel = new TQLabel(i18n("Acceleration:"), m_speed);
+
+    m_accel = new TQSlider(-100, 100, 5, 0, TQt::Horizontal, m_speed);
+
+    TQWidget *accelSliderMarkBox = new TQWidget(m_speed);
+    new TQHBoxLayout(accelSliderMarkBox);
+    accelSliderMarkBox->layout()->setAutoAdd(true);
+
+    TQLabel *l;
+    l = new TQLabel(i18n("Slower"), accelSliderMarkBox);
+    l->setAlignment(TQt::AlignLeft);
+    l = new TQLabel(i18n("Normal"), accelSliderMarkBox);
+    l->setAlignment(TQt::AlignHCenter);
+    l = new TQLabel(i18n("Faster"), accelSliderMarkBox);
+    l->setAlignment(TQt::AlignRight);
+    l = nullptr;
+
+    m_accelAdaptive = new TQCheckBox(i18n("Use adaptive profile"), m_speed);
+
+    IF_DRIVER(LibInput)
+    {
+        connect(m_accel, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+        connect(m_accelAdaptive, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+
+        // check available profiles
+        TQValueList<bool> accelProfilesAvail = d_settings->getAccelProfilesAvailability();
+        if (!accelProfilesAvail.count() || accelProfilesAvail[0] == 0 || accelProfilesAvail[1] == 0)
+        {
+            m_accelAdaptive->setEnabled(false);
+        }
+    }
+    else
+    {
+        DISABLE_UNSUPPORTED_OPTION(m_speed)
+    }
+
+    // Tapping
+    m_tapping = new TQGroupBox(5, TQt::Vertical, i18n("Tapping"), settingsFrame);
+
+    m_tapClick = new TQCheckBox(i18n("Tap to click"), m_tapping);
+    TQWhatsThis::add(m_tapClick, i18n(
+        "If this option is checked, a tap on the touchpad is interpreted as a button click."
+    ));
+    connect(m_tapClick, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+    connect(m_tapClick, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates()));
+
+    m_tapDrag = new TQCheckBox(i18n("Tap-and-drag"), m_tapping);
+    TQWhatsThis::add(m_tapDrag, i18n(
+        "Tap-and-drag is a tap which is immediately followed by a finger down and that finger "
+        "being held down emulates a button press. Moving the finger around can thus drag the "
+        "selected item on the screen."
+    ));
+    connect(m_tapDrag, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+    connect(m_tapDrag, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates()));
+
+    m_tapDragLock = new TQCheckBox(i18n("Tap-and-drag lock"), m_tapping);
+    TQWhatsThis::add(m_tapDragLock, i18n(
+        "When enabled, lifting a finger while dragging will not immediately stop dragging."
+    ));
+
+    IF_DRIVER(LibInput)
+    {
+        connect(m_tapDragLock, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+    }
+    else
+    {
+        DISABLE_UNSUPPORTED_OPTION(m_tapDragLock);
+    }
+
+    TQLabel *tapMappingLabel = new TQLabel(i18n("Two-finger tap:"), m_tapping);
+    m_tapMapping = new TQComboBox(m_tapping); // "lrm" and "lmr"
+    m_tapMapping->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Fixed);
+    m_tapMapping->insertItem(
+        TDEGlobal::iconLoader()->loadIcon("mouse3", TDEIcon::Small),
+        i18n("Right click (three-finger tap for middle click)"),
+        0);
+    m_tapMapping->insertItem(
+        TDEGlobal::iconLoader()->loadIcon("mouse2", TDEIcon::Small),
+        i18n("Middle click (three-finger tap for right click)"),
+        1);
+    connect(m_tapMapping, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(changed()));
+
+    // Scrolling options
+    m_scrolling = new TQGroupBox(4, TQt::Vertical, i18n("Scrolling options"), settingsFrame);
+
+    m_verScroll = new TQCheckBox(i18n("Vertical scrolling"), m_scrolling);
+    TQWhatsThis::add(m_verScroll, i18n(
+        "This option enables/disables the vertical scrolling gesture on the touchpad. "
+        "(The actual gesture depends on the selected scroll method.) "
+        "Unless the used driver is Synaptics, disabling vertical scrolling also disables "
+        "horizontal scrolling."
+    ));
+    connect(m_verScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+    connect(m_verScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates()));
+
+    m_horScroll = new TQCheckBox(i18n("Horizontal scrolling"), m_scrolling);
+    TQWhatsThis::add(m_horScroll, i18n(
+        "This option enables/disables the horizontal scrolling gesture on the touchpad. "
+        "(The actual gesture depends on the selected scroll method.)"
+    ));
+    connect(m_horScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+    connect(m_horScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateWidgetStates()));
+
+    m_naturalScroll = new TQCheckBox(i18n("Reverse scroll direction"), m_scrolling);
+    TQWhatsThis::add(m_naturalScroll, i18n(
+        "If this option is checked, the scrolling direction is reversed to resemble natural "
+        "movement of content. This feature is also called natural scrolling."
+    ));
+    connect(m_naturalScroll, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+
+    m_naturalScrollDirections = new TQFrame(m_scrolling);
+    TQWhatsThis::add(m_naturalScrollDirections, i18n(
+        "This option allows you to select the scrolling directions to which reversed scrolling will be applied. "
+        "It is only available if the Synaptics driver is used."
+    ));
+    TQGridLayout *nsdl = new TQGridLayout(m_naturalScrollDirections, 2, 2, KDialog::spacingHint());
+    m_horNaturalScroll = new TQCheckBox(i18n("Apply to horizontal scrolling"), m_naturalScrollDirections);
+    m_verNaturalScroll = new TQCheckBox(i18n("Apply to vertical scrolling"), m_naturalScrollDirections);
+    nsdl->addItem(new TQSpacerItem(lmargin, lmargin, TQSizePolicy::Fixed), 0, 0);
+    nsdl->addItem(new TQSpacerItem(lmargin, lmargin, TQSizePolicy::Fixed), 1, 0);
+    nsdl->addWidget(m_horNaturalScroll, 0, 1);
+    nsdl->addWidget(m_verNaturalScroll, 1, 1);
+
+    IF_DRIVER(Synaptics)
+    {
+        connect(m_horNaturalScroll, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+        connect(m_verNaturalScroll, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+        connect(m_naturalScroll, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWidgetStates()));
+    }
+    else
+    {
+        // Not only disable, but also force checkboxes to be checked on
+        // so that the user knows that the natural scrolling option applies
+        // always to both directions
+        DISABLE_UNSUPPORTED_OPTION(m_naturalScrollDirections);
+        m_horNaturalScroll->setChecked(true);
+        m_verNaturalScroll->setChecked(true);
+    }
+
+    // Scrolling methods
+    m_scrollMethods = new TQButtonGroup(3, TQt::Vertical, i18n("Scrolling method"), settingsFrame);
+    TQWhatsThis::add(m_scrollMethods, i18n(
+        "Here you can select your preferred scrolling method. The two most common options are "
+        "two-finger scrolling and edge scrolling. Two-finger scrolling entails a movement with "
+        "two fingers vertically or horizontally upon the surface of the touchpad. Edge scrolling "
+        "on the other hand tracks movements with one finger along the right or bottom edge of "
+        "the touchpad."
+    ));
+    connect(m_scrollMethods, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed()));
+
+    TQStringList scrollMethodLabels;
+    scrollMethodLabels << i18n("Two-finger")
+                       << i18n("Edge");
+
+    IF_DRIVER(LibInput)
+    {
+        scrollMethodLabels << i18n("Button");
+    }
+
+    TQValueList<bool> scrollMethodAvail = d_settings->getScrollMethodsAvailability();
+    Q_ASSERT(scrollMethodLabels.count() == scrollMethodAvail.count());
+
+    for (int i = 0; i < scrollMethodLabels.count(); ++i)
+    {
+        TQRadioButton *rad = new TQRadioButton(scrollMethodLabels[i], m_scrollMethods);
+        rad->setEnabled(scrollMethodAvail[i]);
+    }
+
+    // Finalize layout
+    grid->addWidget(m_behaviour, 0, 0);
+    grid->addWidget(m_speed, 1, 0);
+    grid->addMultiCellWidget(m_scrolling, 0, 1, 1, 1);
+    grid->addWidget(m_scrollMethods, 2, 1);
+    grid->addWidget(m_tapping, 2, 0);
+    grid->addItem(new TQSpacerItem(10, 10));
+
+    // Synaptics deprecation warning
+    IF_DRIVER(Synaptics)
+    {
+        TQLabel *l = new TQLabel(i18n(
+            "<qt><b>Warning:</b> The Synaptics driver has been deprecated.</qt>"
+        ), settingsFrame);
+        TQWhatsThis::add(l, i18n(
+            "<qt><p><b>The Synaptics driver is no longer in active development.</b>"
+            "<p>While Libinput is the preferred choice for handling input devices, "
+            "you might still have valid reasons to use the older Synaptics driver "
+            "in its place. Please bear in mind that you will probably not receive "
+            "updates and bug fixes from its upstream.</qt>"
+        ));
+        grid->addMultiCellWidget(l, 3, 3, 0, 1);
+    }
+
+    touchpadWidget->layout()->add(enableCheckBox);
+    touchpadWidget->layout()->add(settingsFrame);
+    m_container->addTab(touchpadWidget, SmallIconSet("input-touchpad"), d_settings->touchpad().name);
+
+    new TQVBoxLayout(this, KDialog::marginHint());
+    layout()->add(m_container);
+}
+
+// We handle more complex UI cases here
+void TouchpadConfig::updateWidgetStates()
+{
+    if (!d_settings->foundTouchpad()) return;
+
+    // Scrolling related options
+    bool on;
+
+    IF_DRIVER(LibInput)
+    {
+        // To disable vertical scrolling under LibInput one has to disable scrolling entirely
+        // so we mirror this in the UI
+        on = m_verScroll->isChecked();
+        m_horScroll->setEnabled(on);
+    }
+
+    else
+    {
+        // In case we can control both horizontal and vertical scrolling separately, any UI
+        // changes should be triggered when both are disabled
+        on = m_verScroll->isChecked() || m_horScroll->isChecked();
+
+        // Only enable natural scroll directions options when not under LibInput
+        m_naturalScrollDirections->setEnabled(on && m_naturalScroll->isChecked());
+    }
+
+    m_naturalScroll->setEnabled(on);
+    m_scrollMethods->setEnabled(on);
+
+    // Tapping related options
+    m_tapDrag->setEnabled(m_tapClick->isChecked());
+
+    IF_DRIVER(LibInput)
+    {
+        m_tapDragLock->setEnabled(m_tapClick->isChecked() && m_tapDrag->isChecked());
+    }
+}
+
+void TouchpadConfig::defaults()
+{
+    load(true);
+}
+
+void TouchpadConfig::load()
+{
+    load(false);
+}
+
+void TouchpadConfig::load(bool useDefaults)
+{
+    if (!d_settings->foundTouchpad()) return;
+
+    d_settings->load();
+
+    m_enabled->setChecked(d_settings->enabled);
+
+    // Behaviour
+    m_offWhileTyping->setChecked(d_settings->offWhileTyping);
+
+    IF_DRIVER(LibInput)
+    {
+        m_mbEmulation->setChecked(d_settings->midButtonEmulation);
+    }
+
+    // Speed
+    IF_DRIVER(LibInput)
+    {
+        m_accel->setValue(d_settings->accelSpeed);
+        m_accelAdaptive->setChecked(d_settings->accelProfile == 0);
+    }
+
+    // Tapping
+    m_tapClick->setChecked(d_settings->tapClick);
+    m_tapDrag->setChecked(d_settings->tapDrag);
+
+    IF_DRIVER(LibInput)
+    {
+        m_tapDragLock->setChecked(d_settings->tapDragLock);
+    }
+
+    m_tapMapping->setCurrentItem(d_settings->tapMapping);
+
+    // Scrolling options
+    m_horScroll->setChecked(d_settings->scrollDirections & TQt::Horizontal);
+    m_verScroll->setChecked(d_settings->scrollDirections & TQt::Vertical);
+    m_naturalScroll->setChecked(d_settings->naturalScroll);
+    IF_DRIVER(Synaptics)
+    {
+        m_naturalScrollDirections->setEnabled(d_settings->naturalScroll);
+        m_horNaturalScroll->setChecked(d_settings->naturalScrollDirections & TQt::Horizontal);
+        m_verNaturalScroll->setChecked(d_settings->naturalScrollDirections & TQt::Vertical);
+    }
+
+    IF_DRIVER(LibInput)
+    {
+        m_horScroll->setEnabled(m_verScroll->isOn());
+        m_naturalScroll->setEnabled(m_verScroll->isOn());
+        m_scrollMethods->setEnabled(m_verScroll->isOn());
+    }
+
+    // Scrolling method
+    m_scrollMethods->setButton(d_settings->scrollMethod);
+}
+
+void TouchpadConfig::save()
+{
+    if (!d_settings->foundTouchpad()) return;
+
+    d_settings->enabled = m_enabled->isChecked();
+
+    // Behaviour
+    d_settings->offWhileTyping = m_offWhileTyping->isChecked();
+
+    IF_DRIVER(LibInput)
+    {
+        d_settings->midButtonEmulation = m_mbEmulation->isChecked();
+    }
+
+    // Speed
+    IF_DRIVER(LibInput)
+    {
+        d_settings->accelSpeed = m_accel->value();
+        d_settings->accelProfile = (m_accelAdaptive->isChecked() ? 0 : 1);
+    }
+
+    // Tapping
+    d_settings->tapClick = m_tapClick->isChecked();
+    d_settings->tapDrag = m_tapDrag->isChecked();
+
+    IF_DRIVER(LibInput)
+    {
+        d_settings->tapDragLock = m_tapDragLock->isChecked();
+    }
+
+    d_settings->tapMapping = m_tapMapping->currentItem();
+
+    // Scrolling options
+    int scrollDirections = 0;
+    if (m_horScroll->isChecked()) scrollDirections |= TQt::Horizontal;
+    if (m_verScroll->isChecked()) scrollDirections |= TQt::Vertical;
+    d_settings->scrollDirections = scrollDirections;
+
+    d_settings->naturalScroll = m_naturalScroll->isChecked();
+
+    int naturalScrollDirections = 0;
+    if (m_horNaturalScroll->isChecked()) naturalScrollDirections |= TQt::Horizontal;
+    if (m_verNaturalScroll->isChecked()) naturalScrollDirections |= TQt::Vertical;
+    d_settings->naturalScrollDirections = naturalScrollDirections;
+
+    // Scrolling method
+    d_settings->scrollMethod = m_scrollMethods->selectedId();
+
+    d_settings->save();
+    d_settings->apply();
+}
+
+Touchpad TouchpadConfig::touchpad()
+{
+    return d_settings->touchpad();
+}
diff --git a/kcontrol/input/touchpad.desktop b/kcontrol/input/touchpad.desktop
new file mode 100644
index 000000000..d943749c1
--- /dev/null
+++ b/kcontrol/input/touchpad.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Exec=tdecmshell touchpad
+Icon=input-touchpad
+Type=Application
+X-DocPath=kcontrol/touchpad/index.html
+
+X-TDE-Library=input
+X-TDE-FactoryName=touchpad
+X-TDE-Init=touchpad
+X-TDE-ParentApp=kcontrol
+X-TDE-Test-Module=true
+
+Name=Touchpad
+Comment=Touchpad settings
+Keywords=Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;Click;mapping;right handed;left handed;
+Categories=Qt;TDE;X-TDE-settings-hardware;
\ No newline at end of file
diff --git a/kcontrol/input/touchpad.h b/kcontrol/input/touchpad.h
new file mode 100644
index 000000000..088f7164a
--- /dev/null
+++ b/kcontrol/input/touchpad.h
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ tdecm_touchpad
+ A touchpad module for the TDE Control Centre
+
+ Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+#ifndef __TOUCHPAD_H__
+#define __TOUCHPAD_H__
+
+// TDE
+#include <tdecmodule.h>
+#include <tdelocale.h>
+
+// Macros
+#define OPTION_NOT_SUPPORTED I18N_NOOP("This option is not compatible with the currently used driver")
+#define DISABLE_UNSUPPORTED_OPTION(optionWidget) \
+    optionWidget->setEnabled(false); \
+    TQToolTip::add(optionWidget, i18n(OPTION_NOT_SUPPORTED));
+
+// Forward definitions
+class TQTabWidget;
+class TQButtonGroup;
+class TQGroupBox;
+class TQCheckBox;
+class TQComboBox;
+class TQSlider;
+class TQLabel;
+class TQFrame;
+class TDEConfig;
+class TouchpadSettings;
+struct Touchpad;
+
+
+/******************************* TouchpadConfig *******************************/
+class TouchpadConfig : public TDECModule
+{
+    TQ_OBJECT
+
+    public:
+        TouchpadConfig(TQWidget *parent, const char *name);
+        ~TouchpadConfig();
+
+        void load();
+        void load(bool useDefaults);
+        void save();
+        void defaults();
+
+        Touchpad touchpad();
+
+    protected:
+        void initWidgets();
+
+    protected slots:
+        void updateWidgetStates();
+
+    private:
+        TouchpadSettings *d_settings;
+
+        TQTabWidget *m_container;
+        TQLabel *m_error;
+        TQCheckBox *m_enabled;
+
+        TQGroupBox *m_behaviour;
+        TQCheckBox *m_offWhileTyping, *m_leftHanded, *m_mbEmulation;
+
+        TQGroupBox *m_speed;
+        TQSlider *m_accel;
+        TQCheckBox *m_accelAdaptive;
+
+        TQGroupBox *m_tapping;
+        TQCheckBox *m_tapClick, *m_tapDrag, *m_tapDragLock;
+        TQComboBox *m_tapMapping;
+
+        TQGroupBox *m_scrolling;
+        TQCheckBox *m_horScroll, *m_verScroll, *m_naturalScroll,
+                   *m_horNaturalScroll, *m_verNaturalScroll;
+
+        TQFrame *m_naturalScrollDirections;
+
+        TQButtonGroup *m_scrollMethods;
+};
+
+#endif // __TOUCHPAD_H__
diff --git a/kcontrol/input/touchpad_settings.cpp b/kcontrol/input/touchpad_settings.cpp
new file mode 100644
index 000000000..ba910c607
--- /dev/null
+++ b/kcontrol/input/touchpad_settings.cpp
@@ -0,0 +1,409 @@
+/*******************************************************************************
+ tdecm_touchpad
+ A touchpad module for the TDE Control Centre
+
+ Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+// TDE
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <kdebug.h>
+
+// DCOP
+#include <dcopref.h>
+
+// X11
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XInput2.h>
+
+// tdecm_touchpad
+#include "xiproperty.h"
+#include "touchpad_settings.h"
+
+
+/****************************** TouchpadSettings ******************************/
+TouchpadSettings::TouchpadSettings()
+: m_foundTouchpad(false)
+{
+    findTouchpad();
+}
+
+bool TouchpadSettings::findTouchpad()
+{
+    Display *display = tqt_xdisplay();
+    ATOM(isTouchpad, XI_TOUCHPAD)
+    ATOM(isLibinput, "libinput Send Events Mode Enabled")
+    ATOM(isSynaptics, "Synaptics Off")
+
+    int devicesCount;
+    XDeviceInfo *deviceList = XListInputDevices(display, &devicesCount);
+
+    for (int d = 0; d < devicesCount; ++d)
+    {
+        if (deviceList[d].type != isTouchpad) continue;
+
+        m_foundTouchpad = true;
+        m_touchpad.init(deviceList[d].id, deviceList[d].name);
+
+        int propertiesCount;
+        Atom *propertiesList = XIListProperties(display, deviceList[d].id,
+                                                &propertiesCount);
+        for (int p = 0; p < propertiesCount; ++p)
+        {
+            if (propertiesList[p] == isLibinput)
+            {
+                m_touchpad.driver = Touchpad::Driver::LibInput;
+                break;
+            }
+
+            else if (propertiesList[p] == isSynaptics)
+            {
+                m_touchpad.driver = Touchpad::Driver::Synaptics;
+            }
+        }
+
+        XFree(propertiesList);
+
+        if (m_foundTouchpad) break;
+    }
+
+    XFreeDeviceList(deviceList);
+
+    return m_foundTouchpad;
+}
+
+void TouchpadSettings::load(bool defaults)
+{
+    TDEConfig cfg("kcminputrc");
+    cfg.setGroup("Touchpad");
+    cfg.setReadDefaults(defaults);
+
+    enabled = cfg.readBoolEntry("Enabled", true);
+
+    // Behaviour
+    offWhileTyping = cfg.readBoolEntry("OffWhileTyping", false);
+
+    IF_DRIVER(LibInput)
+    {
+        midButtonEmulation = cfg.readBoolEntry("MidButtonEmulation", false);
+    }
+
+    // Speed
+    IF_DRIVER(LibInput)
+    {
+        accelSpeed = cfg.readNumEntry("AccelSpeed", 0);
+        accelProfile = cfg.readNumEntry("AccelProfile", 0);
+    }
+
+    // Tapping
+    tapClick = cfg.readBoolEntry("TapToClick", true);
+    tapDrag = cfg.readBoolEntry("TapAndDrag", true);
+
+    IF_DRIVER(LibInput)
+    {
+        tapDragLock = cfg.readBoolEntry("TapAndDragLock", false);
+    }
+
+    tapMapping = cfg.readNumEntry("TapMapping", 0);
+
+    // Scrolling options
+    int both = TQt::Horizontal | TQt::Vertical;
+    scrollDirections = cfg.readNumEntry("ScrollDirections", both);
+    naturalScroll = cfg.readBoolEntry("NaturalScroll", false);
+    naturalScrollDirections = cfg.readNumEntry("NaturalScrollDirections", both);
+
+    // Scrolling method
+    scrollMethod = cfg.readNumEntry("ScrollMethod", 0);
+}
+
+void TouchpadSettings::save()
+{
+    TDEConfig cfg("kcminputrc");
+    cfg.setGroup("Touchpad");
+
+    cfg.writeEntry("Enabled", enabled);
+
+    // Behaviour
+    cfg.writeEntry("OffWhileTyping", offWhileTyping);
+
+    IF_DRIVER(LibInput)
+    {
+        cfg.writeEntry("MidButtonEmulation", midButtonEmulation);
+    }
+
+    // Speed
+    cfg.writeEntry("AccelSpeed", accelSpeed);
+    cfg.writeEntry("AccelProfile", accelProfile);
+
+    // Tapping
+    cfg.writeEntry("TapToClick", tapClick);
+    cfg.writeEntry("TapAndDrag", tapDrag);
+
+    IF_DRIVER(LibInput)
+    {
+        cfg.writeEntry("TapAndDragLock", tapDragLock);
+    }
+
+    cfg.writeEntry("TapMapping", tapMapping);
+
+    // Scrolling options
+    cfg.writeEntry("ScrollDirections", scrollDirections);
+    cfg.writeEntry("NaturalScroll", naturalScroll);
+    cfg.writeEntry("NaturalScrollDirections", naturalScrollDirections);
+
+    // Scrolling method
+    cfg.writeEntry("ScrollMethod", scrollMethod);
+
+    cfg.sync();
+}
+
+bool TouchpadSettings::setTouchpadEnabled(bool on)
+{
+    enabled = on;
+
+    XIProperty *prop = nullptr;
+    int fail = 0;
+
+    IF_DRIVER(LibInput)
+    {
+        SET_PROP("Device Enabled", b)
+        {
+            prop->b[0] = enabled;
+            prop->set();
+        }
+    }
+
+    else
+    IF_DRIVER(Synaptics)
+    {
+        SET_PROP("Synaptics Off", b)
+        {
+            prop->b[0] = !enabled;
+            prop->set();
+        }
+    }
+
+    return !fail;
+}
+
+void TouchpadSettings::apply(bool force)
+{
+    kdDebug() << "applying touchpad settings" << endl;
+    if (!foundTouchpad())
+    {
+        kdWarning() << "no supported touchpads! settings not applied" << endl;
+        return;
+    }
+
+    load();
+
+    Display *display = tqt_xdisplay();
+    XIProperty *prop = nullptr;
+    int fail = 0;
+
+    if (!setTouchpadEnabled(enabled))
+        ++fail;
+
+    IF_DRIVER(LibInput)
+    {
+        kdDebug() << "driver: libinput" << endl;
+
+        SET_PROP("libinput Disable While Typing Enabled", b)
+        {
+            prop->b[0] = offWhileTyping;
+            prop->set();
+        }
+
+        SET_PROP("libinput Middle Emulation Enabled", b)
+        {
+            prop->b[0] = midButtonEmulation;
+            prop->set();
+        }
+
+        SET_PROP("libinput Accel Speed", f)
+        {
+            float val = accelSpeed;
+            val /= 100;
+            prop->f[0] = val;
+            prop->set();
+        }
+
+        SET_PROP("libinput Accel Profile Enabled", b)
+        {
+            prop->b[0] = (accelProfile == 0);
+            prop->b[1] = (accelProfile == 1);
+            prop->set();
+        }
+
+        SET_PROP("libinput Tapping Enabled", b)
+        {
+            prop->b[0] = tapClick;
+            prop->set();
+        }
+
+        SET_PROP("libinput Tapping Drag Enabled", b)
+        {
+            prop->b[0] = tapClick && tapDrag;
+            prop->set();
+        }
+
+        SET_PROP("libinput Tapping Drag Lock Enabled", b)
+        {
+            prop->b[0] = tapClick && tapDrag && tapDragLock;
+            prop->set();
+        }
+
+        SET_PROP("libinput Tapping Button Mapping Enabled", b)
+        {
+            prop->b[0] = (tapMapping == 0);
+            prop->b[1] = (tapMapping == 1);
+            prop->set();
+        }
+
+        SET_PROP("libinput Horizontal Scroll Enabled", b)
+        {
+            prop->b[0] = scrollDirections & TQt::Horizontal;
+            prop->set();
+        }
+
+        SET_PROP("libinput Natural Scrolling Enabled", b)
+        {
+            prop->b[0] = naturalScroll;
+            prop->set();
+        }
+
+        SET_PROP("libinput Scroll Method Enabled", b)
+        {
+            prop->b[0] = scrollDirections ? (scrollMethod == 0) : 0; // two-finger
+            prop->b[1] = scrollDirections ? (scrollMethod == 1) : 0; // edge
+            prop->b[2] = scrollDirections ? (scrollMethod == 2) : 0; // button
+            prop->set();
+        }
+    }
+
+    else IF_DRIVER(Synaptics)
+    {
+        kdDebug() << "driver: synaptics" << endl;
+
+        SET_PROP("Synaptics Tap Action", b)
+        {
+            prop->b[0] = 0;
+            prop->b[1] = 0;
+            prop->b[2] = 0;
+            prop->b[3] = 0;
+            prop->b[4] = tapClick ? 1 : 0; // 1 finger
+            prop->b[5] = tapClick ? (tapMapping == 0 ? 3 : 2) : 0; // 2 fingers
+            prop->b[6] = tapClick ? (tapMapping == 0 ? 2 : 3) : 0; // 3 fingers
+            prop->set();
+        }
+
+        SET_PROP("Synaptics Gestures", b)
+        {
+            prop->b[0] = tapDrag;
+            prop->set();
+        }
+
+        SET_PROP("Synaptics Edge Scrolling", b)
+        {
+            prop->b[0] = scrollMethod == 1 ? (scrollDirections & TQt::Vertical ? 1 : 0) : 0;
+            prop->b[1] = scrollMethod == 1 ? (scrollDirections & TQt::Horizontal ? 1 : 0) : 0;
+            prop->b[2] = 0; // corner
+            prop->set();
+        }
+
+        SET_PROP("Synaptics Two-Finger Scrolling", b)
+        {
+            prop->b[0] = scrollMethod == 0 ? (scrollDirections & TQt::Vertical ? 1 : 0) : 0;
+            prop->b[1] = scrollMethod == 0 ? (scrollDirections & TQt::Horizontal ? 1 : 0) : 0;
+            prop->set();
+        }
+
+        SET_PROP("Synaptics Scrolling Distance", i)
+        {
+            prop->i[0] = naturalScroll && naturalScrollDirections & TQt::Vertical ? -80 : 80;
+            prop->i[1] = naturalScroll && naturalScrollDirections & TQt::Horizontal ? -80 : 80;
+            prop->set();
+        }
+
+        // start/stop tdesyndaemon
+        DCOPRef tdesyndaemon("tdesyndaemon", "tdesyndaemon");
+        tdesyndaemon.call("stop()");
+
+        if (offWhileTyping)
+        {
+            tdeApp->tdeinitExec("tdesyndaemon");
+        }
+    }
+
+    if (fail > 0)
+        kdWarning() << "some options could not be applied!" << endl;
+}
+
+TQValueList<bool> TouchpadSettings::getScrollMethodsAvailability()
+{
+    TQValueList<bool> avail;
+
+    IF_DRIVER(LibInput)
+    {
+        PROP(propScrollMethodsAvail, "libinput Scroll Methods Available")
+        for (int i = 0; i < propScrollMethodsAvail.count(); ++i)
+        {
+            avail.append(propScrollMethodsAvail[i].toBool());
+        }
+    }
+
+    IF_DRIVER(Synaptics)
+    {
+        avail.append(1); // two-finger
+        avail.append(1); // edge
+    }
+
+    return avail;
+}
+
+TQValueList<bool> TouchpadSettings::getAccelProfilesAvailability()
+{
+    TQValueList<bool> avail;
+
+    IF_DRIVER(LibInput)
+    {
+        PROP(propAccelProfilesAvail, "libinput Accel Profiles Available")
+        for (int i = 0; i < propAccelProfilesAvail.count(); ++i)
+        {
+            avail.append(propAccelProfilesAvail[i].toBool());
+        }
+    }
+
+    IF_DRIVER(Synaptics) { /* TODO no support yet */ }
+
+    return avail;
+}
+
+Touchpad TouchpadSettings::touchpad()
+{
+    return m_touchpad;
+}
+
+bool TouchpadSettings::foundTouchpad()
+{
+    return m_foundTouchpad;
+}
+
+bool TouchpadSettings::supportedTouchpad()
+{
+    return m_foundTouchpad && m_touchpad.driver != Touchpad::Driver::None;
+}
diff --git a/kcontrol/input/touchpad_settings.h b/kcontrol/input/touchpad_settings.h
new file mode 100644
index 000000000..8cdfea951
--- /dev/null
+++ b/kcontrol/input/touchpad_settings.h
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ tdecm_touchpad
+ A touchpad module for the TDE Control Centre
+
+ Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+#ifndef __TOUCHPAD_SETTINGS_H__
+#define __TOUCHPAD_SETTINGS_H__
+
+// TQt
+#include <tqvaluelist.h>
+
+// Macros
+#define DEL(var) \
+  if (var) { delete var; var = nullptr; }
+
+#define ATOM(var, atom) \
+  Atom var = XInternAtom(display, atom, true);
+
+#define PROP(var, property) \
+  XIProperty var = XIProperty(m_touchpad.id, property);
+
+#define SET_PROP(property, type) \
+  DEL(prop) \
+  prop = new XIProperty(m_touchpad.id, property); \
+  if (prop->type == nullptr) \
+  { \
+     kdWarning() << "Failed to set property " << property << endl; \
+     ++fail; \
+  } \
+  else
+
+#define IF_DRIVER(drv) \
+  if (touchpad().driver == Touchpad::Driver::drv)
+
+
+/****************************** struct Touchpad *******************************/
+#undef None
+
+struct Touchpad
+{
+    enum Driver { None, LibInput, Synaptics };
+
+    bool valid = false;
+    unsigned int id;
+    TQCString name;
+    Driver driver = Touchpad::Driver::None;
+
+    void init(unsigned int _id, TQCString _name)
+    {
+        valid = true;
+        id = _id;
+        name = _name;
+    }
+};
+
+
+/***************************** TouchpadSettings *******************************/
+class TouchpadSettings
+{
+    public:
+        TouchpadSettings();
+
+        void load(bool defaults = false);
+        void save();
+        void apply(bool force = false);
+
+        TQValueList<bool> getScrollMethodsAvailability();
+        TQValueList<bool> getAccelProfilesAvailability();
+
+        bool enabled, tapClick, tapDrag, tapDragLock, tapMapping, offWhileTyping,
+             leftHandedMode, midButtonEmulation, naturalScroll, scrollMethod;
+        int scrollDirections, naturalScrollDirections;
+
+        int accelSpeed, accelProfile;
+
+        bool foundTouchpad();
+        Touchpad touchpad();
+
+        // Enable/disable touchpad without applying all settings
+        bool setTouchpadEnabled(bool on);
+
+        bool supportedTouchpad();
+
+    protected:
+        bool findTouchpad();
+
+    private:
+        Touchpad m_touchpad;
+        bool m_foundTouchpad;
+};
+
+#endif // __TOUCHPAD_SETTINGS_H__
\ No newline at end of file
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index d131aca8c..32e036f8c 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -22,9 +22,9 @@
 
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelistview.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobalsettings.h>
 #include <kdialog.h>
 #include <tdemessagebox.h>
@@ -100,8 +100,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	listview->addColumn( i18n("Name") );
 	listview->addColumn( i18n("Description") );
 
-	connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-			TQT_SLOT(selectionChanged(TQListViewItem*)) );
+	connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+			TQ_SLOT(selectionChanged(TQListViewItem*)) );
 
 	themeDirs = getThemeBaseDirs();
 	insertThemes();
@@ -111,8 +111,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	installButton = new TQPushButton( i18n("Install New Theme..."), hbox );
 	removeButton = new TQPushButton( i18n("Remove Theme"), hbox );
 
-	connect( installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( installClicked() ) );
-	connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeClicked() ) );
+	connect( installButton, TQ_SIGNAL( clicked() ), TQ_SLOT( installClicked() ) );
+	connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeClicked() ) );
 
 	// Disable the install button if ~/.icons isn't writable
 	TQString path = TQDir::homeDirPath() + "/.icons";
@@ -343,7 +343,7 @@ void ThemePage::insertTheme( const TQString &path )
 	TQString desc   = defaultThemeDescription( name );
 	TQString sample = "left_ptr";
 
-	KSimpleConfig c( path + "/index.theme", true ); // Open read-only
+	TDESimpleConfig c( path + "/index.theme", true ); // Open read-only
 	c.setGroup( "Icon Theme" );
 
 	// Don't insert the theme if it's hidden.
@@ -429,7 +429,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
 			// Parse the index.theme file if one exists
 			if ( haveIndexFile )
 			{
-				KSimpleConfig c( indexfile, true ); // Open read-only
+				TDESimpleConfig c( indexfile, true ); // Open read-only
 				c.setGroup( "Icon Theme" );
 				inherit = c.readListEntry( "Inherits" );
 			}
@@ -493,7 +493,7 @@ void ThemePage::insertThemes()
 			// Parse the index.theme file if the theme has one.
 			if ( haveIndexFile )
 			{
-				KSimpleConfig c( indexfile, true );
+				TDESimpleConfig c( indexfile, true );
 				c.setGroup( "Icon Theme" );
 
 				// Skip this theme if it's hidden.
diff --git a/kcontrol/input/xiproperty.h b/kcontrol/input/xiproperty.h
new file mode 100644
index 000000000..ddbdf4b16
--- /dev/null
+++ b/kcontrol/input/xiproperty.h
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ XIGetProperty/XIChangeProperty wrapper
+
+ Copyright © 2013 Alexandr Mezin <mezin.alexander@gmail.com>
+ Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
+
+ 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 2 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, see <https://www.gnu.org/licenses/>.
+
+*******************************************************************************/
+
+#ifndef __XI_PROPERTY_H__
+#define __XI_PROPERTY_H__
+
+// TQt
+#include <tqobject.h> // tqt_xdisplay()
+#include <tqvariant.h>
+
+// X11
+#include <X11/Xatom.h>
+
+
+class XIProperty
+{
+    public:
+        XIProperty()
+        : device(-1),
+          type(0),
+          format(0),
+          num_items(0),
+          data(0),
+          b(nullptr),
+          i(nullptr),
+          f(nullptr)
+        {}
+
+        XIProperty(int device, TQCString propertyName)
+        : device(device),
+          type(0),
+          format(0),
+          num_items(0),
+          data(0),
+          b(nullptr),
+          i(nullptr),
+          f(nullptr)
+        {
+            Display *disp = tqt_xdisplay();
+
+            property = XInternAtom(disp, propertyName, true);
+
+            unsigned char *ptr = nullptr;
+            unsigned long bytes_after;
+
+            XIGetProperty(disp, device, property, 0, 1000, False, AnyPropertyType,
+                        &type, &format, &num_items, &bytes_after, &ptr);
+
+            data = ptr;
+
+            if (format == CHAR_BIT && type == XA_INTEGER)
+            {
+                b = reinterpret_cast<char *>(data);
+            }
+
+            if (format == sizeof(int) * CHAR_BIT
+            && (type == XA_INTEGER || type == XA_CARDINAL))
+            {
+                i = reinterpret_cast<int *>(data);
+            }
+
+            Atom floatType = XInternAtom(disp, "FLOAT", true);
+
+            if (format == sizeof(float) * CHAR_BIT && floatType && type == floatType)
+            {
+                f = reinterpret_cast<float *>(data);
+            }
+        }
+
+        ~XIProperty()
+        {
+            XFree(data);
+        }
+
+        TQVariant operator[](int offset)
+        {
+            if (offset >= num_items) return TQVariant();
+
+            if (b) return TQVariant(static_cast<int>(b[offset]));
+            if (i) return TQVariant(i[offset]);
+            if (f) return TQVariant(f[offset]);
+
+            return TQVariant();
+        }
+
+        void set()
+        {
+            XIChangeProperty(tqt_xdisplay(), device, property, type, format, XIPropModeReplace,
+                            data, num_items);
+        }
+
+        int count() { return num_items; }
+
+    public:
+        char *b;
+        int *i;
+        float *f;
+
+    private:
+        Atom property, type;
+        int device, format;
+        unsigned long num_items;
+        unsigned char *data;
+};
+
+#endif // __XI_PROPERTY_H__
\ No newline at end of file
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index d0521d81e..1db8f974b 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY(kcm_joystick, JoystickFactory("joystick"))
 
 extern "C"
 {
-  KDE_EXPORT bool test_joystick()
+  TDE_EXPORT bool test_kcm_joystick()
   { /* Code stolen from JoyWidget::init() */
     int i;
     char dev[30];
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index 5d104006b..c88f6d217 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -65,7 +65,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
   new TQLabel(i18n("Device:"), devHbox);
   device = new TQComboBox(true, devHbox);
   device->setInsertionPolicy(TQComboBox::NoInsertion);
-  connect(device, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(deviceChanged(const TQString &)));
+  connect(device, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(deviceChanged(const TQString &)));
   devHbox->setStretchFactor(device, 3);
 
   TQHBox *hbox = new TQHBox(mainVbox);
@@ -77,7 +77,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
   new TQLabel(i18n("Position:"), vboxLeft);
   xyPos = new PosWidget(vboxLeft);
   trace = new TQCheckBox(i18n("Show trace"), mainVbox);
-  connect(trace, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(traceChanged(bool)));
+  connect(trace, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(traceChanged(bool)));
 
   TQVBox *vboxMid = new TQVBox(hbox);
   vboxMid->setSpacing(KDialog::spacingHint());
@@ -111,12 +111,12 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
 
   // calibrate button
   calibrate = new TQPushButton(i18n("Calibrate"), mainVbox);
-  connect(calibrate, TQT_SIGNAL(clicked()), this, TQT_SLOT(calibrateDevice()));
+  connect(calibrate, TQ_SIGNAL(clicked()), this, TQ_SLOT(calibrateDevice()));
   calibrate->setEnabled(false);
 
   // set up a timer for idle processing of joystick events
   idle = new TQTimer(this);
-  connect(idle, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkDevice()));
+  connect(idle, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkDevice()));
 
   // check which devicefiles we have
   init();
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index c1ba4fecf..cd3859124 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqfile.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <kpixmap.h>
@@ -84,8 +84,8 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca
     _viewer = new TDEHTMLPart( this, "_viewer" );
     _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
     connect( _viewer->browserExtension(),
-             TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
-             this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
+             TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+             this, TQ_SLOT(slotModuleLinkClicked(const KURL&)) );
     updatePixmap();
 }
 
@@ -112,7 +112,7 @@ void AboutWidget::updatePixmap()
     TQString res = t.read();
 
     res = res.arg(  locate(  "data", "tdeui/about/kde_infopage.css" ) );
-    if (  kapp->reverseLayout() )
+    if (  tdeApp->reverseLayout() )
         res = res.arg(  "@import \"%1\";" ).arg(  locate(  "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
         res = res.arg(  "" );
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index be3ede802..f59b95624 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -95,7 +95,7 @@ void ModuleTitle::clear()
 {
   m_icon->setPixmap( TQPixmap() );
   m_name->setText( TQString::null );
-  kapp->processEvents();
+  tdeApp->processEvents();
 }
 
 ModuleWidget::ModuleWidget( TQWidget *parent, const char *name )
@@ -105,7 +105,7 @@ ModuleWidget::ModuleWidget( TQWidget *parent, const char *name )
   m_title = new ModuleTitle( titleLine, "m_title" );
   TQPushButton *helpButton = new TQPushButton( titleLine );
   helpButton->setIconSet( SmallIconSet("help") );
-  connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) );
+  connect (helpButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpRequest() ) );
   m_body = new TQVBox( this, "m_body" );
   setStretchFactor( m_body, 10 );
 }
@@ -137,7 +137,7 @@ DockContainer::DockContainer(TQWidget *parent)
   addWidget( _busyw );
 
   _modulew = new ModuleWidget( this, "_modulew" );
-  connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) );
+  connect (_modulew, TQ_SIGNAL( helpRequest() ), TQ_SLOT( slotHelpRequest() ) );
   addWidget( _modulew );
 }
 
@@ -170,10 +170,10 @@ ProxyWidget* DockContainer::loadModule( ConfigModule *module )
   if (widget)
   {
     _module = module;
-    connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule()));
-    connect(_module, TQT_SIGNAL(changed(ConfigModule *)),
-            TQT_SIGNAL(changedModule(ConfigModule *)));
-    connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged()));
+    connect(_module, TQ_SIGNAL(childClosed()), TQ_SLOT(removeModule()));
+    connect(_module, TQ_SIGNAL(changed(ConfigModule *)),
+            TQ_SIGNAL(changedModule(ConfigModule *)));
+    connect(widget, TQ_SIGNAL(quickHelpChanged()), TQ_SLOT(quickHelpChanged()));
 
     raiseWidget( _modulew );
     emit newModule(widget->caption(), module->docPath(), widget->quickHelp());
@@ -214,7 +214,7 @@ i18n("There are unsaved changes in the active module.\n"
     }
 
   raiseWidget( _busyw );
-  kapp->processEvents();
+  tdeApp->processEvents();
 
   deleteModule();
   if (!module) return true;
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index b17581846..c78de0071 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -43,6 +43,7 @@ TQString KCGlobal::_iversion = "";
 TQString KCGlobal::_imachine = "";
 IndexViewMode KCGlobal::_viewmode = Icon;
 TDEIcon::StdSizes KCGlobal::_iconsize = TDEIcon::SizeMedium;
+bool KCGlobal::_showhidden = false;
 TQString KCGlobal::_baseGroup = "";
 
 void KCGlobal::init()
diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h
index 0fbc1d9b7..a0b44c0b7 100644
--- a/kcontrol/kcontrol/global.h
+++ b/kcontrol/kcontrol/global.h
@@ -46,6 +46,7 @@ public:
   static TQString systemMachine() { return _imachine; }
   static IndexViewMode viewMode() { return _viewmode; }
   static TDEIcon::StdSizes iconSize() { return _iconsize; }
+  static bool showHiddenModules() { return _showhidden; }
   static TQString baseGroup();
 
   static void setIsInfoCenter(bool b) { _infocenter = b; }
@@ -60,6 +61,7 @@ public:
   static void setSystemMachine(const TQString& n){ _imachine = n; }
   static void setViewMode(IndexViewMode m) { _viewmode = m; }
   static void setIconSize(TDEIcon::StdSizes s) { _iconsize = s; }
+  static void setShowHiddenModules(bool o) { _showhidden = o; }
 
   static void repairAccels( TQWidget * tw );
 
@@ -71,6 +73,7 @@ private:
   static IndexViewMode _viewmode;
   static TDEIcon::StdSizes _iconsize;
   static TQString _baseGroup;
+  static bool _showhidden;
 };
 
 #endif
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index f21c03c71..af20e8870 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -21,7 +21,7 @@
 
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeapplication.h>
 #include <krun.h>
 
@@ -80,7 +80,7 @@ bool HelpWidget::clicked(const TQString & _url)
     }
 
     if ( textUrl.find('@') > -1 ) {
-        kapp->invokeMailer(textUrl);
+        tdeApp->invokeMailer(textUrl);
         return true;
     }
 
diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp
index cf57dc0e4..ed8e8ca03 100644
--- a/kcontrol/kcontrol/indexwidget.cpp
+++ b/kcontrol/kcontrol/indexwidget.cpp
@@ -42,6 +42,8 @@ void IndexWidget::reload()
 {
   if (_icon)
     _icon->fill();
+  if (_tree)
+    _tree->fill();
 }
 
 TQListViewItem *IndexWidget::firstTreeViewItem()
@@ -69,19 +71,19 @@ void IndexWidget::moduleSelected(ConfigModule *m)
 	{
 	  _tree->makeVisible(m);
 
-	  _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+	  _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
 	  _tree->makeSelected(m);
-	  connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-			  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+			  this, TQ_SLOT(moduleSelected(ConfigModule*)));
 	}
   else if (obj->inherits("ModuleTreeView") && _icon)
 	{
 	  _icon->makeVisible(m);
 
-	  _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+	  _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
 	  _icon->makeSelected(m);
-	  connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-			 this, TQT_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+			 this, TQ_SLOT(moduleSelected(ConfigModule*)));
 	}
 }
 
@@ -89,17 +91,17 @@ void IndexWidget::makeSelected(ConfigModule *module)
 {
   if (_icon)
   {
-   _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+   _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
    _icon->makeSelected(module);
-   connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+   connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
   }
   if (_tree)
   {
-    _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*)));
+    _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*)));
     _tree->makeSelected(module);
-    connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+    connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
   }
 }
 
@@ -121,8 +123,8 @@ void IndexWidget::activateView(IndexViewMode mode)
     {
       _icon=new ModuleIconView(_modules, this);
       _icon->fill();
-	  connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
     }
     raiseWidget( _icon );
   }
@@ -132,10 +134,10 @@ void IndexWidget::activateView(IndexViewMode mode)
     {
       _tree=new ModuleTreeView(_modules, this);
       _tree->fill();
-      connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)),
-		  this, TQT_SLOT(moduleSelected(ConfigModule*)));
-	  connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)),
-		  this, TQT_SIGNAL(categorySelected(TQListViewItem*)));
+      connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)),
+		  this, TQ_SLOT(moduleSelected(ConfigModule*)));
+	  connect(_tree, TQ_SIGNAL(categorySelected(TQListViewItem*)),
+		  this, TQ_SIGNAL(categorySelected(TQListViewItem*)));
     }
     raiseWidget( _tree );
   }
diff --git a/kcontrol/kcontrol/kcontrolui.rc b/kcontrol/kcontrol/kcontrolui.rc
index 92867beb3..c9e4c48aa 100644
--- a/kcontrol/kcontrol/kcontrolui.rc
+++ b/kcontrol/kcontrol/kcontrolui.rc
@@ -12,6 +12,8 @@
             <Action name="activate_largeicons"/>
             <Action name="activate_hugeicons"/>
         </Menu>
+        <Separator/>
+        <Action name="show_hidden_modules"/>
     </Menu>
     <Menu name="help">
         <Action name="help_about_module" append="about_merge"/>
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 25ab4fc4a..ec824396b 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -50,7 +50,7 @@
 #include "version.h"
 
 KControlApp::KControlApp()
-  : KUniqueApplication()
+  : TDEUniqueApplication()
   , toplevel(0)
 {
   toplevel = new TopLevel();
@@ -58,11 +58,11 @@ KControlApp::KControlApp()
   setMainWidget(toplevel);
   TDEGlobal::setActiveInstance(this);
 
-  // KUniqueApplication does dcop regitration for us
-  ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface");
+  // TDEUniqueApplication does dcop regitration for us
+  ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface");
 
-  connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest()));
-  connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
+  connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest()));
+  connect (modIface, TQ_SIGNAL(handbookClicked()), toplevel, TQ_SLOT(slotHandbookRequest()));
 
   TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel);
   TDEConfig *config = TDEGlobal::config();
@@ -90,7 +90,7 @@ KControlApp::~KControlApp()
     {
       TDEConfig *config = TDEGlobal::config();
       config->setGroup("General");
-      TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
+      TQWidget *desk = TQApplication::desktop();
       config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
       config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
       config->sync();
@@ -98,12 +98,12 @@ KControlApp::~KControlApp()
   delete toplevel;
 }
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
   TDELocale::setMainCatalogue("kcontrol");
   TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
     KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL,
-    I18N_NOOP("(c) 1998-2004, The Trinity Control Center Developers"));
+    I18N_NOOP("(c) 1998-2024, The Trinity Control Center Developers"));
 
   TQCString argv_0 = argv[0];
   TDEAboutData *aboutData;
@@ -121,7 +121,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
   aboutData->addAuthor("Waldo Bastian",0, "bastian@kde.org");
 
   TDECmdLineArgs::init( argc, argv, aboutData );
-  KUniqueApplication::addCmdLineOptions();
+  TDEUniqueApplication::addCmdLineOptions();
 
   KCGlobal::init();
 
diff --git a/kcontrol/kcontrol/main.h b/kcontrol/kcontrol/main.h
index aaeabbe15..e39a7f7cc 100644
--- a/kcontrol/kcontrol/main.h
+++ b/kcontrol/kcontrol/main.h
@@ -21,11 +21,11 @@
 #ifndef __main_h__
 #define __main_h__
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 class TopLevel;
 
-class KControlApp : public KUniqueApplication
+class KControlApp : public TDEUniqueApplication
 {
   TQ_OBJECT 
 
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index dbaba9054..5cc43c82d 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -26,7 +26,7 @@
 ModuleIface::ModuleIface(TQObject *parent, const char *name) 
 	: TQObject(parent, name), DCOPObject(name) {
 
-	_parent = TQT_TQWIDGET(parent);
+	_parent = static_cast<TQWidget*>(parent);
 
 }
 
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index 45be8a1ac..13b1aa366 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -22,9 +22,10 @@
 #include <tqcursor.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservicegroup.h>
 #include <kiconloader.h>
+#include <tdecmoduleloader.h>
 
 #include <kdebug.h>
 
@@ -51,8 +52,8 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const
   // This is intentionally _not_ connected with executed(), since
   // honoring doubleclick doesn't make any sense here (changed by
   // large user demand)
-  connect(this, TQT_SIGNAL(clicked(TQListViewItem*)),
-          this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(clicked(TQListViewItem*)),
+          this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
 }
 
 void ModuleIconView::makeSelected(ConfigModule *m)
@@ -168,3 +169,14 @@ TQPixmap ModuleIconView::loadIcon( const TQString &name )
 
   return icon;
 }
+
+ModuleIconItem::ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m)
+  : TDEListViewItem(parent, text)
+  , _tag(TQString::null)
+  , _module(m)
+{
+  setPixmap(0, pm);
+
+  if (!_module) return;
+  setVisible(KCGlobal::showHiddenModules() || !_module->needsTest() || TDECModuleLoader::testModule(*_module));
+}
\ No newline at end of file
diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h
index daaeaa7ea..ff76ebce2 100644
--- a/kcontrol/kcontrol/moduleiconview.h
+++ b/kcontrol/kcontrol/moduleiconview.h
@@ -29,13 +29,7 @@ class ModuleIconItem : public TDEListViewItem
 {
 
 public:
-  ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0)
-	: TDEListViewItem(parent, text)
-	, _tag(TQString::null)
-	, _module(m)
-	{
-	  setPixmap(0, pm);
-	}
+  ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0);
 
   void setConfigModule(ConfigModule* m) { _module = m; }
   void setTag(const TQString& t) { _tag = t; }
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index f203e6b57..1c1a874ce 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -29,7 +29,7 @@ that is intentional :-]
 
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
@@ -49,7 +49,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n
 
   fill(this, KCGlobal::baseGroup());
 
-  connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
+  connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int)));
 }
 
 void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
@@ -65,7 +65,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
      
      // create new menu
      TDEPopupMenu *menu = new TDEPopupMenu(parentMenu);
-     connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
+     connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int)));
 
      // Item names may contain ampersands. To avoid them being converted to 
      // accelators, replace them with two ampersands.
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index e40d62568..c6d9f73ee 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -27,10 +27,10 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kservicegroup.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <qxembed.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 #include "modules.h"
@@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module()
     {
 
       _module = new ProxyWidget(modWidget, moduleName(), "", run_as_root);
-      connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
-      connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed()));
-      connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest()));
-      connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest()));
-      connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot()));
+      connect(_module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool)));
+      connect(_module, TQ_SIGNAL(closed()), this, TQ_SLOT(clientClosed()));
+      connect(_module, TQ_SIGNAL(handbookRequest()), this, TQ_SIGNAL(handbookRequest()));
+      connect(_module, TQ_SIGNAL(helpRequest()), this, TQ_SIGNAL(helpRequest()));
+      connect(_module, TQ_SIGNAL(runAsRoot()), this, TQ_SLOT(runAsRoot()));
 
       return _module;
     }
@@ -101,7 +101,7 @@ void ConfigModule::deleteClient()
   _embedStack = 0;
   delete _embedFrame;
   _embedFrame = 0;
-  kapp->syncX();
+  tdeApp->syncX();
 
   if(_module)
     _module->close(true);
@@ -157,7 +157,7 @@ void ConfigModule::runAsRoot()
   _busy->setGeometry(0,0, _module->width(), _module->height());
   _busy->show();
   _embedStack->raiseWidget(_busy);
-  connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded()));
+  connect(_embedWidget, TQ_SIGNAL( windowEmbedded(WId)), TQ_SLOT( embedded()));
 
   // prepare the process to run the tdecmshell
   TQString cmd = service()->exec().stripWhiteSpace();
@@ -198,7 +198,7 @@ void ConfigModule::runAsRoot()
          *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() );
       }
 
-      connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*)));
+      connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(rootExited(TDEProcess*)));
 
       if ( !_rootProcess->start(TDEProcess::NotifyOnExit) )
       {
@@ -282,9 +282,9 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path)
      if (p->isType(KST_KService))
      {
         KService *s = static_cast<KService*>(p);
-        if (!kapp->authorizeControlModule(s->menuId()))
+        if (!tdeApp->authorizeControlModule(s->menuId()))
            continue;
-           
+
         ConfigModule *module = new ConfigModule(s);
         if (module->library().isEmpty())
         {
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index 4b25e4be3..15f5cb9eb 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -26,6 +26,7 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
+#include <tdecmoduleloader.h>
 #include <kdebug.h>
 #include <tqwhatsthis.h>
 #include <tqbitmap.h>
@@ -85,12 +86,20 @@ ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const
 
   new ModuleTreeWhatsThis( this );
 
-  connect(this, TQT_SIGNAL(clicked(TQListViewItem*)),
-                  this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(clicked(TQListViewItem*)),
+                  this, TQ_SLOT(slotItemSelected(TQListViewItem*)));
 }
 
 void ModuleTreeView::fill()
 {
+  // If we have a currently selected module, preserve selection
+  ConfigModule *currentModule = nullptr;
+  if (currentItem())
+  {
+    currentModule = static_cast<ModuleTreeItem*>(currentItem())->module();
+  }
+
+  // (Re)fill the tree view
   clear();
 
   TQStringList subMenus = _modules->submenus(KCGlobal::baseGroup());
@@ -107,7 +116,14 @@ void ModuleTreeView::fill()
   TQPtrList<ConfigModule> moduleList = _modules->modules(KCGlobal::baseGroup());
   for (module=moduleList.first(); module != 0; module=moduleList.next())
   {
-     new ModuleTreeItem(this, module);
+    new ModuleTreeItem(this, module);
+  }
+
+  // Restore selection
+  if (currentModule)
+  {
+    makeSelected(currentModule);
+    makeVisible(currentModule);
   }
 }
 
@@ -131,8 +147,6 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath)
   }
 }
 
-
-
 TQSize ModuleTreeView::sizeHint() const
 {
     return TQListView::sizeHint().boundedTo( 
@@ -272,12 +286,7 @@ ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, ConfigModule *module)
   , _tag(TQString::null)
   , _maxChildIconWidth(0)
 {
-  if (_module)
-        {
-          setText(0, " " + module->moduleName());
-          _icon = module->icon();
-          setPixmap(0, appIcon(_icon));
-        }
+  init();
 }
 
 ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module)
@@ -286,12 +295,7 @@ ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module)
   , _tag(TQString::null)
   , _maxChildIconWidth(0)
 {
-  if (_module)
-        {
-          setText(0, " " + module->moduleName());
-          _icon = module->icon();
-          setPixmap(0, appIcon(_icon));
-        }
+  init();
 }
 
 ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, const TQString& text)
@@ -308,6 +312,18 @@ ModuleTreeItem::ModuleTreeItem(TQListView *parent, const TQString& text)
   , _maxChildIconWidth(0)
   {}
 
+void ModuleTreeItem::init()
+{
+  if (!_module) return;
+
+  setText(0, " " + _module->moduleName());
+  _icon = _module->icon();
+  setPixmap(0, appIcon(_icon));
+
+
+  setVisible(KCGlobal::showHiddenModules() || !_module->needsTest() || TDECModuleLoader::testModule(*_module));
+}
+
 void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm)
 {
   if (!pm.isNull())
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index ad21d8715..bf0a12f72 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -57,6 +57,9 @@ protected:
   void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align );
 
 private:
+  void init();
+
+private:
   ConfigModule *_module;
   TQString       _tag;
   TQString       _caption;
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index da8d0173d..159f93a01 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -169,7 +169,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 	 TQCString replyType;
 	 TQByteArray replyData;
 	 
-	 if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(),
+	 if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(),
 				 replyType, replyData))
 		 if ( replyType == "TQPalette") {
 			 TQDataStream reply( replyData, IO_ReadOnly );
@@ -178,7 +178,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 			 setPalette(pal);
 		 }
 /* // Doesn't work ...
-	 if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(),
+	 if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(),
 				 replyType, replyData))
 		 if ( replyType == "TQString") {
 			 TQDataStream reply( replyData, IO_ReadOnly );
@@ -187,7 +187,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 			 setStyle(style);
 		 }
 */	 
-	 if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(),
+	 if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(),
 				 replyType, replyData))
 		 if ( replyType == "TQFont") {
 			 TQDataStream reply( replyData, IO_ReadOnly );
@@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
   view = new ProxyView(client, title, this, run_as_root, "proxyview");
   (void) new WhatsThis( this );
 
-  connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool)));
-  connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged()));
+  connect(_client, TQ_SIGNAL(changed(bool)), TQ_SLOT(clientChanged(bool)));
+  connect(_client, TQ_SIGNAL(quickHelpChanged()), TQ_SIGNAL(quickHelpChanged()));
 
   _sep = new KSeparator(KSeparator::HLine, this);
 
@@ -225,11 +225,11 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
   _apply->setEnabled( false );
   _reset->setEnabled( false );
 
-  connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked()));
-  connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked()));
-  connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked()));
-  connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked()));
-  connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked()));
+  connect(_handbook, TQ_SIGNAL(clicked()), TQ_SLOT(handbookClicked()));
+  connect(_default, TQ_SIGNAL(clicked()), TQ_SLOT(defaultClicked()));
+  connect(_apply, TQ_SIGNAL(clicked()), TQ_SLOT(applyClicked()));
+  connect(_reset, TQ_SIGNAL(clicked()), TQ_SLOT(resetClicked()));
+  connect(_root, TQ_SIGNAL(clicked()), TQ_SLOT(rootClicked()));
 
   TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), 
       KDialog::spacingHint());
@@ -273,7 +273,7 @@ void ProxyWidget::handbookClicked()
   if (getuid()!=0)
 	  emit handbookRequest();
   else
-     kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray());
+     tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray());
 }
 
 void ProxyWidget::helpClicked()
@@ -281,7 +281,7 @@ void ProxyWidget::helpClicked()
   if (getuid()!=0)
          emit helpRequest();
   else
-     kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray());
+     tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray());
 }
 
 void ProxyWidget::defaultClicked()
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index 0dc0045d5..663a8744c 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -87,13 +87,13 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name)
   l->addWidget(_resultList);
 
 
-  connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)),
-          this, TQT_SLOT(slotKeywordSelected(const TQString&)));
+  connect(_keyList, TQ_SIGNAL(highlighted(const TQString&)),
+          this, TQ_SLOT(slotKeywordSelected(const TQString&)));
 
-  connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)),
-          this, TQT_SLOT(slotModuleSelected(TQListBoxItem *)));
-  connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)),
-          this, TQT_SLOT(slotModuleClicked(TQListBoxItem *)));
+  connect(_resultList, TQ_SIGNAL(selected(TQListBoxItem*)),
+          this, TQ_SLOT(slotModuleSelected(TQListBoxItem *)));
+  connect(_resultList, TQ_SIGNAL(clicked(TQListBoxItem *)),
+          this, TQ_SLOT(slotModuleClicked(TQListBoxItem *)));
 }
 
 void SearchWidget::populateKeywordList(ConfigModuleList *list)
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index c9a8a6763..12c9a37b8 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -19,12 +19,12 @@
 */
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kbugreport.h>
 #include <tdeaboutapplication.h>
 #include <tdemessagebox.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeaction.h>
 #include <twin.h>
 #include <kiconloader.h>
@@ -81,8 +81,8 @@ TopLevel::TopLevel(const char* name)
   _modules->readDesktopEntries();
 
   for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) {
-      connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) );
-      connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) );
+      connect( m, TQ_SIGNAL( handbookRequest() ), this, TQ_SLOT( slotHandbookRequest() ) );
+      connect( m, TQ_SIGNAL( helpRequest() ), this, TQ_SLOT( slotHelpRequest() ) );
   }
 
   // create the layout box
@@ -109,11 +109,11 @@ TopLevel::TopLevel(const char* name)
   
   KLineEdit *searchEdit = new KLineEdit( mSearchFrame );
   clearButton->setFixedHeight( searchEdit->height() );
-  connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) );
+  connect( clearButton, TQ_SIGNAL( clicked() ), searchEdit, TQ_SLOT( clear() ) );
   label->setBuddy( searchEdit );
   searchLayout->addWidget( searchEdit );
-  connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SLOT( slotSearchChanged(const TQString &) ) );
+  connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SLOT( slotSearchChanged(const TQString &) ) );
 
   // create the left hand side under search
   _stack = new TQWidgetStack( leftFrame );
@@ -121,18 +121,18 @@ TopLevel::TopLevel(const char* name)
 
   // index tab
   _index = new IndexWidget(_modules, this);
-  connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)),
-                  this, TQT_SLOT(activateModule(ConfigModule*)));
+  connect(_index, TQ_SIGNAL(moduleActivated(ConfigModule*)),
+                  this, TQ_SLOT(activateModule(ConfigModule*)));
   _stack->addWidget( _index );
 
-  connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)),
-                  this, TQT_SLOT(categorySelected(TQListViewItem*)));
+  connect(_index, TQ_SIGNAL(categorySelected(TQListViewItem*)),
+                  this, TQ_SLOT(categorySelected(TQListViewItem*)));
 
   // search tab
   _search = new SearchWidget(this);
   _search->populateKeywordList(_modules);
-  connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)),
-                  this, TQT_SLOT(activateModule(ConfigModule *)));
+  connect(_search, TQ_SIGNAL(moduleSelected(ConfigModule *)),
+                  this, TQ_SLOT(activateModule(ConfigModule *)));
 
   _stack->addWidget( _search );
 
@@ -153,10 +153,10 @@ TopLevel::TopLevel(const char* name)
   // That one does the trick ...
   _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize );
 
-  connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)),
-                  this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&)));
-  connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)),
-          TQT_SLOT(changedModule(ConfigModule*)));
+  connect(_dock, TQ_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)),
+                  this, TQ_SLOT(newModule(const TQString&, const TQString&, const TQString&)));
+  connect(_dock, TQ_SIGNAL(changedModule(ConfigModule*)),
+          TQ_SLOT(changedModule(ConfigModule*)));
 
   // set the main view
   setCentralWidget( _splitter );
@@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name)
   if (KCGlobal::isInfoCenter())
   {
       AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem());
-      connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
-               TQT_SLOT( activateModule( ConfigModule * ) ) );
+      connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ),
+               TQ_SLOT( activateModule( ConfigModule * ) ) );
       _dock->setBaseWidget( aw );
       KWin::setIcons(  winId(),
 		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  TDEIcon::NoGroup,  32 ),
@@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name)
   else
   {
       AboutWidget *aw = new AboutWidget(this);
-      connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
-                   TQT_SLOT( activateModule( ConfigModule * ) ) );
+      connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ),
+                   TQ_SLOT( activateModule( ConfigModule * ) ) );
       _dock->setBaseWidget(aw);
   }
 }
@@ -234,40 +234,44 @@ bool TopLevel::queryClose()
 
 void TopLevel::setupActions()
 {
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+  KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
 actionCollection());
   icon_view = new TDERadioAction
-    (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()),
+    (i18n("&Icon View"), 0, this, TQ_SLOT(activateIconView()),
      actionCollection(), "activate_iconview");
   icon_view->setExclusiveGroup( "viewmode" );
 
   tree_view = new TDERadioAction
-    (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()),
+    (i18n("&Tree View"), 0, this, TQ_SLOT(activateTreeView()),
      actionCollection(), "activate_treeview");
   tree_view->setExclusiveGroup( "viewmode" );
 
   icon_small = new TDERadioAction
-    (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()),
+    (i18n("&Small"), 0, this, TQ_SLOT(activateSmallIcons()),
      actionCollection(), "activate_smallicons");
   icon_small->setExclusiveGroup( "iconsize" );
 
   icon_medium = new TDERadioAction
-    (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()),
+    (i18n("&Medium"), 0, this, TQ_SLOT(activateMediumIcons()),
      actionCollection(), "activate_mediumicons");
   icon_medium->setExclusiveGroup( "iconsize" );
 
   icon_large = new TDERadioAction
-    (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()),
+    (i18n("&Large"), 0, this, TQ_SLOT(activateLargeIcons()),
      actionCollection(), "activate_largeicons");
   icon_large->setExclusiveGroup( "iconsize" );
 
   icon_huge = new TDERadioAction
-    (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()),
+    (i18n("&Huge"), 0, this, TQ_SLOT(activateHugeIcons()),
      actionCollection(), "activate_hugeicons");
   icon_huge->setExclusiveGroup( "iconsize" );
 
-  about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
+  show_hidden_modules = new TDEToggleAction
+    (i18n("Show hidden modules"), 0, this, TQ_SLOT(toggleHiddenModules()),
+     actionCollection(), "show_hidden_modules");
+
+  about_module = new TDEAction(i18n("About Current Module"), 0, this, TQ_SLOT(aboutModule()), actionCollection(), "help_about_module");
   about_module->setEnabled(false);
 
   createGUI("kcontrolui.rc");
@@ -275,7 +279,7 @@ actionCollection());
   report_bug = actionCollection()->action("help_report_bug");
   report_bug->setText(i18n("&Report Bug..."));
   report_bug->disconnect();
-  connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug()));
+  connect(report_bug, TQ_SIGNAL(activated()), TQ_SLOT(reportBug()));
 }
 
 void TopLevel::activateIconView()
@@ -340,6 +344,12 @@ void TopLevel::activateHugeIcons()
   _index->reload();
 }
 
+void TopLevel::toggleHiddenModules()
+{
+  KCGlobal::setShowHiddenModules(show_hidden_modules->isChecked());
+  _index->reload();
+}
+
 void TopLevel::newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp)
 {
     setCaption(name, false);
@@ -399,8 +409,8 @@ void TopLevel::categorySelected(TQListViewItem *category)
   else
   {
     AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption );
-    connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ),
-             TQT_SLOT( activateModule( ConfigModule * ) ) );
+    connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ),
+             TQ_SLOT( activateModule( ConfigModule * ) ) );
     _dock->setBaseWidget( aw );
   }
 }
@@ -495,7 +505,7 @@ void TopLevel::reportBug()
     }
     KBugReport *br = new KBugReport(this, false, dummyAbout);
     if (deleteit)
-        connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout()));
+        connect(br, TQ_SIGNAL(finished()), TQ_SLOT(deleteDummyAbout()));
     else
         dummyAbout = 0;
     br->show();
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 8d2a84145..0abf4e0e5 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -64,6 +64,7 @@ protected slots:
   void activateMediumIcons();
   void activateLargeIcons();
   void activateHugeIcons();
+  void toggleHiddenModules();
 
   void deleteDummyAbout();
 
@@ -86,6 +87,7 @@ private:
 
   TDEToggleAction *tree_view, *icon_view;
   TDEToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge;
+  TDEToggleAction *show_hidden_modules;
   TDEAction *report_bug, *about_module;
 
   IndexWidget  *_index;
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index a560183eb..a6bec1ca8 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -31,13 +31,13 @@
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <tdelistview.h>
 #include <tdemessagebox.h>
 #include <kservice.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kcmkded.h"
 #include "kcmkded.moc"
@@ -103,9 +103,9 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	_pbStart->setEnabled( false );
 	_pbStop->setEnabled( false );
 
-	connect(_pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartService()));
-	connect(_pbStop,  TQT_SIGNAL(clicked()), TQT_SLOT(slotStopService()));
-	connect(_lvStartup, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEvalItem(TQListViewItem*)) );
+	connect(_pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartService()));
+	connect(_pbStop,  TQ_SIGNAL(clicked()), TQ_SLOT(slotStopService()));
+	connect(_lvStartup, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotEvalItem(TQListViewItem*)) );
 
 	load();
 }
@@ -156,12 +156,12 @@ void KDEDConfig::load( bool useDefaults ) {
 	CheckListItem* clitem;
 	for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
 
-		if ( KDesktopFile::isDesktopFile( *it ) ) {
-			KDesktopFile file( *it, true, "services" );
+		if ( TDEDesktopFile::isDesktopFile( *it ) ) {
+			TDEDesktopFile file( *it, true, "services" );
 
 			if ( file.readBoolEntry("X-TDE-Kded-autoload") ) {
 				clitem = new CheckListItem(_lvStartup, TQString::null);
-				connect(clitem, TQT_SIGNAL(changed(TQCheckListItem*)), TQT_SLOT(slotItemChecked(TQCheckListItem*)));
+				connect(clitem, TQ_SIGNAL(changed(TQCheckListItem*)), TQ_SLOT(slotItemChecked(TQCheckListItem*)));
 				clitem->setOn(autoloadEnabled(&kdedrc, *it));
 				item = clitem;
 				item->setText(1, file.readName());
@@ -194,7 +194,7 @@ void KDEDConfig::save() {
 
 	for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
 
-		if ( KDesktopFile::isDesktopFile( *it ) ) {
+		if ( TDEDesktopFile::isDesktopFile( *it ) ) {
 
 			TDEConfig file( *it, false, false, "services" );
 			file.setGroup("Desktop Entry");
@@ -212,7 +212,7 @@ void KDEDConfig::save() {
 	kdedrc.sync();
 
 	DCOPRef( "kded", "kded" ).call( "reconfigure" );
-	TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotServiceRunningToggled()));
 }
 
 
@@ -229,7 +229,7 @@ void KDEDConfig::getServiceStatus()
 	TQByteArray replyData;
 
 
-	if (!kapp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
+	if (!tdeApp->dcopClient()->call( "kded", "kded", "loadedModules()", TQByteArray(),
 				replyType, replyData ) ) {
 
 		_lvLoD->setEnabled( false );
@@ -310,7 +310,7 @@ void KDEDConfig::slotStartService()
 	TQCString replyType;
 	TQDataStream arg( data, IO_WriteOnly );
 	arg << service;
-	if (kapp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
+	if (tdeApp->dcopClient()->call( "kded", "kded", "loadModule(TQCString)", data, replyType, replyData ) ) {
 		TQDataStream reply(replyData, IO_ReadOnly);
 		if ( replyType == "bool" )
 		{
@@ -337,7 +337,7 @@ void KDEDConfig::slotStopService()
 	TQDataStream arg( data, IO_WriteOnly );
 
 	arg << service;
-	if (kapp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
+	if (tdeApp->dcopClient()->send( "kded", "kded", "unloadModule(TQCString)", data ) ) {
 		slotServiceRunningToggled();
 	}
 	else {
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 4ae379a50..31e1b0500 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -84,8 +84,8 @@ void CommandShortcutsModule::initGUI()
                         "To edit, add or remove entries from this list use the "
                         "<a href=\"launchMenuEditor\">TDE menu editor</a>.</qt>"));
     label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
-    disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
-    connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
+    disconnect(label, TQ_SIGNAL(linkClicked(const TQString &)), label, TQ_SLOT(openLink(const TQString &)));
+    connect(label, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(launchMenuEditor()));
     mainLayout->addWidget(label);
 
     m_tree = new AppTreeView(this, "appTreeView");
@@ -97,10 +97,10 @@ void CommandShortcutsModule::initGUI()
                          "currently defined on this system. Click to select a command to "
                          "assign a keyboard shortcut to. Complete management of these "
                          "entries can be done via the menu editor program."));
-    connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
-            this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool)));
-    connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
-            this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
+    connect(m_tree, TQ_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
+            this, TQ_SLOT(commandSelected(const TQString&, const TQString &, bool)));
+    connect(m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+            this, TQ_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
     m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this);
     mainLayout->addWidget(m_shortcutBox);
     TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2);
@@ -121,10 +121,10 @@ void CommandShortcutsModule::initGUI()
                          "to the currently selected command."));
     buttonLayout->addSpacing(KDialog::spacingHint() * 2);
     buttonLayout->addWidget(m_shortcutButton);
-    connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
-            this, TQT_SLOT(shortcutChanged(const TDEShortcut&)));
-    connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
-    connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
+    connect(m_shortcutButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)),
+            this, TQ_SLOT(shortcutChanged(const TDEShortcut&)));
+    connect(m_customRadio, TQ_SIGNAL(toggled(bool)), m_shortcutButton, TQ_SLOT(setEnabled(bool)));
+    connect(m_noneRadio, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shortcutRadioToggled(bool)));
     buttonLayout->addStretch(1);
 }
 
diff --git a/kcontrol/keys/kde4.kksrc b/kcontrol/keys/kde4.kksrc
index 367bc41d6..a35eaafbd 100644
--- a/kcontrol/keys/kde4.kksrc
+++ b/kcontrol/keys/kde4.kksrc
@@ -75,8 +75,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Win+Ctrl+Delete
 Lock Session=Win+ScrollLock
-Logout=Win+Escape
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Win+Escape
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Win+Ctrl+R
 Mouse Emulation=none
 Popup Launch Menu=Win+Menu
@@ -85,6 +86,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=Win+Ctrl+V
 Show Taskmanager=Win+Ctrl+Pause
 Show Window List=Win+0
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index ee39447a1..1cf193fde 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 #include <tdemessagebox.h>
 #include <kseparator.h>
 #include <dcopclient.h>
@@ -112,8 +112,8 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 
   //readSchemeNames();
   sList->setCurrentItem( 0 );
-  connect( sList, TQT_SIGNAL( highlighted( int ) ),
-           TQT_SLOT( slotPreviewScheme( int ) ) );
+  connect( sList, TQ_SIGNAL( highlighted( int ) ),
+           TQ_SLOT( slotPreviewScheme( int ) ) );
 
   TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this );
 
@@ -124,12 +124,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   TQWhatsThis::add( sList, wtstr );
 
   addBt = new TQPushButton(  i18n("&Save Scheme..."), this );
-  connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
+  connect( addBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) );
   TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name."));
 
   removeBt = new TQPushButton(  i18n("&Remove Scheme"), this );
-  removeBt->setEnabled(FALSE);
-  connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) );
+  removeBt->setEnabled(false);
+  connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) );
   TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not"
     " remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") );
 
@@ -143,7 +143,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 	if( !KKeySequence::keyboardHasMetaKey() )
 		preferMetaBt->setEnabled( false );
 	preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() );
-	connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) );
+	connect( preferMetaBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotPreferMeta()) );
 	TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would "
 		"like TDE to prefer the 3-modifier configuration defaults, then this option "
 		"should be unchecked.") );
@@ -153,7 +153,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   KSeparator* line = new KSeparator( KSeparator::HLine, this );
 
   kc = new KeyChooserSpec( actions, this, isGlobal );
-  connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) );
+  connect( kc, TQ_SIGNAL(keyChange()), this, TQ_SLOT(slotKeyChange()) );
 
   readScheme();
 
@@ -206,12 +206,12 @@ void KKeyModule::load()
   kc->commitChanges();
   actions.writeActions( KeySet, 0, true, true );
   if ( KeyType == "global" ) {
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
     // TODO: create a reconfigureKeys() method.
-    kapp->dcopClient()->send("twin", "", "reconfigure()", "");
-    kapp->dcopClient()->send("kdesktop", "", "configure()", "");
-    kapp->dcopClient()->send("kicker", "Panel", "configure()", "");
+    tdeApp->dcopClient()->send("twin", "", "reconfigure()", "");
+    tdeApp->dcopClient()->send("kdesktop", "", "configure()", "");
+    tdeApp->dcopClient()->send("kicker", "Panel", "configure()", "");
   }
 }*/
 
@@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange()
 
 /*void KKeyModule::slotSave( )
 {
-    KSimpleConfig config(*sFileList->at( sList->currentItem() ) );
+    TDESimpleConfig config(*sFileList->at( sList->currentItem() ) );
     //  global=true is necessary in order to
     //  let both 'Global Shortcuts' and 'Shortcut Sequences' be
     //  written to the same scheme file.
@@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index )
   else {
     TDEConfigBase* config = 0;
     if( index == 0 )	config = new TDEConfig( "kdeglobals" );
-    //else		config = new KSimpleConfig( *sFileList->at( index ), true );
+    //else		config = new TDESimpleConfig( *sFileList->at( index ), true );
 
     actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
     kc->listSync();
@@ -303,7 +303,7 @@ void KKeyModule::readScheme( int index )
 
   do {
 
-    nameValid = TRUE;
+    nameValid = true;
 
     if ( ss.exec() ) {
       sName = ss.nameLine->text();
@@ -354,10 +354,10 @@ void KKeyModule::readScheme( int index )
       }
     } else return;
 
-  } while ( nameValid == FALSE );
+  } while ( nameValid == false );
 
-  disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this,
-              TQT_SLOT( slotPreviewScheme( int ) ) );
+  disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+              TQ_SLOT( slotPreviewScheme( int ) ) );
 
 
   TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
@@ -394,8 +394,8 @@ void KKeyModule::readScheme( int index )
      sList->setCurrentItem( exists );
   }
 
-  KSimpleConfig *config =
-    new KSimpleConfig( sFile );
+  TDESimpleConfig *config =
+    new TDESimpleConfig( sFile );
 
   config->setGroup( KeyScheme );
   config->writeEntry( "Name", sName );
@@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index )
 
   slotSave();
 
-  connect( sList, TQT_SIGNAL( highlighted( int ) ), this,
-           TQT_SLOT( slotPreviewScheme( int ) ) );
+  connect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+           TQ_SLOT( slotPreviewScheme( int ) ) );
 
   slotPreviewScheme( sList->currentItem() );
 }*/
@@ -418,9 +418,9 @@ void KKeyModule::readScheme( int index )
   if ( indx < nSysSchemes ||
        (*sFileList->at(indx)).contains( "/global-" ) ||
        (*sFileList->at(indx)).contains( "/app-" ) ) {
-    removeBt->setEnabled( FALSE );
+    removeBt->setEnabled( false );
   } else {
-    removeBt->setEnabled( TRUE );
+    removeBt->setEnabled( true );
   }
 }*/
 
@@ -449,7 +449,7 @@ void KKeyModule::readScheme( int index )
     //if( r.search( *it ) != -1 )
     //   continue;
 
-    KSimpleConfig config( *it, true );
+    TDESimpleConfig config( *it, true );
     // TODO: Put 'Name' in "Settings" group
     config.setGroup( KeyScheme );
     TQString str = config.readEntry( "Name" );
@@ -496,7 +496,7 @@ void KKeyModule::init()
   keys->readActions( "Global Keys" );
 
   {
-    KSimpleConfig cfg( "kdeglobals" );
+    TDESimpleConfig cfg( "kdeglobals" );
     cfg.deleteGroup( "Global Keys" );
   }
 
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index eccc5210a..b54ffb5cd 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -25,7 +25,8 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
+#include <dcopref.h>
 
 #include "commandShortcuts.h"
 #include "main.h"
@@ -75,16 +76,16 @@ void KeyModule::initGUI()
 
 	m_pShortcuts = new ShortcutsModule( this );
 	m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") );
-	connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+	connect( m_pShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
 
 	m_pCommandShortcuts = new CommandShortcutsModule ( this );
 	m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") );
-	connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
-    connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) );
+	connect( m_pCommandShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
+    connect( m_pTab, TQ_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQ_SLOT(showing(TQWidget*)) );
 
 	m_pModifiers = new ModifiersModule( this );
 	m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") );
-	connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+	connect( m_pModifiers, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
 }
 
 void KeyModule::load()
@@ -146,7 +147,7 @@ TQString KeyModule::handbookSection() const
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
   {
 	// What does this do?  Why not insert klipper and kxkb, too? --ellis, 2002/01/15
 	TDEGlobal::locale()->insertCatalogue("twin");
@@ -155,7 +156,7 @@ extern "C"
 	return new KeyModule(parent, "kcmkeys");
   }
 
-  KDE_EXPORT void initModifiers()
+  TDE_EXPORT void initModifiers()
   {
 	kdDebug(125) << "KeyModule::initModifiers()" << endl;
 
@@ -165,7 +166,7 @@ extern "C"
 		ModifiersModule::setupMacModifierKeys();
   }
 
-  KDE_EXPORT void init_keys()
+  TDE_EXPORT void init_keys()
   {
 	kdDebug(125) << "KeyModule::init()\n";
 
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 349bd492d..f8c887c45 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -116,7 +116,7 @@ void ModifiersModule::save()
 		if( bMacSwap )
 			setupMacModifierKeys();
 		else
-			kapp->tdeinitExec("kxkb");
+			tdeApp->tdeinitExec("kxkb");
 		m_bMacSwapOrig = bMacSwap;
 		updateWidgets();
 	}
@@ -207,7 +207,7 @@ void ModifiersModule::initGUI()
 
 	m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this );
 	m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig );
-	connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) );
+	connect( m_pchkMacKeyboard, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacKeyboardClicked()) );
 	pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 );
 
 	m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this );
@@ -220,7 +220,7 @@ void ModifiersModule::initGUI()
 			"<b>Command</b> will be used for application and console commands, "
 			"<b>Option</b> as a command modifier and for navigating menus and dialogs, "
 			"and <b>Control</b> for window manager commands.") );
-	connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) );
+	connect( m_pchkMacSwap, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacSwapClicked()) );
 	pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 );
 
 	//------------------
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e7f599dda..c225e5f68 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -39,8 +39,9 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdeshortcutlist.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <dcopref.h>
 
 ShortcutsModule::ShortcutsModule( TQWidget *parent, const char *name )
 : TQWidget( parent, name )
@@ -139,21 +140,21 @@ void ShortcutsModule::initGUI()
 	pGroup->hide();
 
 	m_prbPre = new TQRadioButton( "", this );
-	connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) );
+	connect( m_prbPre, TQ_SIGNAL(clicked()), TQ_SLOT(slotSchemeCur()) );
 	pGroup->insert( m_prbPre );
 	pHLayout->addWidget( m_prbPre );
 
 	m_pcbSchemes = new KComboBox( this );
 	m_pcbSchemes->setMinimumWidth( 100 );
 	m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
-	connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+	connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
 	pHLayout->addWidget( m_pcbSchemes );
 
 	pHLayout->addSpacing( KDialog::marginHint() );
 
 	m_pbtnRemove = new TQPushButton( i18n("&Remove"), this );
 	m_pbtnRemove->setEnabled( false );
-	connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) );
+	connect( m_pbtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveScheme()) );
 	TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot"
 		" remove the standard system-wide schemes 'Current scheme' and 'TDE default'.") );
 	pHLayout->addWidget( m_pbtnRemove );
@@ -168,7 +169,7 @@ void ShortcutsModule::initGUI()
 	m_pbtnSave = new TQPushButton( i18n("&Save..."), this );
 	m_pbtnSave->setEnabled( false );
 	TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") );
-	connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) );
+	connect( m_pbtnSave, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveSchemeAs()) );
 	pHLayout->addWidget( m_pbtnSave );
 
 	pHLayout->addStretch( 1 );
@@ -196,20 +197,20 @@ void ShortcutsModule::initGUI()
 		m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() );
 		m_useRmWinKeys->setChecked( m_bUseRmWinKeys );
 		pVLayout->addWidget( m_useRmWinKeys, 1, 0 );
-		connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) );
+		connect( m_useRmWinKeys, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseRmWinKeysClicked()) );
 	}
 	m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
-	connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+	connect( m_pkcGeneral, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
 
 	m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true );
 	m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
 	m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
-	connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+	connect( m_pkcSequence, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
 
 	m_pListApplication = new TDEStdAccel::ShortcutList;
 	m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
 	m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
-	connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+	connect( m_pkcApplication, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
 
 	kdDebug(125) << "G-----------" << endl;
 	readSchemeNames();
@@ -281,7 +282,7 @@ void ShortcutsModule::readSchemeNames()
 		//if( r.search( *it ) != -1 )
 		//   continue;
 
-		KSimpleConfig config( *it, true );
+		TDESimpleConfig config( *it, true );
 		config.setGroup( "Settings" );
 		TQString str = config.readEntry( "Name" );
 
@@ -323,7 +324,7 @@ void ShortcutsModule::slotSelectScheme( int )
 		m_pkcSequence->syncToConfig( "Global Shortcuts", 0, true );
 		m_pkcApplication->syncToConfig( "Shortcuts", 0, false );
 	} else {
-		KSimpleConfig config( sFilename );
+		TDESimpleConfig config( sFilename );
 		config.setGroup( "Settings" );
 		//m_sBaseSchemeFile = config.readEntry( "Name" );
 
@@ -404,7 +405,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 			return;
 	} while( !bNameValid );
 
-	disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
+	disconnect( m_pcbSchemes, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectScheme(int)) );
 
 	TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
 
@@ -426,7 +427,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 		m_pcbSchemes->setCurrentItem( iScheme );
 	}
 
-	KSimpleConfig *config = new KSimpleConfig( sFile );
+	TDESimpleConfig *config = new TDESimpleConfig( sFile );
 
 	config->setGroup( "Settings" );
 	config->writeEntry( "Name", sName );
@@ -434,14 +435,14 @@ void ShortcutsModule::slotSaveSchemeAs()
 
 	saveScheme();
 
-	connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+	connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
 	slotSelectScheme();
 }
 
 void ShortcutsModule::saveScheme()
 {
 	TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ];
-	KSimpleConfig config( sFilename );
+	TDESimpleConfig config( sFilename );
 
 	m_pkcGeneral->commitChanges();
 	m_pkcSequence->commitChanges();
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 06d01e317..7cb5de9b5 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqcursor.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
@@ -109,11 +109,11 @@ AppTreeView::AppTreeView( TQWidget *parent, const char *name )
     addColumn(i18n("Shortcut"));
     addColumn(i18n("Alternate"));
 
-    connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
-            TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this, TQ_SIGNAL(clicked( TQListViewItem* )),
+            TQ_SLOT(itemSelected( TQListViewItem* )));
 
-    connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
-            TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+            TQ_SLOT(itemSelected( TQListViewItem* )));
 }
 
 AppTreeView::~AppTreeView()
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index 591658ffe..a61cf591a 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -26,7 +26,7 @@
 
 class TQPopupMenu;
 class TDEActionCollection;
-class KDesktopFile;
+class TDEDesktopFile;
 
 class AppTreeItem : public TDEListViewItem
 {
diff --git a/kcontrol/keys/trinity.kksrc b/kcontrol/keys/trinity.kksrc
index 57681b60f..2339b9186 100644
--- a/kcontrol/keys/trinity.kksrc
+++ b/kcontrol/keys/trinity.kksrc
@@ -75,8 +75,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Alt+Ctrl+Escape
 Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
 Mouse Emulation=Alt+F12
 Popup Launch Menu=Alt+F1
@@ -86,6 +87,7 @@ Show Klipper Popup-Menu=Alt+Ctrl+V
 Show Taskmanager=Ctrl+Escape
 Show Window List=Alt+F5
 Start Screen Saver=Alt+Ctrl+S
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/unix3.kksrc b/kcontrol/keys/unix3.kksrc
index 8ac722ec6..de091abc7 100644
--- a/kcontrol/keys/unix3.kksrc
+++ b/kcontrol/keys/unix3.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Alt+F9
 Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
 Mouse Emulation=Alt+F12
 Popup Launch Menu=Alt+F1
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=none
 Show Taskmanager=Ctrl+Escape
 Show Window List=none
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/win3.kksrc b/kcontrol/keys/win3.kksrc
index 926f83670..a7ae3adbc 100644
--- a/kcontrol/keys/win3.kksrc
+++ b/kcontrol/keys/win3.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=none
 Lock Session=none
-Logout=none
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=none
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=none
 Mouse Emulation=none
 Popup Launch Menu=Ctrl+Escape
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=none
 Show Taskmanager=Alt+Ctrl+Delete
 Show Window List=none
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/win4.kksrc b/kcontrol/keys/win4.kksrc
index 1abb69313..3c53ecd25 100644
--- a/kcontrol/keys/win4.kksrc
+++ b/kcontrol/keys/win4.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=none
 Lock Session=none
-Logout=none
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=none
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=none
 Mouse Emulation=none
 Popup Launch Menu=Ctrl+Escape
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=none
 Show Taskmanager=Alt+Ctrl+Delete
 Show Window List=none
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/wm3.kksrc b/kcontrol/keys/wm3.kksrc
index 6c6ef61e5..70abfbf94 100644
--- a/kcontrol/keys/wm3.kksrc
+++ b/kcontrol/keys/wm3.kksrc
@@ -71,8 +71,9 @@ Halt Computer=none
 Halt without Confirmation=none
 Kill Window=Alt+Ctrl+Escape
 Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
 Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
 Mouse Emulation=Alt+F12
 Popup Launch Menu=Alt+F1
@@ -81,6 +82,7 @@ Reboot without Confirmation=none
 Show Klipper Popup-Menu=Alt+Ctrl+V
 Show Taskmanager=Ctrl+Escape
 Show Window List=Alt+F5
+Suspend=XF86Sleep
 Switch One Desktop Down=none
 Switch One Desktop to the Left=none
 Switch One Desktop to the Right=none
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index f2ba15680..e9ed08b0a 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -40,10 +40,10 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
                   name,
                   false, false)
 {
-    connect(this, TQT_SIGNAL(applyClicked()),
-            this, TQT_SLOT(save()));
-    connect(this, TQT_SIGNAL(okClicked()),
-            this, TQT_SLOT(save()));
+    connect(this, TQ_SIGNAL(applyClicked()),
+            this, TQ_SLOT(save()));
+    connect(this, TQ_SIGNAL(okClicked()),
+            this, TQ_SLOT(save()));
 
     TQFrame* page = plainPage();
     TQVBoxLayout* layout = new TQVBoxLayout(page);
@@ -53,22 +53,22 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
 
     setMinimumSize( sizeHint() );
 
-    connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->hideButtonSize, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->tintColorB, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->tintSlider, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->menubarPanelTransparent, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->menubarPanelBlurred, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->kickerResizeHandle, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
-    connect(m_advancedWidget->kickerDeepButtons, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(changed()));
+    connect(m_advancedWidget->handles, TQ_SIGNAL(clicked(int)),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->hideButtonSize, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->tintColorB, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->tintSlider, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->blurSlider, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->menubarPanelTransparent, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->kickerResizeHandle, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->kickerDeepButtons, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
     load();
 }
 
@@ -97,10 +97,21 @@ void advancedDialog::load()
     int tintValue = c.readNumEntry( "TintValue", 33 );
     m_advancedWidget->tintSlider->setValue( tintValue );
 
+    // Compatibility with deprecated MenubarPanelBlurred option
+    int blurValue = 0;
+    if (c.hasKey("MenubarPanelBlurred"))
+    {
+        if (c.readNumEntry("MenubarPanelBlurred", false))
+        {
+            blurValue = 4;
+        }
+        c.deleteEntry("MenubarPanelBlurred");
+    }
+    blurValue = c.readNumEntry("BlurValue", blurValue);
+    m_advancedWidget->blurSlider->setValue(blurValue);
+
     bool transparentMenubarPanel = c.readBoolEntry("MenubarPanelTransparent", false);
     m_advancedWidget->menubarPanelTransparent->setChecked( transparentMenubarPanel );
-    bool blurredMenubarPanel = c.readBoolEntry("MenubarPanelBlurred", false);
-    m_advancedWidget->menubarPanelBlurred->setChecked( blurredMenubarPanel );
 
     bool useKickerResizeHandle = c.readBoolEntry("UseResizeHandle", false);
     m_advancedWidget->kickerResizeHandle->setChecked( useKickerResizeHandle );
@@ -125,10 +136,10 @@ void advancedDialog::save()
                  m_advancedWidget->tintColorB->color());
     c.writeEntry("TintValue",
                  m_advancedWidget->tintSlider->value());
+    c.writeEntry("BlurValue",
+                 m_advancedWidget->blurSlider->value());
     c.writeEntry("MenubarPanelTransparent",
                  m_advancedWidget->menubarPanelTransparent->isChecked());
-    c.writeEntry("MenubarPanelBlurred",
-                 m_advancedWidget->menubarPanelBlurred->isChecked());
     c.writeEntry("UseResizeHandle",
                  m_advancedWidget->kickerResizeHandle->isChecked());
     c.writeEntry("ShowDeepButtons",
@@ -161,10 +172,10 @@ void advancedDialog::save()
                              m_advancedWidget->tintColorB->color());
         extConfig.writeEntry("TintValue",
                              m_advancedWidget->tintSlider->value());
+        extConfig.writeEntry("BlurValue",
+                             m_advancedWidget->blurSlider->value());
         extConfig.writeEntry("MenubarPanelTransparent",
                              m_advancedWidget->menubarPanelTransparent->isChecked());
-        extConfig.writeEntry("MenubarPanelBlurred",
-                             m_advancedWidget->menubarPanelBlurred->isChecked());
         extConfig.writeEntry("UseResizeHandle",
                              m_advancedWidget->kickerResizeHandle->isChecked());
         extConfig.writeEntry("ShowDeepButtons",
@@ -172,7 +183,7 @@ void advancedDialog::save()
 
         extConfig.sync();
     }
-   
+
     c.sync();
 
     KickerConfig::the()->notifyKicker();
diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui
index b1e0aaf37..0e65401db 100644
--- a/kcontrol/kicker/advancedOptions.ui
+++ b/kcontrol/kicker/advancedOptions.ui
@@ -8,21 +8,30 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>324</width>
-            <height>235</height>
+            <width>425</width>
+            <height>360</height>
         </rect>
     </property>
+    <property name="caption">
+        <string>advancedKickerOptions</string>
+    </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>0</number>
+            <number>5</number>
         </property>
         <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
+            <property name="frameShape">
+                <enum>StyledPanel</enum>
+            </property>
+            <property name="margin">
+                <number>2</number>
+            </property>
             <property name="title">
                 <string>Panel Dimensions</string>
             </property>
@@ -84,6 +93,12 @@
             <property name="name">
                 <cstring>handles</cstring>
             </property>
+            <property name="frameShape">
+                <enum>StyledPanel</enum>
+            </property>
+            <property name="margin">
+                <number>2</number>
+            </property>
             <property name="title">
                 <string>Applet Handles</string>
             </property>
@@ -158,6 +173,20 @@
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>4</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <property name="frameShape">
+                <enum>StyledPanel</enum>
+            </property>
+            <property name="margin">
+                <number>2</number>
+            </property>
             <property name="title">
                 <string>Transparency</string>
             </property>
@@ -165,77 +194,179 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KColorButton" row="0" column="1">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
-                        <cstring>tintColorB</cstring>
+                        <cstring>textLabel1_2</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
+                            <hsizetype>4</hsizetype>
+                            <vsizetype>5</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
                     <property name="text">
-                        <string></string>
+                        <string>Ti&amp;nt amount:</string>
+                    </property>
+                    <property name="buddy" stdset="0">
+                        <cstring>tintSlider</cstring>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Click on this button to set the color to use when tinting transparent panels.</string>
+                        <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string>
+                    </property>
+                </widget>
+                <widget class="TQLabel" row="4" column="3">
+                    <property name="name">
+                        <cstring>textLabel2</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>4</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="text">
+                        <string>Max</string>
+                    </property>
+                    <property name="alignment">
+                        <set>AlignVCenter|AlignRight</set>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string>
+                    </property>
+                </widget>
+                <widget class="TQLabel" row="6" column="3">
+                    <property name="name">
+                        <cstring>textLabel2_2</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>4</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="text">
+                        <string>Max blur</string>
+                    </property>
+                    <property name="alignment">
+                        <set>AlignVCenter|AlignRight</set>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Use this slider to set how much transparent panels should be blurred.</string>
                     </property>
                 </widget>
-                <spacer row="2" column="0">
+                <spacer row="7" column="2">
                     <property name="name">
-                        <cstring>spacer2</cstring>
+                        <cstring>spacer2_2_2</cstring>
                     </property>
                     <property name="orientation">
                         <enum>Vertical</enum>
                     </property>
                     <property name="sizeType">
-                        <enum>Expanding</enum>
+                        <enum>Maximum</enum>
                     </property>
                     <property name="sizeHint">
                         <size>
                             <width>20</width>
-                            <height>21</height>
+                            <height>16</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="TQLabel" row="2" column="1">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
-                        <cstring>textLabel3</cstring>
+                        <cstring>textLabel1_2_2</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>4</hsizetype>
+                            <vsizetype>5</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>Min</string>
+                        <string>&amp;Blur amount:</string>
                     </property>
-                    <property name="alignment">
-                        <set>AlignVCenter|AlignLeft</set>
+                    <property name="buddy" stdset="0">
+                        <cstring>blurSlider</cstring>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string>
+                        <string>Use this slider to set how much transparent panels should be blurred.</string>
                     </property>
                 </widget>
-                <spacer row="0" column="2">
+                <widget class="TQLabel" row="0" column="0">
+                    <property name="name">
+                        <cstring>textLabel1</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>4</hsizetype>
+                            <vsizetype>5</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="text">
+                        <string>Tint c&amp;olor:</string>
+                    </property>
+                    <property name="buddy" stdset="0">
+                        <cstring>tintColorB</cstring>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Click on this button to set the color to use when tinting transparent panels.</string>
+                    </property>
+                </widget>
+                <spacer row="6" column="0">
                     <property name="name">
-                        <cstring>spacer3</cstring>
+                        <cstring>spacer2_2</cstring>
                     </property>
                     <property name="orientation">
-                        <enum>Horizontal</enum>
+                        <enum>Vertical</enum>
                     </property>
                     <property name="sizeType">
-                        <enum>Expanding</enum>
+                        <enum>Maximum</enum>
                     </property>
                     <property name="sizeHint">
                         <size>
-                            <width>81</width>
+                            <width>20</width>
+                            <height>16</height>
+                        </size>
+                    </property>
+                </spacer>
+                <spacer row="4" column="0">
+                    <property name="name">
+                        <cstring>spacer2_2_2_2</cstring>
+                    </property>
+                    <property name="orientation">
+                        <enum>Vertical</enum>
+                    </property>
+                    <property name="sizeType">
+                        <enum>MinimumExpanding</enum>
+                    </property>
+                    <property name="sizeHint">
+                        <size>
+                            <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="TQSlider" row="1" column="1" rowspan="1" colspan="2">
+                <widget class="TQSlider" row="2" column="1" rowspan="2" colspan="3">
                     <property name="name">
                         <cstring>tintSlider</cstring>
                     </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
                     <property name="orientation">
                         <enum>Horizontal</enum>
                     </property>
@@ -243,49 +374,87 @@
                         <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string>
                     </property>
                 </widget>
-                <widget class="TQLabel" row="2" column="2">
+                <widget class="KColorButton" row="0" column="1">
                     <property name="name">
-                        <cstring>textLabel2</cstring>
+                        <cstring>tintColorB</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>4</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>Max</string>
+                        <string></string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Click on this button to set the color to use when tinting transparent panels.</string>
+                    </property>
+                </widget>
+                <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>textLabel3</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>4</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="text">
+                        <string>Min</string>
                     </property>
                     <property name="alignment">
-                        <set>AlignVCenter|AlignRight</set>
+                        <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string>
                     </property>
                 </widget>
-                <widget class="TQLabel" row="1" column="0">
+                <widget class="TQSlider" row="5" column="1" rowspan="1" colspan="3">
                     <property name="name">
-                        <cstring>textLabel1_2</cstring>
+                        <cstring>blurSlider</cstring>
                     </property>
-                    <property name="text">
-                        <string>Ti&amp;nt amount:</string>
+                    <property name="minValue">
+                        <number>0</number>
                     </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>tintSlider</cstring>
+                    <property name="maxValue">
+                        <number>10</number>
+                    </property>
+                    <property name="orientation">
+                        <enum>Horizontal</enum>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string>
+                        <string>Use this slider to set how much transparent panels should be blurred.</string>
                     </property>
                 </widget>
-                <widget class="TQLabel" row="0" column="0">
+                <widget class="TQLabel" row="6" column="1">
                     <property name="name">
-                        <cstring>textLabel1</cstring>
+                        <cstring>textLabel3_2</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>4</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>Tint c&amp;olor:</string>
+                        <string>No blur</string>
                     </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>tintColorB</cstring>
+                    <property name="alignment">
+                        <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Click on this button to set the color to use when tinting transparent panels.</string>
+                        <string>Use this slider to set how much transparent panels should be blurred.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>menubarPanelTransparent</cstring>
                     </property>
@@ -296,54 +465,49 @@
                         <string>Normally if you have the desktop's or current application's menu bar displayed in a panel at the top of the screen (MacOS-style), transparency is disabled for this panel to avoid the desktop background clashing with the menu bar. Set this option to make it transparent anyways.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
+            </grid>
+        </widget>
+        <widget class="TQGroupBox">
+            <property name="name">
+                <cstring>groupBox3</cstring>
+            </property>
+            <property name="frameShape">
+                <enum>StyledPanel</enum>
+            </property>
+            <property name="margin">
+                <number>2</number>
+            </property>
+            <property name="title">
+                <string>Texture</string>
+            </property>
+            <grid>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
-                        <cstring>menubarPanelBlurred</cstring>
+                        <cstring>kickerResizeHandle</cstring>
                     </property>
                     <property name="text">
-                        <string>Blur the background when transparency is enabled</string>
+                        <string>Show resize handle on panels</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>When checked, the displayed semi-transparent background image will be blurred to reduce eyestrain.</string>
+                        <string>Enabling this option will show a resize handle on the resizable end of each panel.</string>
+                    </property>
+                </widget>
+                <widget class="TQCheckBox" row="0" column="1">
+                    <property name="name">
+                        <cstring>kickerDeepButtons</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Use deep buttons</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Enabling this option will yield more highly textured panels.</string>
                     </property>
                 </widget>
             </grid>
         </widget>
-	<widget class="TQGroupBox">
-		<property name="name">
-			<cstring>groupBox3</cstring>
-		</property>
-		<property name="title">
-			<string>Texture</string>
-		</property>
-		<grid>
-			<property name="name">
-				<cstring>unnamed</cstring>
-			</property>
-			<widget class="TQCheckBox" row="0" column="0" rowspan="0" colspan="2">
-				<property name="name">
-					<cstring>kickerResizeHandle</cstring>
-				</property>
-				<property name="text">
-					<string>Show resize handle on panels</string>
-				</property>
-				<property name="whatsThis" stdset="0">
-					<string>Enabling this option will show a resize handle on the resizable end of each panel.</string>
-				</property>
-			</widget>
-			<widget class="TQCheckBox" row="0" column="2" rowspan="0" colspan="2">
-				<property name="name">
-					<cstring>kickerDeepButtons</cstring>
-				</property>
-				<property name="text">
-					<string>Use deep buttons</string>
-				</property>
-				<property name="whatsThis" stdset="0">
-					<string>Enabling this option will yield more highly textured panels.</string>
-				</property>
-			</widget>
-		</grid>
-        </widget>
     </vbox>
 </widget>
 <tabstops>
@@ -358,6 +522,7 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="global" impldecl="in declaration">knuminput.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index c2f488550..a03d1d157 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -31,7 +31,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 
@@ -42,16 +42,16 @@ AppletTab::AppletTab( TQWidget *parent, const char* name )
   : AppletTabBase (parent, name)
 {
 
-  connect(level_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(level_changed(int)));
+  connect(level_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(level_changed(int)));
 
-  connect(lb_trusted, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          TQT_SLOT(trusted_selection_changed(TQListViewItem*)));
+  connect(lb_trusted, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          TQ_SLOT(trusted_selection_changed(TQListViewItem*)));
 
-  connect(pb_add, TQT_SIGNAL(clicked()), TQT_SLOT(add_clicked()));
-  connect(pb_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove_clicked()));
+  connect(pb_add, TQ_SIGNAL(clicked()), TQ_SLOT(add_clicked()));
+  connect(pb_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove_clicked()));
 
-  connect(lb_available, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          TQT_SLOT(available_selection_changed(TQListViewItem*)));
+  connect(lb_available, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          TQ_SLOT(available_selection_changed(TQListViewItem*)));
 
   pb_add->setEnabled(false);
   pb_remove->setEnabled(false);
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index a773e063d..bd0bd2f11 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -19,7 +19,7 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdelocale.h>
 
 #include "extensionInfo.h"
@@ -54,7 +54,7 @@ void ExtensionInfo::load()
     }
     else
     {
-        KDesktopFile df(_desktopFile);
+        TDEDesktopFile df(_desktopFile);
         _name = df.readName();
         _resizeable = df.readBoolEntry("X-TDE-PanelExt-Resizeable", _resizeable);
 
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 506eebdfb..d94f18bfa 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -41,13 +41,13 @@ HidingConfig::HidingConfig(TQWidget *parent, const char *name)
 
     //addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void HidingConfig::notChanged()
@@ -90,7 +90,7 @@ void HidingConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString HidingConfig::handbookSection() const
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index fae21c356..b0a9088cb 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -764,9 +764,9 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot specifier="pure virtual">switchPanel(int)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp
index 8c340bd5d..382c1a84e 100644
--- a/kcontrol/kicker/hidingtab_impl.cpp
+++ b/kcontrol/kicker/hidingtab_impl.cpp
@@ -38,33 +38,33 @@ HidingTab::HidingTab(TQWidget *parent, const char* name)
     m_panelInfo(0)
 {
     // connections
-    connect(m_manual,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked()));
-    connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked()));
-    connect(m_xineramaHide, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_hideSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_animateHiding, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_autoHideSwitch, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_backgroundRaise, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_backgroundPos, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_lHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-    connect(m_rHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
-
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()),
-            TQT_SLOT(infoUpdated()));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)),
-            TQT_SLOT(extensionAdded(ExtensionInfo*)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)),
-            TQT_SLOT(extensionRemoved(ExtensionInfo*)));
+    connect(m_manual,TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked()));
+    connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked()));
+    connect(m_xineramaHide, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_hideSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_animateHiding, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_autoHideSwitch, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_backgroundRaise, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_backgroundPos, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_lHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+    connect(m_rHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
+
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()),
+            TQ_SLOT(infoUpdated()));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)),
+            TQ_SLOT(extensionAdded(ExtensionInfo*)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)),
+            TQ_SLOT(extensionRemoved(ExtensionInfo*)));
     // position tab tells hiding tab about extension selections and vice versa
-    connect(KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)),
-            TQT_SLOT(switchPanel(int)));
-    connect(m_panelList, TQT_SIGNAL(activated(int)),
-            KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)));
+    connect(KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int)),
+            TQ_SLOT(switchPanel(int)));
+    connect(m_panelList, TQ_SIGNAL(activated(int)),
+            KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int)));
 }
 
 void HidingTab::load()
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index d7cbadf28..082753cb9 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -41,13 +41,13 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
 
     addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void LookAndFeelConfig::notChanged()
@@ -90,7 +90,7 @@ void LookAndFeelConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString LookAndFeelConfig::handbookSection() const
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 803393e66..fcc746f57 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -624,11 +624,11 @@ This option is only active if 'Enable background image' is selected.</string>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">launchAdvancedDialog()</slot>
     <slot access="protected" specifier="pure virtual">browseTheme(const TQString&amp;)</slot>
     <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 674b1cd04..cc8c61515 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -31,7 +31,7 @@
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <kickerSettings.h>
 #include "advancedDialog.h"
@@ -48,21 +48,21 @@ LookAndFeelTab::LookAndFeelTab( TQWidget *parent, const char* name )
   : LookAndFeelTabBase(parent, name),
     m_advDialog(0)
 {
-    connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+    connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
 
-    connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SLOT(kmenuTileChanged(int)));
-    connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SLOT(desktopTileChanged(int)));
-    connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SLOT(browserTileChanged(int)));
-    connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SLOT(urlTileChanged(int)));
-    connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SLOT(wlTileChanged(int)));
+    connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SLOT(kmenuTileChanged(int)));
+    connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SLOT(desktopTileChanged(int)));
+    connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SLOT(browserTileChanged(int)));
+    connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SLOT(urlTileChanged(int)));
+    connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SLOT(wlTileChanged(int)));
 
-    connect(kcfg_ColorizeBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(browseTheme()));
+    connect(kcfg_ColorizeBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(browseTheme()));
 
-    connect(kcfg_BackgroundTheme->lineEdit(), TQT_SIGNAL(lostFocus()), TQT_SLOT(browseTheme()));
+    connect(kcfg_BackgroundTheme->lineEdit(), TQ_SIGNAL(lostFocus()), TQ_SLOT(browseTheme()));
     kcfg_BackgroundTheme->setFilter(KImageIO::pattern(KImageIO::Reading));
     kcfg_BackgroundTheme->setCaption(i18n("Select Image File"));
 
@@ -92,7 +92,7 @@ void LookAndFeelTab::launchAdvancedDialog()
     if (!m_advDialog)
     {
         m_advDialog = new advancedDialog(this, "advancedDialog");
-        connect(m_advDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(finishAdvancedDialog()));
+        connect(m_advDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(finishAdvancedDialog()));
         m_advDialog->show();
     }
     m_advDialog->setActiveWindow();
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index 5695e3869..a703ea966 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -48,7 +48,7 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
     layout->addWidget(lookandfeeltab);
     layout->addStretch();
 
-    connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged()));
+    connect(lookandfeeltab, TQ_SIGNAL(changed()), TQ_SLOT(configChanged()));
 
     load();
 }
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index da73da7c3..ae5260f6e 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -25,7 +25,7 @@
 #include <kimageio.h>
 #include <tdelistview.h>
 #include <kstaticdeleter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "hidingconfig.h"
@@ -63,15 +63,15 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name)
 
     init();
 
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)",
                       "jumpToPanel(TQString)", false);
-    kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
+    tdeApp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray());
 
-    connect(this, TQT_SIGNAL(hidingPanelChanged(int)),
-            this, TQT_SLOT(setCurrentPanelIndex(int)));
-    connect(this, TQT_SIGNAL(positionPanelChanged(int)),
-            this, TQT_SLOT(setCurrentPanelIndex(int)));
+    connect(this, TQ_SIGNAL(hidingPanelChanged(int)),
+            this, TQ_SLOT(setCurrentPanelIndex(int)));
+    connect(this, TQ_SIGNAL(positionPanelChanged(int)),
+            this, TQ_SLOT(setCurrentPanelIndex(int)));
 }
 
 KickerConfig::~KickerConfig()
@@ -90,7 +90,7 @@ KickerConfig::~KickerConfig()
 // this method may get called multiple times during the life of the control panel!
 void KickerConfig::init()
 {
-    disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
+    disconnect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&)));
     configFileWatch->stopScan();
     for (ExtensionInfoList::iterator it = m_extensionInfo.begin();
          it != m_extensionInfo.end();
@@ -128,20 +128,20 @@ void KickerConfig::init()
 
     setupExtensionInfo(*config, true, true);
 
-    connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&)));
+    connect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&)));
     configFileWatch->startScan();
 }
 
 void KickerConfig::restartKicker()
 {
     // Tell kicker to restart
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
     TQCString appname;
     appname = "kicker";
-    kapp->dcopClient()->send(appname, appname, "restart", TQString(""));
+    tdeApp->dcopClient()->send(appname, appname, "restart", TQString(""));
 }
 
 void KickerConfig::notifyKicker()
@@ -151,9 +151,9 @@ void KickerConfig::notifyKicker()
     emit aboutToNotifyKicker();
 
     // Tell kicker about the new config file.
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
 
     TQByteArray data;
@@ -168,7 +168,7 @@ void KickerConfig::notifyKicker()
         appname.sprintf("kicker-screen-%d", m_screenNumber);
     }
 
-    kapp->dcopClient()->send(appname, appname, "configure()", data);
+    tdeApp->dcopClient()->send(appname, appname, "configure()", data);
 }
 
 void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists)
@@ -371,7 +371,7 @@ TDEAboutData *KickerConfig::aboutData()
 
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
+    TDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
     {
         TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker");
         container->addModule("kicker_config_arrangement");
@@ -381,26 +381,26 @@ extern "C"
         return container;
     }
 
-    KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new PositionConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new HidingConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
     {
         return new MenuConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
+    TDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
     {
         KImageIO::registerFormats();
         TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") +
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 4f8a68605..6773105c6 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -41,13 +41,13 @@ MenuConfig::MenuConfig(TQWidget *parent, const char *name)
 
     addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void MenuConfig::notChanged()
@@ -90,7 +90,7 @@ void MenuConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changedm,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString MenuConfig::handbookSection() const
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index fbd15cd8d..44643d366 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -29,13 +29,13 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <knuminput.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdefontrequester.h>
 #include <kkeybutton.h>
 #include <tdemessagebox.h>
@@ -79,12 +79,12 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
     m_kmenu_button_changed(false)
 {
     // connections
-    connect(m_editKMenuButton, TQT_SIGNAL(clicked()), TQT_SLOT(launchMenuEditor()));
-    connect(btnCustomKMenuIcon, TQT_SIGNAL(clicked()), TQT_SLOT(launchIconEditor()));
-    connect(kcfg_KMenuText, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(kmenuChanged()));
-    connect(kcfg_ShowKMenuText, TQT_SIGNAL(toggled(bool)), TQT_SLOT(kmenuChanged()));
-    //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
-    connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
+    connect(m_editKMenuButton, TQ_SIGNAL(clicked()), TQ_SLOT(launchMenuEditor()));
+    connect(btnCustomKMenuIcon, TQ_SIGNAL(clicked()), TQ_SLOT(launchIconEditor()));
+    connect(kcfg_KMenuText, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(kmenuChanged()));
+    connect(kcfg_ShowKMenuText, TQ_SIGNAL(toggled(bool)), TQ_SLOT(kmenuChanged()));
+    //connect(kcfg_ButtonFont, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(kmenuChanged()));
+    connect(maxrecentdocs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(kmenuChanged()));
 
     // FIXME
     // When top pixmap support is ready for end-user visibility, replace
@@ -129,7 +129,7 @@ void MenuTab::load( bool useDefaults )
                                       TQString::null,
                                       SmallIcon("bookmark"),
                                       c->readBoolEntry("UseBookmarks", false));
-    connect(m_bookmarkMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+    connect(m_bookmarkMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
 
     // show the quick menus menu?
     m_quickBrowserMenu = new kSubMenuItem(m_subMenus,
@@ -137,7 +137,7 @@ void MenuTab::load( bool useDefaults )
                                           TQString::null,
                                           SmallIcon("kdisknav"),
                                           c->readBoolEntry("UseBrowser", false));
-    connect(m_quickBrowserMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+    connect(m_quickBrowserMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
 
     TQStringList ext_default;
     ext_default << "prefmenu.desktop" << "systemmenu.desktop";
@@ -150,13 +150,13 @@ void MenuTab::load( bool useDefaults )
         TQStringList av = d.entryList();
         for (TQStringList::ConstIterator it=av.begin(); it!=av.end(); ++it)
         {
-            KDesktopFile df(d.absFilePath(*it), true);
+            TDEDesktopFile df(d.absFilePath(*it), true);
             menuItem = new kSubMenuItem(m_subMenus,
                                         df.readName(),
                                         *it,
                                         SmallIcon(df.readIcon()),
                                         tqFind(ext.begin(), ext.end(), *it) != ext.end());
-            connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
+            connect(menuItem, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()));
         }
     }
 
@@ -165,16 +165,16 @@ void MenuTab::load( bool useDefaults )
     m_openOnHover->setChecked( c->readBoolEntry("OpenOnHover", true) );
     menuStyleChanged();
 
-    connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
-    connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SLOT(menuStyleChanged()));
-    connect(m_openOnHover, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()));
+    connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
+    connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SLOT(menuStyleChanged()));
+    connect(m_openOnHover, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()));
 
     m_showFrequent->setChecked(true);
     
     c->setGroup("KMenu");
     m_searchShortcut->setShortcut(TDEShortcut(c->readEntry("SearchShortcut", "/")), false);
-    connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SIGNAL(changed()));
-    connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(setSearchShortcut(const TDEShortcut&)));
+    connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SIGNAL(changed()));
+    connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(setSearchShortcut(const TDEShortcut&)));
     
     if ( useDefaults )
        emit changed();
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 00b571d13..cd871ae22 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -41,13 +41,13 @@ PositionConfig::PositionConfig(TQWidget *parent, const char *name)
 
     //addConfig(KickerSettings::self(), m_widget);
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
-    connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()),
-            this, TQT_SLOT(aboutToNotifyKicker()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()),
+            this, TQ_SLOT(aboutToNotifyKicker()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void PositionConfig::notChanged()
@@ -90,7 +90,7 @@ void PositionConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
 
 TQString PositionConfig::handbookSection() const
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index 6729d0cf2..fb3427b03 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -380,7 +380,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
                 <string>Si&amp;ze</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>This sets the size of the panel.</string>
+                <string>This sets the height of the panel. Tiny is 24 pixels high, Small is 30 pixels, Normal is 46 pixels, Large is 58 pixels.</string>
             </property>
             <grid>
                 <property name="name">
@@ -1112,12 +1112,12 @@ how it is positioned on the screen and how much of the screen it should use.</st
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">lengthenPanel( int )</slot>
     <slot access="protected" specifier="pure virtual">movePanel( int )</slot>
     <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot>
     <slot specifier="pure virtual">switchPanel( int )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 5fdb22983..ffbfc833e 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -33,7 +33,7 @@
 #include <knuminput.h>
 #include <kpanelextension.h>
 #include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 
 #include "main.h"
@@ -72,7 +72,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
     /*
      * set the tooltips on the buttons properly for RTL langs
      */
-    if (kapp->reverseLayout())
+    if (tdeApp->reverseLayout())
     {
         TQToolTip::add(locationTopRight,     i18n("Top left"));
         TQToolTip::add(locationTop,          i18n("Top center"));
@@ -104,10 +104,10 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
     }
 
     // connections
-    connect(m_locationGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed()));
-    connect(m_xineramaScreenComboBox, TQT_SIGNAL(highlighted(int)), TQT_SIGNAL(changed()));
+    connect(m_locationGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed()));
+    connect(m_xineramaScreenComboBox, TQ_SIGNAL(highlighted(int)), TQ_SIGNAL(changed()));
 
-    connect(m_identifyButton,TQT_SIGNAL(clicked()),TQT_SLOT(showIdentify()));
+    connect(m_identifyButton,TQ_SIGNAL(clicked()),TQ_SLOT(showIdentify()));
 
     for(int s=0; s < TQApplication::desktop()->numScreens(); s++)
     {   /* populate the combobox for the available screens */
@@ -123,38 +123,38 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
         m_xineramaScreenLabel->hide();
     }
 
-    connect(m_percentSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_percentSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_expandCheckBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()));
+    connect(m_percentSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_percentSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_expandCheckBox, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()));
 
-    connect(m_sizeGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed()));
-    connect(m_customSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
-    connect(m_customSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()));
+    connect(m_sizeGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed()));
+    connect(m_customSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
+    connect(m_customSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()));
 
     m_desktopPreview = new KVirtualBGRenderer(0);
-    connect(m_desktopPreview, TQT_SIGNAL(imageDone(int)),
-            TQT_SLOT(slotBGPreviewReady(int)));
-
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()),
-            TQT_SLOT(infoUpdated()));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)),
-            TQT_SLOT(extensionAdded(ExtensionInfo*)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)),
-            TQT_SLOT(extensionRemoved(ExtensionInfo*)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionChanged(const TQString&)),
-            TQT_SLOT(extensionChanged(const TQString&)));
-    connect(KickerConfig::the(), TQT_SIGNAL(extensionAboutToChange(const TQString&)),
-            TQT_SLOT(extensionAboutToChange(const TQString&)));
+    connect(m_desktopPreview, TQ_SIGNAL(imageDone(int)),
+            TQ_SLOT(slotBGPreviewReady(int)));
+
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()),
+            TQ_SLOT(infoUpdated()));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)),
+            TQ_SLOT(extensionAdded(ExtensionInfo*)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)),
+            TQ_SLOT(extensionRemoved(ExtensionInfo*)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionChanged(const TQString&)),
+            TQ_SLOT(extensionChanged(const TQString&)));
+    connect(KickerConfig::the(), TQ_SIGNAL(extensionAboutToChange(const TQString&)),
+            TQ_SLOT(extensionAboutToChange(const TQString&)));
     // position tab tells hiding tab about extension selections and vice versa
-    connect(KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)),
-            TQT_SLOT(jumpToPanel(int)));
-    connect(m_panelList, TQT_SIGNAL(activated(int)),
-            KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)));
-
-    connect(m_panelSize, TQT_SIGNAL(activated(int)),
-            TQT_SLOT(sizeChanged(int)));
-    connect(m_panelSize, TQT_SIGNAL(activated(int)),
-            TQT_SIGNAL(changed()));
+    connect(KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int)),
+            TQ_SLOT(jumpToPanel(int)));
+    connect(m_panelList, TQ_SIGNAL(activated(int)),
+            KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int)));
+
+    connect(m_panelSize, TQ_SIGNAL(activated(int)),
+            TQ_SLOT(sizeChanged(int)));
+    connect(m_panelSize, TQ_SIGNAL(activated(int)),
+            TQ_SIGNAL(changed()));
 }
 
 PositionTab::~PositionTab()
@@ -229,7 +229,7 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft;
         m_panelPos = PosTop;
     }
     else if (pushed == locationTop)
@@ -249,38 +249,38 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight;
         m_panelPos = PosTop;
     }
     else if (pushed == locationLeftTop)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignLeft;
-        m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
+        m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
     }
     else if (pushed == locationLeft)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignCenter;
-        m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
+        m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
     }
     else if (pushed == locationLeftBottom)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignRight;
-        m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft;
+        m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft;
     }
     else if (pushed == locationBottomLeft)
     {
@@ -289,7 +289,7 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft;
         m_panelPos = PosBottom;
     }
     else if (pushed == locationBottom)
@@ -309,38 +309,38 @@ void PositionTab::movePanel(int whichButton)
 	   setPositionButtons();
 	   return;
 	}
-        m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight;
+        m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight;
         m_panelPos = PosBottom;
     }
     else if (pushed == locationRightTop)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignLeft;
-        m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
+        m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
     }
     else if (pushed == locationRight)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignCenter;
-        m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
+        m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
     }
     else if (pushed == locationRightBottom)
     {
-	if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight]))
+	if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight]))
 	{
 	   setPositionButtons();
 	   return;
 	}
         m_panelAlign = AlignRight;
-        m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight;
+        m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight;
     }
 
     lengthenPanel(-1);
@@ -582,47 +582,47 @@ void PositionTab::setPositionButtons() {
     if (m_panelPos == PosTop)
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationTopRight->setOn(true) :
+            tdeApp->reverseLayout() ? locationTopRight->setOn(true) :
                                     locationTopLeft->setOn(true);
         else if (m_panelAlign == AlignCenter)
             locationTop->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationTopLeft->setOn(true) :
+            tdeApp->reverseLayout() ? locationTopLeft->setOn(true) :
                                     locationTopRight->setOn(true);
     }
     else if (m_panelPos == PosRight)
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationLeftTop->setOn(true) :
+            tdeApp->reverseLayout() ? locationLeftTop->setOn(true) :
                                     locationRightTop->setOn(true);
         else if (m_panelAlign == AlignCenter)
-            kapp->reverseLayout() ? locationLeft->setOn(true) :
+            tdeApp->reverseLayout() ? locationLeft->setOn(true) :
                                     locationRight->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationLeftBottom->setOn(true) :
+            tdeApp->reverseLayout() ? locationLeftBottom->setOn(true) :
                                     locationRightBottom->setOn(true);
     }
     else if (m_panelPos == PosBottom)
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationBottomRight->setOn(true) :
+            tdeApp->reverseLayout() ? locationBottomRight->setOn(true) :
                                     locationBottomLeft->setOn(true);
         else if (m_panelAlign == AlignCenter)
             locationBottom->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationBottomLeft->setOn(true) :
+            tdeApp->reverseLayout() ? locationBottomLeft->setOn(true) :
                                     locationBottomRight->setOn(true);
     }
     else // if (m_panelPos == PosLeft
     {
         if (m_panelAlign == AlignLeft)
-            kapp->reverseLayout() ? locationRightTop->setOn(true) :
+            tdeApp->reverseLayout() ? locationRightTop->setOn(true) :
                                     locationLeftTop->setOn(true);
         else if (m_panelAlign == AlignCenter)
-            kapp->reverseLayout() ? locationRight->setOn(true) :
+            tdeApp->reverseLayout() ? locationRight->setOn(true) :
                                     locationLeft->setOn(true);
         else // if (m_panelAlign == AlignRight
-            kapp->reverseLayout() ? locationRightBottom->setOn(true) :
+            tdeApp->reverseLayout() ? locationRightBottom->setOn(true) :
                                     locationLeftBottom->setOn(true);
     }
 
@@ -700,7 +700,7 @@ void PositionTab::showIdentify()
         screenLabel->setNum(s + 1);
         // BUGLET: we should not allow the identification to be entered again
         //         until the timer fires.
-        TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
+        TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close()));
 
         TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
         TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index b703b9b35..785ee7c0c 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <knotifydialog.h>
 #include <tdeparts/genericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
 
@@ -74,15 +74,15 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList &
     hbox->addWidget( m_appCombo, 10 );
 
     m_notifyWidget = new KNotifyWidget( this, "knotify widget", true );
-    connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool)));
+    connect( m_notifyWidget, TQ_SIGNAL( changed( bool )), TQ_SIGNAL( changed(bool)));
 
     layout->addWidget( m_notifyWidget );
 
-    connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ),
-             TQT_SLOT( slotAppActivated( const TQString& )) );
+    connect( m_appCombo, TQ_SIGNAL( activated( const TQString& ) ),
+             TQ_SLOT( slotAppActivated( const TQString& )) );
 
-    connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotPlayerSettings()));
+    connect( m_notifyWidget->m_playerButton, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotPlayerSettings()));
 
     TDEAboutData* ab = new TDEAboutData(
         "kcmknotify", I18N_NOOP("KNotify"), "3.0",
@@ -231,10 +231,10 @@ PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal )
     dataChanged = false;
     enableButton(Apply, false);
 
-    connect( m_ui->cbExternal, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( externalToggled( bool ) ) );
-    connect( m_ui->grpPlayers, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChanged() ) );
-    connect( m_ui->volumeSlider, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
-    connect( m_ui->reqExternal, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotChanged() ) );
+    connect( m_ui->cbExternal, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( externalToggled( bool ) ) );
+    connect( m_ui->grpPlayers, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChanged() ) );
+    connect( m_ui->volumeSlider, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
+    connect( m_ui->reqExternal, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotChanged() ) );
 }
 
 void PlayerSettingsDialog::load( bool useDefaults )
@@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply()
     save();
     dataChanged = false;
     enableButton(Apply, false);
-    kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
+    tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString(""));
 
     KDialogBase::slotApply();
 }
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 1b477d0e3..a6ab581ed 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -33,7 +33,7 @@
 #include <tdeio/uiserver_stub.h>
 #include <tdelocale.h>
 #include <konq_defaults.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "behaviour.h"
@@ -66,13 +66,13 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox);
     TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when "
                                     "you open a folder, rather than showing that folder's contents in the current window."));
-    connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-    connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool)));
+    connect(cbNewWin, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(cbNewWin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWinPixmap(bool)));
 
     // ----
 
     cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox );
-    connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbListProgress, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the"
                                           " progress information for all network file transfers into a single window"
@@ -83,7 +83,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     // ----
 
     cbShowArchivesAsFolders = new TQCheckBox( i18n( "Show archived &files as folders" ), vbox );
-    connect(cbShowArchivesAsFolders, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowArchivesAsFolders, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowArchivesAsFolders, i18n("Checking this option will list archived"
                                           " files as folders when using tree view.") );
@@ -92,16 +92,16 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     // --
 
     cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox );
-    connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a "
                                     "small popup window with additional information about that file."
                                     "This feature requires 'Enable tooltips' in KControl, Appearance & Themes, Style."));
 
-    connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool)));
+    connect(cbShowTips, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShowTips(bool)));
 /*
-    //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool)));
-    //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool)));
+    //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), sbToolTip, TQ_SLOT(setEnabled(bool)));
+    //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), fileTips, TQ_SLOT(setEnabled(bool)));
     fileTips->setBuddy(sbToolTip);
     TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some "
                           "additional information about that file. Here, you can set how many items of information "
@@ -116,7 +116,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
     cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
-    connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowPreviewsInTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the "
                           "popup window to contain a larger preview for the file, when moving the mouse over it."));
@@ -124,12 +124,12 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
     cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox);
     TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be "
                                                "renamed by clicking directly on the icon name. "));
-    connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbRenameDirectlyIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     cbDoubleClickMoveToParent = new TQCheckBox(i18n("Double click on empty area to move to parent folder"), vbox);
     TQWhatsThis::add(cbDoubleClickMoveToParent, i18n("When this option is enabled, double clicking an "
                                                 "empty area will navigate to the parent folder."));
-    connect(cbDoubleClickMoveToParent, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbDoubleClickMoveToParent, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
 	TQHBoxLayout *hlay = new TQHBoxLayout( lay );
 
@@ -140,7 +140,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
 	homeURL->setMode(KFile::Directory);
 	homeURL->setCaption(i18n("Select Home Folder"));
 	hlay->addWidget( homeURL );
-    connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+    connect(homeURL, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
     label->setBuddy(homeURL);
 
     TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where "
@@ -153,7 +153,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
 
     cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this );
     lay->addWidget( cbShowDeleteCommand );
-    connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbShowDeleteCommand, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed "
                                                 "on the desktop and in the file manager's context menus. "
@@ -169,7 +169,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
        " <li><em>Delete:</em> simply deletes the file.</li>"
        " </li></ul>") );
 
-    connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() ));
+    connect(bg, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( changed() ));
 
     cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg );
 
@@ -285,7 +285,7 @@ void KBehaviourOptions::save()
     config.sync();
 
     // Tell the running server
-    if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
+    if ( tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
       UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
       uiserver.setListMode( cbListProgress->isChecked() );
@@ -293,10 +293,10 @@ void KBehaviourOptions::save()
 
     // Send signal to konqueror
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
-    kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data );
 }
 
 TQString KBehaviourOptions::handbookSection() const
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index 49587f2dc..4a8496eac 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *pa
     tab->addTab(kuick, i18n("&Quick Copy && Move"));
   }
 
-  connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
-  connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
-  connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+  connect(appearance, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+  connect(behavior, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+  connect(previews, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
   if (kuick)
-     connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+     connect(kuick, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
 
-  connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)), 
-          this, TQT_SIGNAL(quickHelpChanged()));
+  connect(tab, TQ_SIGNAL(currentChanged(TQWidget *)), 
+          this, TQ_SIGNAL(quickHelpChanged()));
   m_tab = tab;
 }
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index d7af32f8b..65212f68f 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -39,7 +39,7 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
   {
     return new KDesktopConfig(parent, "kcmkonq");
   }
@@ -70,8 +70,8 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group);
   _numInput = new KIntNumInput(4, number_group);
   _numInput->setRange(1, maxDesktops, 1, true);
-  connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
-  connect(_numInput, TQT_SIGNAL(valueChanged(int)),  TQT_SLOT( changed() ));
+  connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
+  connect(_numInput, TQ_SIGNAL(valueChanged(int)),  TQ_SLOT( changed() ));
   label->setBuddy( _numInput );
   TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your TDE desktop. Move the slider to change the value." );
   TQWhatsThis::add( label, wtstr );
@@ -99,10 +99,10 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
       TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
       TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
 
-      connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)),
-           TQT_SLOT( changed() ));
-      connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)),
-           TQT_SLOT( changed() ));
+      connect(_nameInput[i], TQ_SIGNAL(textChanged(const TQString&)),
+           TQ_SLOT( changed() ));
+      connect(_nameInput[i+(maxDesktops/2)], TQ_SIGNAL(textChanged(const TQString&)),
+           TQ_SLOT( changed() ));
     }
 
   for(int i = 1; i < maxDesktops; i++)
@@ -111,7 +111,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   layout->addWidget(name_group);
 
   _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
-  connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+  connect(_wheelOption,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
 
   layout->addWidget(_wheelOption);
   layout->addStretch(1);
@@ -221,11 +221,11 @@ void KDesktopConfig::save()
   delete config;
 
   // Tell kdesktop about the new config file
-  if ( !kapp->dcopClient()->isAttached() )
-     kapp->dcopClient()->attach();
+  if ( !tdeApp->dcopClient()->isAttached() )
+     tdeApp->dcopClient()->attach();
   TQByteArray data;
 
-  kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+  tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 
   emit changed(false);
 }
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 5c5fe2b95..41885202f 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -53,7 +53,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent
     TQVBoxLayout* layout = new TQVBoxLayout(this);
     m_behavior = new DesktopBehavior(config, this);
     layout->addWidget(m_behavior);
-    connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
+    connect(m_behavior, TQ_SIGNAL(changed()), this, TQ_SLOT(changed()));
 }
 
 void DesktopBehaviorModule::changed()
@@ -127,16 +127,16 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
 
-  connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
-  connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-  connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(lockInPlaceBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged()));
-  connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged()));
-  connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *)));
-  connect(spacingValue, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(spacingChanged(int)));
-  connect(spacingCtrlScroll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
+  connect(desktopMenuGroup, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL(changed()));
+  connect(iconsEnabledBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+  connect(showHiddenBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(vrootBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(lockInPlaceBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+  connect(autoLineupIconsBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+  connect(toolTipBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+  connect(mediaListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(mediaListViewChanged(TQListViewItem *)));
+  connect(spacingValue, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spacingChanged(int)));
+  connect(spacingCtrlScroll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
 
   strMouseButton1 = i18n("&Left button:");
   strButtonTxt1 = i18n( "You can choose what happens when"
@@ -155,9 +155,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
   leftLabel->setText( strMouseButton1 );
   leftLabel->setBuddy( leftComboBox );
   fillMenuCombo( leftComboBox );
-  connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(leftEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   TQString wtstr = strButtonTxt1 +
                   i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
                        " <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -177,9 +177,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   middleLabel->setBuddy( middleComboBox );
   fillMenuCombo( middleComboBox );
-  connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(middleEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   wtstr = i18n("You can choose what happens when"
                " you click the middle button of your pointing device on the desktop:"
                " <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
@@ -201,9 +201,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
   rightLabel->setText( strMouseButton3 );
   rightLabel->setBuddy( rightComboBox );
   fillMenuCombo( rightComboBox );
-  connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
-  connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
-  connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+  connect(rightEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+  connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+  connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
   wtstr = strButtonTxt3 +
           i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
                " <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -223,8 +223,8 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
 
   if (m_bHasMedia)
   {
-     connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-     connect(enableMediaFreeSpaceOverlayBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
+     connect(enableMediaBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+     connect(enableMediaFreeSpaceOverlayBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
   }
   else
   {
@@ -253,7 +253,7 @@ void DesktopBehavior::setMediaListViewEnabled(bool enabled)
         if (it->mimeType().startsWith("media/builtin-") == false)
             it->setVisible(enabled);
         else
-            it->setVisible(TRUE);
+            it->setVisible(true);
     }
 }
 
@@ -418,8 +418,8 @@ void DesktopBehavior::save()
     g_pConfig->sync();
 
     // Tell kdesktop about the new config file
-    if ( !kapp->dcopClient()->isAttached() )
-       kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+       tdeApp->dcopClient()->attach();
     TQByteArray data;
 
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -428,11 +428,11 @@ void DesktopBehavior::save()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
     // for the standalone menubar setting
-    kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
-    kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
-    kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
+    tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
+    tdeApp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
+    tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
 }
 
 void DesktopBehavior::enableChanged()
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 94f866b1a..ae03a0534 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -66,22 +66,22 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( m_pStandard, wtstr );
 
     row++;
-    connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
-             TQT_SLOT( slotStandardFont(const TQString&) ) );
-    connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
-             TQT_SLOT(changed() ) );
-    connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
-             TQT_SLOT( slotStandardFont(const TQString&) ) );
-    connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
-             TQT_SLOT(changed() ) );
+    connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+             TQ_SLOT( slotStandardFont(const TQString&) ) );
+    connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+             TQ_SLOT(changed() ) );
+    connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+             TQ_SLOT( slotStandardFont(const TQString&) ) );
+    connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+             TQ_SLOT(changed() ) );
 
     m_pSize = new TQSpinBox( 4,18,1,this );
     label = new TQLabel( m_pSize, i18n("Font si&ze:"), this );
     lay->addWidget(label,row,0);
     lay->addMultiCellWidget(m_pSize,row,row,1,1);
 
-    connect( m_pSize, TQT_SIGNAL( valueChanged(int) ),
-             this, TQT_SLOT( slotFontSize(int) ) );
+    connect( m_pSize, TQ_SIGNAL( valueChanged(int) ),
+             this, TQ_SLOT( slotFontSize(int) ) );
     row+=2;
 
     wtstr = i18n("This is the font size used to display text in Konqueror windows.");
@@ -100,8 +100,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( label, wtstr );
     TQWhatsThis::add( m_pNormalText, wtstr );
 
-    connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ),
-             TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
+    connect( m_pNormalText, TQ_SIGNAL( changed( const TQColor & ) ),
+             TQ_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
 
     /*
     row++;
@@ -115,8 +115,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     TQWhatsThis::add( label, wtstr );
     TQWhatsThis::add( m_pHighlightedText, wtstr );
 
-    connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ),
-             TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
+    connect( m_pHighlightedText, TQ_SIGNAL( changed( const TQColor & ) ),
+             TQ_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
     */
 
     row++;
@@ -125,8 +125,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     {
         m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this );
         lay->addWidget(m_cbTextBackground,row,0);
-        connect( m_cbTextBackground, TQT_SIGNAL( clicked() ),
-                 TQT_SLOT( slotTextBackgroundClicked() ) );
+        connect( m_cbTextBackground, TQ_SIGNAL( clicked() ),
+                 TQ_SLOT( slotTextBackgroundClicked() ) );
 
         m_pTextBackground = new KColorButton( textBackgroundColor, this );
         lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
@@ -135,8 +135,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         TQWhatsThis::add( label, wtstr );
         TQWhatsThis::add( m_pTextBackground, wtstr );
 
-        connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ),
-                 TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
+        connect( m_pTextBackground, TQ_SIGNAL( changed( const TQColor & ) ),
+                 TQ_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
 
         row++;
     }
@@ -146,10 +146,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this );
         lay->addWidget( label, row, 0 );
         lay->addWidget( m_pNbLines, row, 1 );
-        connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
-                 this, TQT_SLOT( changed() ) );
-        connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
-                 TQT_SLOT( slotPNbLinesChanged(int)) );
+        connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+                 this, TQ_SLOT( changed() ) );
+        connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+                 TQ_SLOT( slotPNbLinesChanged(int)) );
 
         TQString thwt = i18n("This is the maximum number of lines that can be"
                             " used to draw icon text. Long file names are"
@@ -165,10 +165,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this );
         lay->addWidget( label, row, 0 );
         lay->addWidget( m_pNbWidth, row, 1 );
-        connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
-                 this, TQT_SLOT( changed() ) );
-        connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
-                 TQT_SLOT( slotPNbWidthChanged(int)) );
+        connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+                 this, TQ_SLOT( changed() ) );
+        connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+                 TQ_SLOT( slotPNbWidthChanged(int)) );
 
         thwt = i18n( "This is the maximum width for the icon text when konqueror "
                      "is used in multi column view mode." );
@@ -180,7 +180,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
 
     cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
     lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign);
-    connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(cbUnderline, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
     TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
                                        " being underlined, so that they look like links on a web page. Note:"
@@ -193,7 +193,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
 
         m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
         lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign );
-        connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
+        connect( m_pSizeInBytes, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()) );
 
         TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
                                               " being displayed in bytes. Otherwise file sizes are"
@@ -330,9 +330,9 @@ void KonqFontOptions::save()
     // Send signal to konqueror
     // Warning. In case something is added/changed here, keep kfmclient in sync
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     // Tell kdesktop about the new config file
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -341,7 +341,7 @@ void KonqFontOptions::save()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 }
 
 TQString KonqFontOptions::handbookSection() const
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index 5ca7cb4ad..c4e3ea506 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -48,48 +48,48 @@ static TQCString configname()
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name)
   {
     TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KBrowserOptions(config, "FMSettings", parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name)
   {
     TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KBehaviourOptions(config, "FMSettings", parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name)
   {
     TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KonqFontOptions(config, "FMSettings", false, parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name)
   {
     return new KPreviewOptions(parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
   {
     TDEConfig *config = new TDEConfig(configname(), false, false);
     return new DesktopBehaviorModule(config, parent);
   }
 
-  KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/)
   {
     TDEConfig *config = new TDEConfig(configname(), false, false);
     return new KonqFontOptions(config, "FMSettings", true, parent);
   }
 
-  KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/)
   {
     //TDEConfig *config = new TDEConfig(configname(), false, false);
     return new DesktopPathConfig(parent);
   }
 
-  KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
+  TDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
   {
     return new KDesktopConfig(parent, "VirtualDesktops");
   }
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 3b2349fc7..2e85ab609 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -130,14 +130,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
     m_maxSize->setRange( 0.2, 100, 0.2, true );
     label->setBuddy( m_maxSize );
     lay->addWidget( m_maxSize );
-    connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) );
+    connect( m_maxSize, TQ_SIGNAL( valueChanged(double) ), TQ_SLOT( changed() ) );
 
     m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this);
-    connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+    connect( m_boostSize, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
     lay->addWidget(m_boostSize);
 
     m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this);
-    connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+    connect( m_useFileThumbnails, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
 
     lay->addWidget(m_useFileThumbnails);
 
@@ -206,9 +206,9 @@ void KPreviewOptions::save()
     // Send signal to konqueror
     // Warning. In case something is added/changed here, keep kfmclient in sync
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 }
 
 TQString KPreviewOptions::handbookSection() const
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 5da14f2f5..03c805588 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -35,7 +35,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 #include <konq_defaults.h> // include default values directly from libkonq
 #include <kurlrequester.h>
@@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDesktop->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDesktop );
   lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
-  connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDesktop, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   TQString wtstr = i18n("This folder contains all the files"
                        " which you see on your desktop. You can change the location of this"
                        " folder if you want to, and the contents will move automatically"
@@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urAutostart->setMode( KFile::Directory );
   tmpLabel->setBuddy( urAutostart );
   lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
-  connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urAutostart, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder contains applications or"
                " links to applications (shortcuts) that you want to have started"
                " automatically whenever TDE starts. You can change the location of this"
@@ -109,7 +109,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDocument->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDocument );
   lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL);
-  connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDocument, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save documents from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urDocument, wtstr );
@@ -121,7 +121,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urDownload->setMode( KFile::Directory );
   tmpLabel->setBuddy( urDownload );
   lay->addMultiCellWidget(urDownload, row, row, 1, RO_LASTCOL);
-  connect(urDownload, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urDownload, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save downloads from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urDownload, wtstr );
@@ -133,7 +133,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urMusic->setMode( KFile::Directory );
   tmpLabel->setBuddy( urMusic );
   lay->addMultiCellWidget(urMusic, row, row, 1, RO_LASTCOL);
-  connect(urMusic, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urMusic, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save music from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urMusic, wtstr );
@@ -145,7 +145,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urPictures->setMode( KFile::Directory );
   tmpLabel->setBuddy( urPictures );
   lay->addMultiCellWidget(urPictures, row, row, 1, RO_LASTCOL);
-  connect(urPictures, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urPictures, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save pictures from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urPictures, wtstr );
@@ -157,7 +157,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urPublicShare->setMode( KFile::Directory );
   tmpLabel->setBuddy( urPublicShare );
   lay->addMultiCellWidget(urPublicShare, row, row, 1, RO_LASTCOL);
-  connect(urPublicShare, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urPublicShare, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save public shared files from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urPublicShare, wtstr );
@@ -169,7 +169,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urTemplates->setMode( KFile::Directory );
   tmpLabel->setBuddy( urTemplates );
   lay->addMultiCellWidget(urTemplates, row, row, 1, RO_LASTCOL);
-  connect(urTemplates, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urTemplates, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save templates from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urTemplates, wtstr );
@@ -181,7 +181,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   urVideos->setMode( KFile::Directory );
   tmpLabel->setBuddy( urVideos );
   lay->addMultiCellWidget(urVideos, row, row, 1, RO_LASTCOL);
-  connect(urVideos, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+  connect(urVideos, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
   wtstr = i18n("This folder will be used by default to load or save videos from or to.");
   TQWhatsThis::add( tmpLabel, wtstr );
   TQWhatsThis::add( urVideos, wtstr );
@@ -190,7 +190,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above
 
   loadTmr = new TQTimer(this);
-  connect(loadTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadTimerDone()));
+  connect(loadTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(loadTimerDone()));
 
   load();
 }
@@ -512,8 +512,8 @@ void DesktopPathConfig::save()
     }
 
     // Tell kdesktop about the new config file
-    if ( !kapp->dcopClient()->isAttached() )
-       kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+       tdeApp->dcopClient()->attach();
     TQByteArray data;
 
     int konq_screen_number = TDEApplication::desktop()->primaryScreen();
@@ -524,7 +524,7 @@ void DesktopPathConfig::save()
     else {
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
     }
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
 }
 
 bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQString & type )
@@ -543,8 +543,8 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             m_copyToDest = dest;
             m_copyFromSrc = src;
             TDEIO::ListJob* job = TDEIO::listDir( src );
-            connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
-                     this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
+            connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+                     this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
             tqApp->enter_loop();
 
             if (m_ok)
@@ -555,7 +555,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
         else
         {
             TDEIO::Job * job = TDEIO::move( src, dest );
-            connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+            connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
             // wait for job
             tqApp->enter_loop();
         }
@@ -583,7 +583,7 @@ void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList
         }
 
         TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest );
-        connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( moveJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
         tqApp->enter_loop();
     }
     tqApp->exit_loop();
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index c921ef64d..d06ef054f 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -18,7 +18,7 @@
 #include <tdelocale.h>
 #include <knuminput.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #endif
 
@@ -48,16 +48,16 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   m_minSize = new KIntNumInput( fMinSize, gb );
   m_minSize->setLabel( i18n( "M&inimum font size:" ) );
   m_minSize->setRange( 2, 30 );
-  connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotMinimumFontSize( int ) ) );
-  connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+  connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotMinimumFontSize( int ) ) );
+  connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) );
   TQWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than "
                                     "this size,<br>overriding any other settings" ) );
 
   m_MedSize = new KIntNumInput( m_minSize, fSize, gb );
   m_MedSize->setLabel( i18n( "&Medium font size:" ) );
   m_MedSize->setRange( 2, 30 );
-  connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotFontSize( int ) ) );
-  connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) );
+  connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotFontSize( int ) ) );
+  connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) );
   TQWhatsThis::add( m_MedSize,
                    i18n("This is the relative font size Konqueror uses "
                         "to display web sites.") );
@@ -76,14 +76,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[0], wtstr );
 
-  connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT( slotStandardFont(const TQString&) ) );
-  connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT(changed() ) );
-  connect( m_pFonts[0]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotStandardFont(const TQString&) ) );
-  connect( m_pFonts[0], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT( slotStandardFont(const TQString&) ) );
+  connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT(changed() ) );
+  connect( m_pFonts[0]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotStandardFont(const TQString&) ) );
+  connect( m_pFonts[0], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "&Fixed font:"), this );
   lay->addWidget( label, ++r, E );
@@ -97,14 +97,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[1], wtstr );
 
-  connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT( slotFixedFont(const TQString&) ) );
-  connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ),
-	   TQT_SLOT(changed() ) );
-  connect( m_pFonts[1]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotFixedFont(const TQString&) ) );
-  connect( m_pFonts[1], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT( slotFixedFont(const TQString&) ) );
+  connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ),
+	   TQ_SLOT(changed() ) );
+  connect( m_pFonts[1]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotFixedFont(const TQString&) ) );
+  connect( m_pFonts[1], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "S&erif font:" ), this );
   lay->addWidget( label, ++r, E );
@@ -118,14 +118,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[2], wtstr );
 
-  connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotSerifFont( const TQString& ) ) );
-  connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[2]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotSerifFont(const TQString&) ) );
-  connect( m_pFonts[2], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotSerifFont( const TQString& ) ) );
+  connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[2]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotSerifFont(const TQString&) ) );
+  connect( m_pFonts[2], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
   label = new TQLabel( i18n( "Sa&ns serif font:" ), this );
   lay->addWidget( label, ++r, E );
@@ -139,14 +139,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[3], wtstr );
 
-  connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotSansSerifFont( const TQString& ) ) );
-  connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[3]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotSansSerifFont(const TQString&) ) );
-  connect( m_pFonts[3], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotSansSerifFont( const TQString& ) ) );
+  connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[3]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotSansSerifFont(const TQString&) ) );
+  connect( m_pFonts[3], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "C&ursive font:" ), this );
@@ -161,14 +161,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[4], wtstr );
 
-  connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotCursiveFont( const TQString& ) ) );
-  connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[4]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotCursiveFont(const TQString&) ) );
-  connect( m_pFonts[4], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotCursiveFont( const TQString& ) ) );
+  connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[4]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotCursiveFont(const TQString&) ) );
+  connect( m_pFonts[4], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "Fantas&y font:" ), this );
@@ -183,14 +183,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pFonts[5], wtstr );
 
-  connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( slotFantasyFont( const TQString& ) ) );
-  connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ),
-	   TQT_SLOT( changed() ) );
-  connect( m_pFonts[5]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT( slotFantasyFont(const TQString&) ) );
-  connect( m_pFonts[5], TQT_SIGNAL( textChanged(const TQString&) ),
-	   TQT_SLOT(changed() ) );
+  connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( slotFantasyFont( const TQString& ) ) );
+  connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ),
+	   TQ_SLOT( changed() ) );
+  connect( m_pFonts[5]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT( slotFantasyFont(const TQString&) ) );
+  connect( m_pFonts[5], TQ_SIGNAL( textChanged(const TQString&) ),
+	   TQ_SLOT(changed() ) );
 
 
   label = new TQLabel( i18n( "Font &size adjustment for this encoding:" ), this );
@@ -200,10 +200,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label->setBuddy( m_pFontSizeAdjust );
   lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W );
 
-  connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
-	   TQT_SLOT( slotFontSizeAdjust( int ) ) );
-  connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ),
-	   TQT_SLOT( changed() ) );
+  connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ),
+	   TQ_SLOT( slotFontSizeAdjust( int ) ) );
+  connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ),
+	   TQ_SLOT( changed() ) );
 
   label = new TQLabel( i18n( "Default encoding:"), this );
   //++r;
@@ -222,10 +222,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQWhatsThis::add( label, wtstr );
   TQWhatsThis::add( m_pEncoding, wtstr );
 
-  connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
-	   TQT_SLOT( slotEncoding(const TQString&) ) );
-  connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ),
-	   TQT_SLOT( changed() ) );
+  connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ),
+	   TQ_SLOT( slotEncoding(const TQString&) ) );
+  connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ),
+	   TQ_SLOT( changed() ) );
 
   ++r; lay->setRowStretch(r, 8);
 
@@ -408,9 +408,9 @@ void KAppearanceOptions::save()
     m_pConfig->sync();
 
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
   emit changed(false);
 }
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index e6521b3b8..53433264f 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -46,33 +46,33 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title,
   domainSpecificLV = new TDEListView(this);
   domainSpecificLV->addColumn(i18n("Host/Domain"));
   domainSpecificLV->addColumn(i18n("Policy"), 100);
-  connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed()));
-  connect(domainSpecificLV,TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(changePressed()));
-  connect(domainSpecificLV, TQT_SIGNAL( executed( TQListViewItem *)), TQT_SLOT( updateButton()));
-  connect(domainSpecificLV, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButton()));
+  connect(domainSpecificLV,TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(changePressed()));
+  connect(domainSpecificLV,TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(changePressed()));
+  connect(domainSpecificLV, TQ_SIGNAL( executed( TQListViewItem *)), TQ_SLOT( updateButton()));
+  connect(domainSpecificLV, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButton()));
   thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0);
 
   addDomainPB = new TQPushButton(i18n("&New..."), this);
   thisLayout->addWidget(addDomainPB, 0, 1);
-  connect(addDomainPB, TQT_SIGNAL(clicked()), TQT_SLOT(addPressed()));
+  connect(addDomainPB, TQ_SIGNAL(clicked()), TQ_SLOT(addPressed()));
 
   changeDomainPB = new TQPushButton( i18n("Chan&ge..."), this);
   thisLayout->addWidget(changeDomainPB, 1, 1);
-  connect(changeDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(changePressed()));
+  connect(changeDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(changePressed()));
 
   deleteDomainPB = new TQPushButton(i18n("De&lete"), this);
   thisLayout->addWidget(deleteDomainPB, 2, 1);
-  connect(deleteDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(deletePressed()));
+  connect(deleteDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(deletePressed()));
 
   importDomainPB = new TQPushButton(i18n("&Import..."), this);
   thisLayout->addWidget(importDomainPB, 3, 1);
-  connect(importDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(importPressed()));
+  connect(importDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(importPressed()));
   importDomainPB->setEnabled(false);
   importDomainPB->hide();
 
   exportDomainPB = new TQPushButton(i18n("&Export..."), this);
   thisLayout->addWidget(exportDomainPB, 4, 1);
-  connect(exportDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(exportPressed()));
+  connect(exportDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(exportPressed()));
   exportDomainPB->setEnabled(false);
   exportDomainPB->hide();
 
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 6603c06ca..9b7f520ec 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -67,20 +67,20 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group,
     buttonBox->setSpacing( KDialog::spacingHint() );
 
     mInsertButton = new TQPushButton( i18n("Insert"), buttonBox );
-    connect( mInsertButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertFilter() ) );
+    connect( mInsertButton, TQ_SIGNAL( clicked() ), TQ_SLOT( insertFilter() ) );
     mUpdateButton = new TQPushButton( i18n("Update"), buttonBox );
-    connect( mUpdateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateFilter() ) );
+    connect( mUpdateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateFilter() ) );
     mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
-    connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeFilter() ) );
+    connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeFilter() ) );
 
     mImportButton = new TQPushButton(i18n("Import..."),buttonBox);
-    connect( mImportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( importFilters() ) );
+    connect( mImportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( importFilters() ) );
     mExportButton = new TQPushButton(i18n("Export..."),buttonBox);
-    connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportFilters() ) );
+    connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportFilters() ) );
 
-    connect( mEnableCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEnableChecked()));
-    connect( mKillCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotKillChecked()));
-    connect( mListBox, TQT_SIGNAL( selectionChanged ()),this, TQT_SLOT( slotItemSelected()));
+    connect( mEnableCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotEnableChecked()));
+    connect( mKillCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotKillChecked()));
+    connect( mListBox, TQ_SIGNAL( selectionChanged ()),this, TQ_SLOT( slotItemSelected()));
 
 /*
  * Whats this items
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index ed87ea349..5b5af6555 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -51,12 +51,12 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_pAdvancedAddBookmarkCheckBox = new TQCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks);
     TQWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to"
                                                         " change the title of the bookmark and choose a folder in which to store it when you add a new bookmark." ) );
-    connect(m_pAdvancedAddBookmarkCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAdvancedAddBookmarkCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pOnlyMarkedBookmarksCheckBox = new TQCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks);
     TQWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those"
                                                          " bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) );
-    connect(m_pOnlyMarkedBookmarksCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pOnlyMarkedBookmarksCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 );
     row++;
@@ -67,14 +67,14 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_pFormCompletionCheckBox = new TQCheckBox(i18n( "Enable com&pletion of forms" ), bgForm);
     TQWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember"
                                                         " the data you enter in web forms and suggest it in similar fields for all forms." ) );
-    connect(m_pFormCompletionCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pFormCompletionCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pMaxFormCompletionItems = new KIntNumInput( bgForm );
     m_pMaxFormCompletionItems->setLabel( i18n( "&Maximum completions:" ) );
     m_pMaxFormCompletionItems->setRange( 0, 100 );
     TQWhatsThis::add( m_pMaxFormCompletionItems,
         i18n( "Here you can select how many values Konqueror will remember for a form field." ) );
-    connect(m_pMaxFormCompletionItems, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+    connect(m_pMaxFormCompletionItems, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgForm, row, row, 0, 1 );
     row++;
@@ -86,19 +86,19 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
     m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
     TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
        "(usually to a hand) if it is moved over a hyperlink.") );
-    connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_cbCursor, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pOpenMiddleClick = new TQCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse );
     TQWhatsThis::add( m_pOpenMiddleClick, i18n (
       "If this box is checked, you can open the URL in the selection by middle clicking on a "
       "Konqueror view." ) );
-    connect(m_pOpenMiddleClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pOpenMiddleClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     m_pBackRightClick = new TQCheckBox( i18n( "Right click goes &back in history" ), bgMouse );
     TQWhatsThis::add( m_pBackRightClick, i18n(
       "If this box is checked, you can go back in history by right clicking on a Konqueror view. "
       "To access the context menu, press the right mouse button and move." ) );
-    connect(m_pBackRightClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pBackRightClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
     lay->addMultiCellWidget( bgMouse, row, row, 0, 1 );
     row++;
@@ -107,26 +107,26 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 
     m_pAutoLoadImagesCheckBox = new TQCheckBox( i18n( "A&utomatically load images"), this );
     TQWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
-    connect(m_pAutoLoadImagesCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAutoLoadImagesCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 );
     row++;
 
     m_pEnableFavIconCheckBox = new TQCheckBox( i18n( "Enable &favicons"), this );
     TQWhatsThis::add( m_pEnableFavIconCheckBox, i18n( "If this box is checked, Konqueror will automatically load and display favicon images that are associated with a web page. These images appear in the Location bar. Otherwise a generic image will appear." ) );
-    connect(m_pEnableFavIconCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pEnableFavIconCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pEnableFavIconCheckBox, row, row, 0, 1 );
     row++;
 
     m_pUnfinishedImageFrameCheckBox = new TQCheckBox( i18n( "Dra&w frame around not completely loaded images"), this );
     TQWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) );
-    connect(m_pUnfinishedImageFrameCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pUnfinishedImageFrameCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 );
     row++;
 
     m_pAutoRedirectCheckBox = new TQCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this );
     TQWhatsThis::add( m_pAutoRedirectCheckBox,
     i18n( "Some web pages request an automatic reload or redirection after a certain period of time. By unchecking this box Konqueror will ignore these requests." ) );
-    connect(m_pAutoRedirectCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+    connect(m_pAutoRedirectCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
     lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 );
     row++;
 
@@ -153,7 +153,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "</ul><br><i>Note: The site's CSS definitions can override this value</i>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pUnderlineCombo, whatsThis);
-    connect(m_pUnderlineCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pUnderlineCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
 
 
@@ -172,7 +172,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "<li><b>Show only once</b>: Show all animations completely but do not repeat them.</li></ul>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pAnimationsCombo, whatsThis);
-    connect(m_pAnimationsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pAnimationsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
     label = new TQLabel( i18n("Sm&ooth scrolling"), this);
     m_pSmoothScrollingCombo = new TQComboBox( false, this );
@@ -190,7 +190,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *
 	    "</ul>");
     TQWhatsThis::add( label, whatsThis);
     TQWhatsThis::add( m_pSmoothScrollingCombo, whatsThis);
-    connect(m_pSmoothScrollingCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
+    connect(m_pSmoothScrollingCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
 
 
     lay->setRowStretch(row, 1);
@@ -362,9 +362,9 @@ void KMiscHTMLOptions::save()
     kdeglobals.sync();
 
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     emit changed(false);
 }
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 6a702559e..2a0c15069 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -62,15 +62,15 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
     TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this );
     toplevel->addWidget( globalGB );
     enableJavaGloballyCB = new TQCheckBox( i18n( "Enable Ja&va globally" ), globalGB );
-    connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleJavaControls() ) );
+    connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleJavaControls() ) );
 
 
     /***************************************************************************
      ***************** Domain Specific Settings ********************************
      **************************************************************************/
     domainSpecific = new JavaDomainListView(m_pConfig,m_groupname,this,this);
-    connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
+    connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged()));
     toplevel->addWidget( domainSpecific, 2 );
 
     /***************************************************************************
@@ -84,37 +84,37 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
 
     javaSecurityManagerCB = new TQCheckBox( i18n("&Use security manager" ), checkboxes );
     grid->addWidget( javaSecurityManagerCB, 0, 0 );
-    connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
+    connect( javaSecurityManagerCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
 
     useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes );
     grid->addWidget( useKioCB, 0, 1 );
-    connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
+    connect( useKioCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
 
     enableShutdownCB = new TQCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes );
     grid->addWidget( enableShutdownCB, 1, 0 );
-    connect( enableShutdownCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) );
-    connect( enableShutdownCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleJavaControls()) );
+    connect( enableShutdownCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) );
+    connect( enableShutdownCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleJavaControls()) );
 
     TQHBox* secondsHB = new TQHBox( javartGB );
     serverTimeoutSB = new KIntNumInput( secondsHB );
     serverTimeoutSB->setRange( 0, 1000, 5 );
     serverTimeoutSB->setLabel( i18n("App&let server timeout:"), AlignLeft );
     serverTimeoutSB->setSuffix(i18n(" sec"));
-    connect(serverTimeoutSB, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged()));
+    connect(serverTimeoutSB, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged()));
 
     TQHBox* pathHB = new TQHBox( javartGB );
     pathHB->setSpacing( 10 );
     TQLabel* pathLA = new TQLabel( i18n( "&Path to Java executable, or 'java':" ),
                                  pathHB );
     pathED = new  KURLRequester( pathHB );
-    connect( pathED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
+    connect( pathED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) );
     pathLA->setBuddy( pathED );
 
     TQHBox* addArgHB = new TQHBox( javartGB );
     addArgHB->setSpacing( 10 );
     TQLabel* addArgLA = new TQLabel( i18n( "Additional Java a&rguments:" ), addArgHB  );
     addArgED = new TQLineEdit( addArgHB );
-    connect( addArgED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) );
+    connect( addArgED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) );
     addArgLA->setBuddy( addArgED );
 
     /***************************************************************************
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index ebbf7c4aa..8b3b40f4f 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 
-#if defined Q_WS_X11 && !defined K_WS_QTONLY
+#if defined TQ_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #endif
 
@@ -52,21 +52,21 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
   TQWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script "
         "(also known as JavaScript) that can be contained in HTML pages. "
         "Note that, as with any browser, enabling scripting languages can be a security problem.") );
-  connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
-  connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeJSEnabled() ) );
+  connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
+  connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeJSEnabled() ) );
 
   reportErrorsCB = new TQCheckBox( i18n( "Report &errors" ), globalGB );
   TQWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript "
 	"code is executed.") );
-  connect( reportErrorsCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
+  connect( reportErrorsCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
 
   jsDebugWindow = new TQCheckBox( i18n( "Enable debu&gger" ), globalGB );
   TQWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) );
-  connect( jsDebugWindow, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) );
+  connect( jsDebugWindow, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) );
 
   // the domain-specific listview
   domainSpecific = new JSDomainListView(m_pConfig,m_groupname,this,this);
-  connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(changed()));
+  connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(changed()));
   toplevel->addWidget( domainSpecific, 2 );
 
   TQWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular "
@@ -97,7 +97,7 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
   js_policies_frame = new JSPoliciesFrame(&js_global_policies,
   		i18n("Global JavaScript Policies"),this);
   toplevel->addWidget(js_policies_frame);
-  connect(js_policies_frame, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+  connect(js_policies_frame, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
 
   // Finally do the loading
   load();
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 07a0cbea6..c24cd356e 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -197,7 +197,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
                "window.open()</i> for proper operation. Use "
                "this feature carefully.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_popup, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowOpenPolicy(int)));
+  connect(js_popup, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowOpenPolicy(int)));
 
   // === window.resizeBy/resizeTo ================================
   colIdx = 0;
@@ -235,7 +235,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_resize, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowResizePolicy(int)));
+  connect(js_resize, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowResizePolicy(int)));
 
   // === window.moveBy/moveTo ================================
   colIdx = 0;
@@ -273,7 +273,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_move, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowMovePolicy(int)));
+  connect(js_move, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowMovePolicy(int)));
 
   // === window.focus ================================
   colIdx = 0;
@@ -314,7 +314,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_focus, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowFocusPolicy(int)));
+  connect(js_focus, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowFocusPolicy(int)));
 
   // === window.status ================================
   colIdx = 0;
@@ -354,7 +354,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int)));
+  connect(js_statusbar, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowStatusPolicy(int)));
 }
 
 JSPoliciesFrame::~JSPoliciesFrame() {
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index 7272e6e93..68bbcab92 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -17,16 +17,16 @@ KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent,
 
   le_languages = new TQLineEdit(this);
   lay->addWidget( le_languages );
-  connect(le_languages, TQT_SIGNAL(textChanged(const TQString&)),
-	  this, TQT_SLOT(slotChanged()));
+  connect(le_languages, TQ_SIGNAL(textChanged(const TQString&)),
+	  this, TQ_SLOT(slotChanged()));
 
   lay->addSpacing(10);
   lay->addWidget( new TQLabel(i18n("Accept character sets:"), this) );
 
   le_charsets = new TQLineEdit(this);
   lay->addWidget( le_charsets );
-  connect(le_charsets, TQT_SIGNAL(textChanged(const TQString&)),
-	  this, TQT_SLOT(slotChanged()));
+  connect(le_charsets, TQ_SIGNAL(textChanged(const TQString&)),
+	  this, TQ_SLOT(slotChanged()));
 
   lay->addStretch(10);
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index a752a3a88..8ee037a8d 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -44,37 +44,37 @@
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KAppearanceOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
+	TDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KJSParts(c, parent, "kcmkonqhtml");
 	}
 
-	KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
 	}
 
-  KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
+  TDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
   {
     TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
     return new KCMFilter(c, "Filter Settings", parent, name);
   }
 
-  KDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name )
+  TDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name )
   {
     TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
     return new userInterConfig(c, "FMSettings", parent, name);
@@ -111,11 +111,11 @@ KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name)
   // ### the groupname is duplicated in KJSParts::save
   java = new KJavaOptions( config, "Java/JavaScript Settings", this, name );
   tab->addTab( java, i18n( "&Java" ) );
-  connect( java, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( java, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 
   javascript = new KJavaScriptOptions( config, "Java/JavaScript Settings", this, name );
   tab->addTab( javascript, i18n( "Java&Script" ) );
-  connect( javascript, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( javascript, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
 }
 
 KJSParts::~KJSParts()
@@ -149,9 +149,9 @@ void KJSParts::save()
   // Send signal to konqueror
   // Warning. In case something is added/changed here, keep kfmclient in sync
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 }
 
 
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index 547182f2d..412fbe0b8 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -22,8 +22,8 @@
 #include <tdelistview.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocio.h>
-#include <kstandarddirs.h>
+#include <tdeprocio.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "htmlopts.h"
@@ -63,12 +63,12 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
     enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB );
     priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB);
     priority = new TQSlider(5, 100, 5, 100, TQt::Horizontal, globalGB);
-    connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) );
-    connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( enableUserDemand, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
-    connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
-    connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( updatePLabel(int) ) );
+    connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTogglePluginsEnabled() ) );
+    connect( enableHTTPOnly, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( enableUserDemand, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) );
+    connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) );
+    connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( updatePLabel(int) ) );
 
     TQFrame *hrule = new TQFrame(globalGB);
     hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
@@ -80,7 +80,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
     TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
     						globalGB);
     domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
-    connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
+    connect(domainSpecPB,TQ_SIGNAL(clicked()),TQ_SLOT(slotShowDomainDlg()));
 
     domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
     			i18n("Domain-Specific Policies"),KDialogBase::Close,
@@ -88,7 +88,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
 
     domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg);
     domainSpecific->setMinimumSize(320,200);
-    connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged()));
+    connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged()));
 
     domainSpecificDlg->setMainWidget(domainSpecific);
 
@@ -134,8 +134,8 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
 	m_widget->dirEdit->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory);
 
     // setup widgets
-    connect( m_widget->scanAtStartup, TQT_SIGNAL(clicked()), TQT_SLOT(change()) );
-    connect( m_widget->scanButton, TQT_SIGNAL(clicked()), TQT_SLOT(scan()) );
+    connect( m_widget->scanAtStartup, TQ_SIGNAL(clicked()), TQ_SLOT(change()) );
+    connect( m_widget->scanButton, TQ_SIGNAL(clicked()), TQ_SLOT(scan()) );
 
     m_changed = false;
 
@@ -230,9 +230,9 @@ void KPluginOptions::save()
     			// instantly
 
   TQByteArray data;
-  if ( !kapp->dcopClient()->isAttached() )
-    kapp->dcopClient()->attach();
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+  if ( !tdeApp->dcopClient()->isAttached() )
+    tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
 /*****************************************************************************/
 
@@ -291,7 +291,7 @@ void KPluginOptions::scan()
              save();
     }
 
-    m_nspluginscan = new KProcIO;
+    m_nspluginscan = new TDEProcIO;
     TQString scanExe = TDEGlobal::dirs()->findExe("nspluginscan");
     if (!scanExe) {
         kdDebug() << "can't find nspluginviewer" << endl;
@@ -312,16 +312,16 @@ void KPluginOptions::scan()
     // start nspluginscan
     *m_nspluginscan << scanExe << "--verbose";
     kdDebug() << "Running nspluginscan" << endl;
-    connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)),
-            this, TQT_SLOT(progress(KProcIO*)));
-    connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(scanDone()));
-    connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone()));
+    connect(m_nspluginscan, TQ_SIGNAL(readReady(TDEProcIO*)),
+            this, TQ_SLOT(progress(TDEProcIO*)));
+    connect(m_nspluginscan, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(scanDone()));
+    connect(m_progress, TQ_SIGNAL(cancelled()), this, TQ_SLOT(scanDone()));
 
     m_nspluginscan->start();
 }
 
-void KPluginOptions::progress(KProcIO *proc)
+void KPluginOptions::progress(TDEProcIO *proc)
 {
     TQString line;
     while(proc->readln(line) > 0)
@@ -345,22 +345,22 @@ void KPluginOptions::scanDone()
 void KPluginOptions::dirInit()
 {
     m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder"));
-    connect( m_widget->dirNew, TQT_SIGNAL(clicked()), TQT_SLOT(dirNew()));
-    connect( m_widget->dirRemove, TQT_SIGNAL(clicked()), TQT_SLOT(dirRemove()));
-    connect( m_widget->dirUp, TQT_SIGNAL(clicked()), TQT_SLOT(dirUp()));
-    connect( m_widget->dirDown, TQT_SIGNAL(clicked()), TQT_SLOT(dirDown()) );
-    connect( m_widget->useArtsdsp, TQT_SIGNAL(clicked()),TQT_SLOT(change()));
+    connect( m_widget->dirNew, TQ_SIGNAL(clicked()), TQ_SLOT(dirNew()));
+    connect( m_widget->dirRemove, TQ_SIGNAL(clicked()), TQ_SLOT(dirRemove()));
+    connect( m_widget->dirUp, TQ_SIGNAL(clicked()), TQ_SLOT(dirUp()));
+    connect( m_widget->dirDown, TQ_SIGNAL(clicked()), TQ_SLOT(dirDown()) );
+    connect( m_widget->useArtsdsp, TQ_SIGNAL(clicked()),TQ_SLOT(change()));
     connect( m_widget->dirEdit,
-             TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(dirEdited(const TQString &)) );
+             TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(dirEdited(const TQString &)) );
 
     connect( m_widget->dirList,
-             TQT_SIGNAL(executed(TQListBoxItem*)),
-             TQT_SLOT(dirSelect(TQListBoxItem*)) );
+             TQ_SIGNAL(executed(TQListBoxItem*)),
+             TQ_SLOT(dirSelect(TQListBoxItem*)) );
 
     connect( m_widget->dirList,
-             TQT_SIGNAL(selectionChanged(TQListBoxItem*)),
-             TQT_SLOT(dirSelect(TQListBoxItem*)) );
+             TQ_SIGNAL(selectionChanged(TQListBoxItem*)),
+             TQ_SLOT(dirSelect(TQListBoxItem*)) );
 }
 
 
@@ -555,7 +555,7 @@ void KPluginOptions::pluginLoad( TDEConfig* /*config*/ )
             continue;
         }
 
-        TQStringList desc = TQStringList::split(':', line, TRUE);
+        TQStringList desc = TQStringList::split(':', line, true);
         TQString mime = desc[0].stripWhiteSpace();
         TQString name = desc[2];
         TQString suffixes = desc[1];
@@ -605,7 +605,7 @@ PluginDomainDialog::PluginDomainDialog(TQWidget *parent) :
   hl->addStretch(10);
 
   TQPushButton *closePB = new KPushButton(KStdGuiItem::close(),this);
-  connect(closePB,TQT_SIGNAL(clicked()),TQT_SLOT(slotClose()));
+  connect(closePB,TQ_SIGNAL(clicked()),TQ_SLOT(slotClose()));
   hl->addWidget(closePB);
   thisLayout->addLayout(hl);
 }
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index aa060f311..3d87597af 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -28,7 +28,7 @@ class TQProgressDialog;
 class TQSlider;
 class KDialogBase;
 class KPluginOptions;
-class KProcIO;
+class TDEProcIO;
 
 /** policies with plugin-specific constructor
   */
@@ -118,7 +118,7 @@ private:
 
 
  protected slots:
-  void progress(KProcIO *);
+  void progress(TDEProcIO *);
   void updatePLabel(int);
   void change() { change( true ); };
   void change( bool c ) { emit changed(c); m_changed = c; };
@@ -130,7 +130,7 @@ private:
   NSConfigWidget *m_widget;
   bool m_changed;
   TQProgressDialog *m_progress;
-  KProcIO* m_nspluginscan;
+  TDEProcIO* m_nspluginscan;
   TQSlider *priority;
   TQLabel *priorityLabel;
   PluginPolicies global_policies;
diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp
index 9409023c1..03720f140 100644
--- a/kcontrol/konqhtml/policydlg.cpp
+++ b/kcontrol/konqhtml/policydlg.cpp
@@ -34,8 +34,8 @@ PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *na
   le_domain = new TQLineEdit(main);
   l->setBuddy( le_domain );
   grid->addWidget(le_domain, 0, 1);
-  connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )),
-      TQT_SLOT(slotTextChanged( const TQString &)));
+  connect( le_domain,TQ_SIGNAL(textChanged( const TQString & )),
+      TQ_SLOT(slotTextChanged( const TQString &)));
 
   TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.trinitydesktop.org) "
                                   "or a domain, starting with a dot (like .trinitydesktop.org or .org)") );
diff --git a/kcontrol/konqhtml/userInterConfig.cpp b/kcontrol/konqhtml/userInterConfig.cpp
index 4e18c6d38..d63512590 100644
--- a/kcontrol/konqhtml/userInterConfig.cpp
+++ b/kcontrol/konqhtml/userInterConfig.cpp
@@ -36,11 +36,11 @@ userInterConfig::userInterConfig(TDEConfig *config, TQString groupName,
     layout->addWidget(m_widget);
     layout->addStretch();
 
-    connect(m_widget, TQT_SIGNAL(changed()),
-            this, TQT_SLOT(changed()));
+    connect(m_widget, TQ_SIGNAL(changed()),
+            this, TQ_SLOT(changed()));
 
     load();
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 void userInterConfig::notChanged()
@@ -68,5 +68,5 @@ void userInterConfig::defaults()
     // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
-    TQTimer::singleShot(0, this, TQT_SLOT(changed()));
+    TQTimer::singleShot(0, this, TQ_SLOT(changed()));
 }
diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp
index efe3c7343..f61f16488 100644
--- a/kcontrol/konqhtml/userInterOpts_impl.cpp
+++ b/kcontrol/konqhtml/userInterOpts_impl.cpp
@@ -39,17 +39,17 @@ userInterOpts::userInterOpts(TDEConfig *config, TQString groupName,
     : userInterOptsBase(parent, name), m_pConfig(config), m_groupName(groupName)
 {
     // connections
-    connect(m_pShowMMBInTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pDynamicTabbarHide, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pDynamicTabbarCycle, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pNewTabsInBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pOpenAfterCurrentPage, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pTabConfirm, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pPermanentCloseButton, TQT_SIGNAL(toggled(bool)),  TQT_SLOT(slotChanged()));
-    connect(m_pHoverCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pKonquerorTabforExternalURL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pPopupsWithinTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-    connect(m_pTabCloseActivatePrevious, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(m_pShowMMBInTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pDynamicTabbarHide, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pDynamicTabbarCycle, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pNewTabsInBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pOpenAfterCurrentPage, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pTabConfirm, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pPermanentCloseButton, TQ_SIGNAL(toggled(bool)),  TQ_SLOT(slotChanged()));
+    connect(m_pHoverCloseButton, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pKonquerorTabforExternalURL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pPopupsWithinTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+    connect(m_pTabCloseActivatePrevious, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 }
 
 void userInterOpts::load()
@@ -104,9 +104,9 @@ void userInterOpts::save()
     else m_pConfig->writeEntry( "MultipleTabConfirm", true );
 
     TQByteArray data;
-    if ( !TDEApplication::kApplication()->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    TDEApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 
     if ( m_pPermanentCloseButton->isChecked() )
       m_pHoverCloseButton->setEnabled(false);
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 7dfb77dae..28cec6825 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -60,28 +60,28 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
     ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org");
     setAboutData( ab );
 
-    connect(dialog->terminalSizeHintCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->warnCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->ctrldragCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->cutToBeginningOfLineCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->allowResizeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->bidiCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->xonXoffCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->blinkingCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
-    connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->tabsCycleWheelCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->menuAcceleratorsCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->realTransparency,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
-    connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
-    connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));
-    connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
-    connect(dialog->SessionEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
-    connect(dialog->SchemaEditor1, TQT_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)),
-            dialog->SessionEditor1, TQT_SLOT(schemaListChanged(const TQStringList &,const TQStringList &)));
-    connect(dialog->SessionEditor1, TQT_SIGNAL(getList()), dialog->SchemaEditor1, TQT_SLOT(getList()));
+    connect(dialog->terminalSizeHintCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->warnCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->ctrldragCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->cutToBeginningOfLineCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->allowResizeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->bidiCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->xonXoffCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->blinkingCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->frameCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->line_spacingSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() ));
+    connect(dialog->matchTabWinTitleCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->tabsCycleWheelCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->menuAcceleratorsCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->metaAsAltModeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->realTransparency,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
+    connect(dialog->silence_secondsSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() ));
+    connect(dialog->word_connectorLE,TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT( changed() ));
+    connect(dialog->SchemaEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
+    connect(dialog->SessionEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
+    connect(dialog->SchemaEditor1, TQ_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)),
+            dialog->SessionEditor1, TQ_SLOT(schemaListChanged(const TQStringList &,const TQStringList &)));
+    connect(dialog->SessionEditor1, TQ_SIGNAL(getList()), dialog->SchemaEditor1, TQ_SLOT(getList()));
 }
 
 void KCMKonsole::load()
@@ -165,7 +165,7 @@ void KCMKonsole::save()
 
     emit changed(false);
 
-    DCOPClient *dcc = kapp->dcopClient();
+    DCOPClient *dcc = tdeApp->dcopClient();
     dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray());
     dcc->send("kdesktop", "default", "configure()", TQByteArray());
     dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray());
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index dfa4dbefe..81fc2adff 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -29,7 +29,7 @@
 #include <tqcombobox.h>
 #include <kdebug.h>
 #include <tqcheckbox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 //#include <errno.h>
 
@@ -75,9 +75,9 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
     defaultSchema = "";
     spix = new TDESharedPixmap;
 
-    connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool)));
+    connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool)));
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
     TQByteArray data;
@@ -94,29 +94,29 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name)
 
 
     TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations
-    connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect()));
-    connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
-    connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
-    connect(colorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColorChanged(int)));
-    connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int)));
-    connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
-    connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updatePreview()));
-    connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updatePreview()));
-    connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updatePreview()));
-    connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updatePreview()));
-
-    connect(titleLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
-    connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
-    connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(schemaModified()));
-    connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
-    connect(modeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(schemaModified()));
-    connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(schemaModified()));
-    connect(transparentCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
-    connect(boldCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified()));
-    connect(colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified()));
-    connect(backgndLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified()));
-
-    connect(defaultSchemaCB, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()));
+    connect(imageBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(imageSelect()));
+    connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent()));
+    connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent()));
+    connect(colorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotColorChanged(int)));
+    connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTypeChanged(int)));
+    connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
+    connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updatePreview()));
+    connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updatePreview()));
+    connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updatePreview()));
+    connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updatePreview()));
+
+    connect(titleLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified()));
+    connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified()));
+    connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(schemaModified()));
+    connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+    connect(modeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(schemaModified()));
+    connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(schemaModified()));
+    connect(transparentCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+    connect(boldCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified()));
+    connect(colorButton, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified()));
+    connect(backgndLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified()));
+
+    connect(defaultSchemaCB, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
     removeButton->setEnabled( schemaList->currentItem() );
 }
 
@@ -230,7 +230,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile)
 {
     TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema");
     TQStringList::ConstIterator it;
-    disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+    disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
     schemaList->clear();
 
     TQListBoxItem* currentItem = 0;
@@ -253,7 +253,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile)
     schemaList->sort();
     schemaList->setCurrentItem(0);   // select the first added item correctly too
     schemaList->setCurrentItem(currentItem);
-    connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+    connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
     schemaListChanged();
 }
 
@@ -528,11 +528,11 @@ void SchemaEditor::readSchema(int num)
 	}
 
 	if(schMod) {
-	    disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+	    disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
 	    schemaList->setCurrentItem(oldSchema);
 	    querySave();
 	    schemaList->setCurrentItem(num);
-	    connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int)));
+	    connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int)));
 	    schMod=false;
 	}
 
@@ -666,7 +666,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->palette().active().text();
+		color[fi] = tdeApp->palette().active().text();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 1;
@@ -681,7 +681,7 @@ void SchemaEditor::readSchema(int num)
 		    continue;
 		if (!(0 <= bo && bo <= 1))
 		    continue;
-		color[fi] = kapp->palette().active().base();
+		color[fi] = tdeApp->palette().active().base();
 		transparent[fi] = tr;
 		bold[fi] = bo;
 		type[fi] = 2;
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 290541d12..15e47d657 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -21,7 +21,7 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdelocale.h>
 #include <tdefiledialog.h>
@@ -60,20 +60,20 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name)
   TDEGlobal::iconLoader()->addAppDir( "konsole" );
 
   directoryLine->setMode(KFile::Directory);
-  connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
-  connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent()));
-  connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent()));
+  connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
+  connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent()));
+  connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent()));
 
-  connect(nameLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
-  connect(directoryLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
-  connect(executeLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
-  connect(termLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified()));
+  connect(nameLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+  connect(directoryLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+  connect(executeLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
+  connect(termLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified()));
 
-  connect(previewIcon, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(sessionModified()));
+  connect(previewIcon, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(sessionModified()));
 
-  connect(fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
-  connect(keytabCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
-  connect(schemaCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified()));
+  connect(fontCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
+  connect(keytabCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
+  connect(schemaCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified()));
 }
 
 SessionEditor::~SessionEditor()
@@ -167,7 +167,7 @@ void SessionEditor::loadAllSession(TQString currentFile)
 
     TQString name = (*it);
 
-    KSimpleConfig* co = new KSimpleConfig(name,true);
+    TDESimpleConfig* co = new TDESimpleConfig(name,true);
     co->setDesktopGroup();
     TQString sesname = co->readEntry("Name",i18n("Unnamed"));
     delete co;
@@ -187,21 +187,21 @@ void SessionEditor::readSession(int num)
 {
     int i,counter;
     TQString str;
-    KSimpleConfig* co;
+    TDESimpleConfig* co;
 
     if(sesMod) {
-        disconnect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
+        disconnect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
 
         sessionList->setCurrentItem(oldSession);
         querySave();
         sessionList->setCurrentItem(num);
-        connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int)));
+        connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int)));
         sesMod=false;
     }
     if( sessionList->item(num) )
     {
         removeButton->setEnabled( TQFileInfo ( ((SessionListBoxText *)sessionList->item(num))->filename() ).isWritable () );
-        co = new KSimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true);
+        co = new TDESimpleConfig( ((SessionListBoxText *)sessionList->item(num))->filename(),true);
 
         co->setDesktopGroup();
         str = co->readEntry("Name");
@@ -328,7 +328,7 @@ void SessionEditor::saveCurrent()
   if (fullpath[0] != '/')
     fullpath = TDEGlobal::dirs()->saveLocation("data", "konsole/") + fullpath;
 
-  KSimpleConfig* co = new KSimpleConfig(fullpath);
+  TDESimpleConfig* co = new TDESimpleConfig(fullpath);
   co->setDesktopGroup();
   co->writeEntry("Type","KonsoleApplication");
   co->writeEntry("Name",nameLine->text());
diff --git a/kcontrol/krdb/kcs/CMakeLists.txt b/kcontrol/krdb/kcs/CMakeLists.txt
index b93dc018a..176ddd6f5 100644
--- a/kcontrol/krdb/kcs/CMakeLists.txt
+++ b/kcontrol/krdb/kcs/CMakeLists.txt
@@ -9,16 +9,9 @@
 #
 #################################################
 
+file( GLOB _color_schemes_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.kcsrc )
 tde_create_translated_desktop(
-  SOURCE
-    AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc
-    CDE.kcsrc DarkBlue.kcsrc DesertRed.kcsrc DigitalCDE.kcsrc
-    PaleGray.kcsrc Pumpkin.kcsrc SolarisCDE.kcsrc Storm.kcsrc
-    Windows2000.kcsrc System.kcsrc Next.kcsrc PointReyesGreen.kcsrc
-    KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc
-    WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc
-    BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc
-    Human.kcsrc Last.fm.kcsrc Lizard.kcsrc Sienna.kcsrc Platinum.kcsrc WedgieWeb.kcsrc
+  SOURCE ${_color_schemes_files}
   DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes
   PO_DIR kcontrol-color-schemes
 )
diff --git a/kcontrol/krdb/kcs/Different.kcsrc b/kcontrol/krdb/kcs/Different.kcsrc
new file mode 100644
index 000000000..a846ee727
--- /dev/null
+++ b/kcontrol/krdb/kcs/Different.kcsrc
@@ -0,0 +1,22 @@
+[Color Scheme]
+Name=Different
+activeBackground=178,77,122
+activeBlend=174,178,195
+activeForeground=255,255,255
+activeTitleBtnBg=174,178,195
+alternateBackground=138,142,155
+background=7,191,237
+buttonBackground=255,251,225
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+inactiveBackground=174,178,195
+inactiveBlend=174,178,195
+inactiveForeground=0,0,0
+inactiveTitleBtnBg=174,178,195
+linkColor=0,0,255
+selectBackground=255,251,225
+selectForeground=0,0,0
+visitedLinkColor=255,9,9
+windowBackground=148,220,254
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Amethyst.kcsrc b/kcontrol/krdb/kcs/Jewels-Amethyst.kcsrc
new file mode 100644
index 000000000..97616f08f
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Amethyst.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Amethyst
+activeBackground=153,102,204
+activeBlend=167,116,218
+activeForeground=255,255,255
+activeTitleBtnBg=153,102,204
+alternateBackground=255,240,255
+background=247,216,255
+buttonBackground=242,201,254
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=153,102,204
+handle=153,102,204
+inactiveBackground=255,164,255
+inactiveBlend=251,190,255
+inactiveForeground=128,128,128
+inactiveFrame=255,164,255
+inactiveHandle=255,164,255
+inactiveTitleBtnBg=255,164,255
+linkColor=0,0,192
+selectBackground=153,102,204
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=255,240,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Aquamarine.kcsrc b/kcontrol/krdb/kcs/Jewels-Aquamarine.kcsrc
new file mode 100644
index 000000000..29346c2fc
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Aquamarine.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Aquamarine
+activeBackground=127,255,212
+activeBlend=157,255,212
+activeForeground=0,0,0
+activeTitleBtnBg=127,255,212
+alternateBackground=240,255,255
+background=216,255,255
+buttonBackground=201,255,254
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=127,255,212
+handle=127,255,212
+inactiveBackground=159,255,255
+inactiveBlend=187,255,255
+inactiveForeground=128,128,128
+inactiveFrame=159,255,255
+inactiveHandle=159,255,255
+inactiveTitleBtnBg=159,255,255
+linkColor=0,0,192
+selectBackground=127,255,212
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=240,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Carbon.kcsrc b/kcontrol/krdb/kcs/Jewels-Carbon.kcsrc
new file mode 100644
index 000000000..60259453a
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Carbon.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Carbon
+activeBackground=19,14,10
+activeBlend=33,28,24
+activeForeground=255,255,255
+activeTitleBtnBg=19,14,10
+alternateBackground=252,252,252
+background=236,236,236
+buttonBackground=225,225,225
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=19,14,10
+handle=19,14,10
+inactiveBackground=33,28,24
+inactiveBlend=177,177,177
+inactiveForeground=175,175,175
+inactiveFrame=33,28,24
+inactiveHandle=33,28,24
+inactiveTitleBtnBg=33,28,24
+linkColor=0,0,192
+selectBackground=19,14,10
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=252,252,252
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Citrin.kcsrc b/kcontrol/krdb/kcs/Jewels-Citrin.kcsrc
new file mode 100644
index 000000000..ba896ece3
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Citrin.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Citrin
+activeBackground=228,208,10
+activeBlend=246,223,4
+activeForeground=0,0,0
+activeTitleBtnBg=228,208,10
+alternateBackground=255,255,239
+background=255,255,216
+buttonBackground=255,255,216
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=228,208,10
+handle=228,208,10
+inactiveBackground=255,254,144
+inactiveBlend=255,255,238
+inactiveForeground=128,128,128
+inactiveFrame=255,254,144
+inactiveHandle=255,254,144
+inactiveTitleBtnBg=255,254,144
+linkColor=0,0,192
+selectBackground=228,208,10
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=255,255,239
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Emerald.kcsrc b/kcontrol/krdb/kcs/Jewels-Emerald.kcsrc
new file mode 100644
index 000000000..1b0c1a83f
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Emerald.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Emerald
+activeBackground=80,200,120
+activeBlend=107,200,120
+activeForeground=255,255,255
+activeTitleBtnBg=80,200,120
+alternateBackground=240,255,240
+background=216,255,216
+buttonBackground=200,254,201
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=80,200,120
+handle=80,200,120
+inactiveBackground=152,255,159
+inactiveBlend=184,255,187
+inactiveForeground=128,128,128
+inactiveFrame=152,255,159
+inactiveHandle=152,255,159
+inactiveTitleBtnBg=152,255,159
+linkColor=0,0,192
+selectBackground=80,200,120
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=240,255,240
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Ruby.kcsrc b/kcontrol/krdb/kcs/Jewels-Ruby.kcsrc
new file mode 100644
index 000000000..d3c614b12
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Ruby.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Ruby
+activeBackground=224,17,95
+activeBlend=224,44,95
+activeForeground=255,255,255
+activeTitleBtnBg=224,17,95
+alternateBackground=255,240,240
+background=255,216,216
+buttonBackground=254,199,201
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=224,17,95
+handle=224,17,95
+inactiveBackground=255,159,152
+inactiveBlend=255,187,184
+inactiveForeground=128,128,128
+inactiveFrame=255,159,152
+inactiveHandle=255,159,152
+inactiveTitleBtnBg=255,159,152
+linkColor=0,0,192
+selectBackground=224,17,95
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=255,240,240
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Sapphire.kcsrc b/kcontrol/krdb/kcs/Jewels-Sapphire.kcsrc
new file mode 100644
index 000000000..2d9adf6b6
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Sapphire.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Sapphire
+activeBackground=1,49,180
+activeBlend=31,75,180
+activeForeground=255,255,255
+activeTitleBtnBg=1,49,180
+alternateBackground=240,240,255
+background=216,216,255
+buttonBackground=199,200,253
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=1,49,180
+handle=1,49,180
+inactiveBackground=152,159,255
+inactiveBlend=184,187,255
+inactiveForeground=128,128,128
+inactiveFrame=152,159,255
+inactiveHandle=152,159,255
+inactiveTitleBtnBg=152,159,255
+linkColor=0,0,192
+selectBackground=1,49,180
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=240,240,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Jewels-Topaz.kcsrc b/kcontrol/krdb/kcs/Jewels-Topaz.kcsrc
new file mode 100644
index 000000000..1ebff844b
--- /dev/null
+++ b/kcontrol/krdb/kcs/Jewels-Topaz.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Jewels - Topaz
+activeBackground=147,65,8
+activeBlend=162,78,8
+activeForeground=255,255,255
+activeTitleBtnBg=147,65,8
+alternateBackground=255,249,242
+background=255,241,216
+buttonBackground=253,233,199
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=147,65,8
+handle=147,65,8
+inactiveBackground=255,221,160
+inactiveBlend=255,231,188
+inactiveForeground=128,128,128
+inactiveFrame=255,221,160
+inactiveHandle=255,221,160
+inactiveTitleBtnBg=255,221,160
+linkColor=0,0,192
+selectBackground=147,65,8
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=255,249,242
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Lila.kcsrc b/kcontrol/krdb/kcs/Lila.kcsrc
new file mode 100644
index 000000000..c5cf64159
--- /dev/null
+++ b/kcontrol/krdb/kcs/Lila.kcsrc
@@ -0,0 +1,26 @@
+[Color Scheme]
+Name=Lila
+activeBackground=70,53,124
+activeBlend=221,218,236
+activeForeground=160,160,208
+activeTitleBtnBg=220,220,220
+alternateBackground=221,221,255
+background=236,230,238
+buttonBackground=209,205,221
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=236,230,238
+handle=236,230,238
+inactiveBackground=160,160,208
+inactiveBlend=70,53,124
+inactiveForeground=184,184,184
+inactiveFrame=236,230,238
+inactiveHandle=236,230,238
+inactiveTitleBtnBg=220,220,220
+linkColor=0,0,192
+selectBackground=122,90,218
+selectForeground=255,255,255
+visitedLinkColor=128,0,128
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Makefile.am b/kcontrol/krdb/kcs/Makefile.am
index dfa2389cf..adf68f19e 100644
--- a/kcontrol/krdb/kcs/Makefile.am
+++ b/kcontrol/krdb/kcs/Makefile.am
@@ -5,7 +5,11 @@ tdedisplay_colorschemes_data_DATA = AtlasGreen.kcsrc BeOS.kcsrc BlueSlate.kcsrc
 	Windows2000.kcsrc System.kcsrc Next.kcsrc PointReyesGreen.kcsrc \
 	KDEOne.kcsrc KDETwo.kcsrc MediaPeach.kcsrc Windows95.kcsrc EveX.kcsrc \
 	WindowsXP.kcsrc Keramik.kcsrc KeramikEmerald.kcsrc KeramikWhite.kcsrc \
-	BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc
+	BlackOnWhite.kcsrc WhiteOnBlack.kcsrc YellowOnBlue.kcsrc Plastik.kcsrc \
+	Different.kcsrc Lila.kcsrc Pinkie.kcsrc \
+	Jewels-Amethyst.kcsrc Jewels-Aquamarine.kcsrc Jewels-Carbon.kcsrc Jewels-Citrin.kcsrc \
+	Jewels-Emerald.kcsrc Jewels-Ruby.kcsrc Jewels-Sapphire.kcsrc Jewels-Topaz.kcsrc \
+	Seasons-Autumn.kcsrc Seasons-Spring.kcsrc Seasons-Summer.kcsrc Seasons-Winter.kcsrc
 
 tdedisplay_colorschemes_datadir = $(kde_datadir)/tdedisplay/color-schemes
 
diff --git a/kcontrol/krdb/kcs/Pinkie.kcsrc b/kcontrol/krdb/kcs/Pinkie.kcsrc
new file mode 100644
index 000000000..ac1f0cea4
--- /dev/null
+++ b/kcontrol/krdb/kcs/Pinkie.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Pinkie
+activeBackground=255,134,209
+activeBlend=255,184,235
+activeForeground=255,255,255
+activeTitleBtnBg=220,220,220
+alternateBackground=251,224,221
+background=254,224,250
+buttonBackground=248,209,233
+buttonForeground=0,0,0
+contrast=1
+foreground=0,0,0
+frame=255,235,237
+handle=255,235,237
+inactiveBackground=133,67,114
+inactiveBlend=210,118,158
+inactiveForeground=236,237,231
+inactiveFrame=255,235,237
+inactiveHandle=255,235,237
+inactiveTitleBtnBg=220,220,220
+linkColor=0,0,192
+selectBackground=255,174,228
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=255,230,245
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Seasons-Autumn.kcsrc b/kcontrol/krdb/kcs/Seasons-Autumn.kcsrc
new file mode 100644
index 000000000..6e318b278
--- /dev/null
+++ b/kcontrol/krdb/kcs/Seasons-Autumn.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Seasons - Autumn
+activeBackground=175,95,55
+activeBlend=205,125,55
+activeForeground=255,255,255
+activeTitleBtnBg=175,95,55
+alternateBackground=255,250,245
+background=240,230,210
+buttonBackground=235,222,198
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=175,95,55
+handle=175,95,55
+inactiveBackground=235,205,125
+inactiveBlend=240,230,210
+inactiveForeground=175,175,175
+inactiveFrame=235,205,125
+inactiveHandle=235,205,125
+inactiveTitleBtnBg=235,205,125
+linkColor=0,0,192
+selectBackground=175,95,55
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=255,250,245
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Seasons-Spring.kcsrc b/kcontrol/krdb/kcs/Seasons-Spring.kcsrc
new file mode 100644
index 000000000..b99558a71
--- /dev/null
+++ b/kcontrol/krdb/kcs/Seasons-Spring.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Seasons - Spring
+activeBackground=90,180,60
+activeBlend=139,203,105
+activeForeground=255,255,255
+activeTitleBtnBg=90,180,60
+alternateBackground=245,250,245
+background=225,235,225
+buttonBackground=215,229,214
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=90,180,60
+handle=90,180,60
+inactiveBackground=205,235,175
+inactiveBlend=225,235,225
+inactiveForeground=175,175,175
+inactiveFrame=205,235,175
+inactiveHandle=205,235,175
+inactiveTitleBtnBg=205,235,175
+linkColor=0,0,192
+selectBackground=90,180,60
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=245,250,245
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Seasons-Summer.kcsrc b/kcontrol/krdb/kcs/Seasons-Summer.kcsrc
new file mode 100644
index 000000000..edb4d8243
--- /dev/null
+++ b/kcontrol/krdb/kcs/Seasons-Summer.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Seasons - Summer
+activeBackground=0,155,255
+activeBlend=49,178,255
+activeForeground=255,255,255
+activeTitleBtnBg=0,155,255
+alternateBackground=245,250,255
+background=235,245,255
+buttonBackground=217,236,255
+buttonForeground=0,0,0
+contrast=5
+foreground=0,0,0
+frame=0,155,255
+handle=0,155,255
+inactiveBackground=165,225,255
+inactiveBlend=235,245,255
+inactiveForeground=175,175,175
+inactiveFrame=165,225,255
+inactiveHandle=165,225,255
+inactiveTitleBtnBg=165,225,255
+linkColor=0,0,192
+selectBackground=0,155,255
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=245,250,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Seasons-Winter.kcsrc b/kcontrol/krdb/kcs/Seasons-Winter.kcsrc
new file mode 100644
index 000000000..eefb59f46
--- /dev/null
+++ b/kcontrol/krdb/kcs/Seasons-Winter.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Seasons - Winter
+activeBackground=193,202,216
+activeBlend=207,216,230
+activeForeground=82,82,82
+activeTitleBtnBg=193,202,216
+alternateBackground=255,255,255
+background=244,243,242
+buttonBackground=237,235,234
+buttonForeground=82,82,82
+contrast=5
+foreground=82,82,82
+frame=193,202,216
+handle=193,202,216
+inactiveBackground=216,221,228
+inactiveBlend=244,243,242
+inactiveForeground=128,128,128
+inactiveFrame=216,221,228
+inactiveHandle=216,221,228
+inactiveTitleBtnBg=216,221,228
+linkColor=0,0,192
+selectBackground=193,202,216
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=128,0,128
+windowBackground=255,255,255
+windowForeground=82,82,82
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 25db21f3c..96467679d 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -33,8 +33,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
-#include <kprocio.h>
+#include <tdestandarddirs.h>
+#include <tdeprocio.h>
 #include <ksavefile.h>
 #include <tdetempfile.h>
 #include <tdelocale.h>
@@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version)
    TQByteArray params;
    TQDataStream stream(params, IO_WriteOnly);
    stream << name << value;
-   kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
+   tdeApp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params);
 }
 
 // -----------------------------------------------------------------------------
@@ -168,9 +168,9 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings )
 
   TQMap <TQString, bool> pathDb;
     // OK, this isn't fun at all.
-    // KApp adds paths ending with /, QApp those without slash, and if
+    // TDEApp adds paths ending with /, QApp those without slash, and if
     // one gives it something that is other way around, it will complain and scare
-    // users. So we need to know whether a path being added is from KApp, and in this case
+    // users. So we need to know whether a path being added is from TDEApp, and in this case
     // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified..
 
   TQString qversion = tqVersion();
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index 76af5490a..220408ab9 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -28,7 +28,7 @@ KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name )
 {
     m_base = new NewThemeWidget( this, "new_theme_base" );
     setMainWidget( m_base );
-    connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) );
+    connect( m_base->leName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotThemeNameChanged( const TQString & ) ) );
     slotThemeNameChanged( m_base->leName->text() );
 }
 
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 1068eb325..4827f1c40 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <kipc.h>
 #include <tdelocale.h>
 #include <kservice.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <ktar.h>
 #include <tdestyle.h>
 
@@ -436,7 +436,7 @@ void KTheme::apply()
 
     desktopConf.sync();         // TODO sync and signal only if <desktop> elem present
     // reconfigure kdesktop. kdesktop will notify all clients
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if ( !client->isAttached() ) {
         client->attach();
     }
@@ -535,7 +535,7 @@ void KTheme::apply()
         TDEConfig * colorConf = TDEGlobal::config();
 
         TQString sCurrentScheme = locateLocal("data", "tdedisplay/color-schemes/thememgr.kcsrc");
-        KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
+        TDESimpleConfig *colorScheme = new TDESimpleConfig( sCurrentScheme );
         colorScheme->setGroup("Color Scheme" );
 
         for ( uint i = 0; i < colorList.count(); i++ )
@@ -657,7 +657,7 @@ void KTheme::apply()
     if ( !fontsElem.isNull() )
     {
         TDEConfig * fontsConf = TDEGlobal::config();
-        TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+        TDEConfig * kde1xConf = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
         kde1xConf->setGroup( "General" );
 
         TQDomNodeList fontList = fontsElem.childNodes();
diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui
index 717f68e32..8f7fade9d 100644
--- a/kcontrol/kthememanager/kthemedlg.ui
+++ b/kcontrol/kthememanager/kthemedlg.ui
@@ -503,7 +503,7 @@
     <include location="local" impldecl="in implementation">kthemedlg.ui.h</include>
     <include location="global" impldecl="in implementation">kurllabel.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot specifier="non virtual">startKonqui( const TQString &amp; url )</slot>
     <slot specifier="non virtual">startBackground()</slot>
     <slot specifier="non virtual">startColors()</slot>
@@ -511,6 +511,6 @@
     <slot specifier="non virtual">startIcons()</slot>
     <slot specifier="non virtual">startFonts()</slot>
     <slot specifier="non virtual">startSaver()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 6a4132745..46dcbd59e 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -34,7 +34,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 
 #include "kthememanager.h"
@@ -66,26 +66,26 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
 
     dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum );
 
-    connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotInstallTheme() ) );
+    connect( ( TQObject * )dlg->btnInstall, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotInstallTheme() ) );
 
-    connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotRemoveTheme() ) );
+    connect( ( TQObject * )dlg->btnRemove, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotRemoveTheme() ) );
 
-    connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotCreateTheme() ) );
+    connect( ( TQObject * )dlg->btnCreate, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotCreateTheme() ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
-             this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+             this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) );
 
-    connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ),
-             this, TQT_SLOT( updateButton() ) );
+    connect( this, TQ_SIGNAL( filesDropped( const KURL::List& ) ),
+             this, TQ_SLOT( updateButton() ) );
 
-    connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             this, TQT_SLOT( updateButton() ) );
+    connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             this, TQ_SLOT( updateButton() ) );
 
     m_origTheme = new KTheme( this, true ); // stores the defaults to get back to
     m_origTheme->setName( ORIGINAL_THEME );
@@ -413,7 +413,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
 
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *)
+    TDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *)
     {
         TDEGlobal::locale()->insertCatalogue( "kthememanager" );
         return new kthememanager( parent, "kthememanager" );
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 33f78e18e..db3461714 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -71,9 +71,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     cb_busyCursor->insertItem( i18n( "Blinking Cursor" ), 2 );
     cb_busyCursor->insertItem( i18n( "Bouncing Cursor" ), 3 );
     GroupBox1Layout->addWidget( cb_busyCursor, 0, 0 );
-    connect( cb_busyCursor, TQT_SIGNAL( activated(int) ),
-            TQT_SLOT ( slotBusyCursor(int)));
-    connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), TQT_SLOT( checkChanged() ) );
+    connect( cb_busyCursor, TQ_SIGNAL( activated(int) ),
+            TQ_SLOT ( slotBusyCursor(int)));
+    connect( cb_busyCursor, TQ_SIGNAL( activated(int) ), TQ_SLOT( checkChanged() ) );
 
     lbl_cursorTimeout = new TQLabel( GroupBox1, "TextLabel1" );
     lbl_cursorTimeout->setText( i18n( "&Startup indication timeout:" ) );
@@ -83,8 +83,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     sb_cursorTimeout->setSuffix( i18n(" sec") );
     GroupBox1Layout->addWidget( sb_cursorTimeout, 2, 1 );
     lbl_cursorTimeout->setBuddy( sb_cursorTimeout );
-    connect( sb_cursorTimeout, TQT_SIGNAL( valueChanged(int) ), 
-            TQT_SLOT( checkChanged() ) );
+    connect( sb_cursorTimeout, TQ_SIGNAL( valueChanged(int) ), 
+            TQ_SLOT( checkChanged() ) );
 
     TQGroupBox* GroupBox2 = new TQGroupBox( this, "GroupBox2" );
     GroupBox2->setTitle( i18n( "Taskbar &Notification" ) );
@@ -108,9 +108,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     cb_taskbarButton = new TQCheckBox( GroupBox2, "cb_taskbarButton" );
     cb_taskbarButton->setText( i18n( "Enable &taskbar notification" ) );
     GroupBox2Layout->addMultiCellWidget( cb_taskbarButton, 0, 0, 0, 1 );
-    connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), 
-            TQT_SLOT( slotTaskbarButton(bool)));
-    connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( checkChanged()));
+    connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), 
+            TQ_SLOT( slotTaskbarButton(bool)));
+    connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( checkChanged()));
 
     lbl_taskbarTimeout = new TQLabel( GroupBox2, "TextLabel2" );
     lbl_taskbarTimeout->setText( i18n( "Start&up indication timeout:" ) );
@@ -120,8 +120,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
     sb_taskbarTimeout->setSuffix( i18n(" sec") );
     GroupBox2Layout->addWidget( sb_taskbarTimeout, 1, 1 );
     lbl_taskbarTimeout->setBuddy( sb_taskbarTimeout );
-    connect( sb_taskbarTimeout, TQT_SIGNAL( valueChanged(int) ), 
-            TQT_SLOT( checkChanged() ) );
+    connect( sb_taskbarTimeout, TQ_SIGNAL( valueChanged(int) ), 
+            TQ_SLOT( checkChanged() ) );
 
     Form1Layout->addStretch();
 
@@ -212,11 +212,11 @@ LaunchConfig::save()
 
   emit changed( false );
 
-  if (!kapp->dcopClient()->isAttached())
-     kapp->dcopClient()->attach();
+  if (!tdeApp->dcopClient()->isAttached())
+     tdeApp->dcopClient()->attach();
   TQByteArray data;
-  kapp->dcopClient()->send( "kicker", "Panel", "restart()", data );
-  kapp->dcopClient()->send( "kdesktop", "", "configure()", data );
+  tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", data );
+  tdeApp->dcopClient()->send( "kdesktop", "", "configure()", data );
 }
 
   void
diff --git a/kcontrol/locale/TIMEZONES b/kcontrol/locale/TIMEZONES
index 357b1c58d..73a507976 100644
--- a/kcontrol/locale/TIMEZONES
+++ b/kcontrol/locale/TIMEZONES
@@ -89,6 +89,7 @@ i18n("America/Chicago");
 i18n("America/Chihuahua");
 i18n("America/Ciudad_Juarez");
 i18n("America/Costa_Rica");
+i18n("America/Coyhaique");
 i18n("America/Creston");
 i18n("America/Cuiaba");
 i18n("America/Curacao");
@@ -151,7 +152,6 @@ i18n("America/Montevideo");
 i18n("America/Montserrat");
 i18n("America/Nassau");
 i18n("America/New_York");
-i18n("America/Nipigon");
 i18n("America/Nome");
 i18n("America/Noronha");
 i18n("America/North_Dakota/Beulah");
@@ -160,7 +160,6 @@ i18n("America/North_Dakota/New_Salem");
 i18n("America/Nuuk");
 i18n("America/Ojinaga");
 i18n("America/Panama");
-i18n("America/Pangnirtung");
 i18n("America/Paramaribo");
 i18n("America/Phoenix");
 i18n("America/Port-au-Prince");
@@ -168,7 +167,6 @@ i18n("America/Port_of_Spain");
 i18n("America/Porto_Velho");
 i18n("America/Puerto_Rico");
 i18n("America/Punta_Arenas");
-i18n("America/Rainy_River");
 i18n("America/Rankin_Inlet");
 i18n("America/Recife");
 i18n("America/Regina");
@@ -189,7 +187,6 @@ i18n("America/St_Vincent");
 i18n("America/Swift_Current");
 i18n("America/Tegucigalpa");
 i18n("America/Thule");
-i18n("America/Thunder_Bay");
 i18n("America/Tijuana");
 i18n("America/Toronto");
 i18n("America/Tortola");
@@ -197,7 +194,6 @@ i18n("America/Vancouver");
 i18n("America/Whitehorse");
 i18n("America/Winnipeg");
 i18n("America/Yakutat");
-i18n("America/Yellowknife");
 i18n("Antarctica/Casey");
 i18n("Antarctica/Davis");
 i18n("Antarctica/DumontDUrville");
@@ -227,7 +223,6 @@ i18n("Asia/Beirut");
 i18n("Asia/Bishkek");
 i18n("Asia/Brunei");
 i18n("Asia/Chita");
-i18n("Asia/Choibalsan");
 i18n("Asia/Colombo");
 i18n("Asia/Damascus");
 i18n("Asia/Dhaka");
@@ -335,8 +330,8 @@ i18n("Europe/Isle_of_Man");
 i18n("Europe/Istanbul");
 i18n("Europe/Jersey");
 i18n("Europe/Kaliningrad");
-i18n("Europe/Kiev");
 i18n("Europe/Kirov");
+i18n("Europe/Kyiv");
 i18n("Europe/Lisbon");
 i18n("Europe/Ljubljana");
 i18n("Europe/London");
@@ -364,7 +359,6 @@ i18n("Europe/Stockholm");
 i18n("Europe/Tallinn");
 i18n("Europe/Tirane");
 i18n("Europe/Ulyanovsk");
-i18n("Europe/Uzhgorod");
 i18n("Europe/Vaduz");
 i18n("Europe/Vatican");
 i18n("Europe/Vienna");
@@ -372,7 +366,6 @@ i18n("Europe/Vilnius");
 i18n("Europe/Volgograd");
 i18n("Europe/Warsaw");
 i18n("Europe/Zagreb");
-i18n("Europe/Zaporozhye");
 i18n("Europe/Zurich");
 i18n("Indian/Antananarivo");
 i18n("Indian/Chagos");
@@ -392,7 +385,6 @@ i18n("Pacific/Chatham");
 i18n("Pacific/Chuuk");
 i18n("Pacific/Easter");
 i18n("Pacific/Efate");
-i18n("Pacific/Enderbury");
 i18n("Pacific/Fakaofo");
 i18n("Pacific/Fiji");
 i18n("Pacific/Funafuti");
@@ -401,6 +393,7 @@ i18n("Pacific/Gambier");
 i18n("Pacific/Guadalcanal");
 i18n("Pacific/Guam");
 i18n("Pacific/Honolulu");
+i18n("Pacific/Kanton");
 i18n("Pacific/Kiritimati");
 i18n("Pacific/Kosrae");
 i18n("Pacific/Kwajalein");
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 3d1736676..22d815866 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -33,11 +33,11 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kiconloader.h>
 #include <klanguagebutton.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include "kcmlocale.h"
 #include "kcmlocale.moc"
@@ -55,34 +55,34 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale,
   m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:"));
   m_comboCountry = new KLanguageButton( this );
   m_labCountry->setBuddy(m_comboCountry);
-  connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)),
-           this, TQT_SLOT(changedCountry(const TQString &)) );
+  connect( m_comboCountry, TQ_SIGNAL(activated(const TQString &)),
+           this, TQ_SLOT(changedCountry(const TQString &)) );
 
   m_labLang = new TQLabel(this, I18N_NOOP("Languages:"));
   m_labLang->setAlignment( AlignTop );
 
   m_languages = new TQListBox(this);
-  connect(m_languages, TQT_SIGNAL(selectionChanged()),
-          TQT_SLOT(slotCheckButtons()));
+  connect(m_languages, TQ_SIGNAL(selectionChanged()),
+          TQ_SLOT(slotCheckButtons()));
 
   TQWidget * vb = new TQWidget(this);
   TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint());
   m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language"));
   boxlay->add(m_addLanguage);
-  connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)),
-          TQT_SLOT(slotAddLanguage(const TQString &)));
+  connect(m_addLanguage, TQ_SIGNAL(activated(const TQString &)),
+          TQ_SLOT(slotAddLanguage(const TQString &)));
   m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language"));
   m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up"));
   m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down"));
   boxlay->add(m_removeLanguage);
   boxlay->add(m_upButton);
   boxlay->add(m_downButton);
-  connect(m_removeLanguage, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotRemoveLanguage()));
-  connect(m_upButton, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotLanguageUp()));
-  connect(m_downButton, TQT_SIGNAL(clicked()),
-          TQT_SLOT(slotLanguageDown()));
+  connect(m_removeLanguage, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotRemoveLanguage()));
+  connect(m_upButton, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotLanguageUp()));
+  connect(m_downButton, TQ_SIGNAL(clicked()),
+          TQ_SLOT(slotLanguageDown()));
   boxlay->insertStretch(-1);
 
   // #### HPB: This should be implemented for KDE 3
@@ -113,9 +113,9 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale,
   languageSelectorLayout->addStretch();
   lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2);
 
-  connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) );
-  connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) );
-  connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) );
+  connect( installLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallLanguage()) );
+  connect( uninstallLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallLanguage()) );
+  connect( selectLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectLanguage()) );
 #endif
 
 }
@@ -126,8 +126,8 @@ void TDELocaleConfig::slotInstallLanguage()
 
   *proc << "tdesu";
   *proc << "qt-language-selector --mode install";
-  TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
-			this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
+  TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+			this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *)));
   setEnabled(false);
   proc->start();
 }
@@ -138,8 +138,8 @@ void TDELocaleConfig::slotUninstallLanguage()
 
   *proc << "tdesu";
   *proc << "qt-language-selector --mode uninstall";
-  TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
-			this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
+  TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+			this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *)));
   setEnabled(false);
   proc->start();
 }
@@ -150,8 +150,8 @@ void TDELocaleConfig::slotSelectLanguage()
 
   *proc << "tdesu";
   *proc << "qt-language-selector --mode select";
-  TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
-			this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
+  TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+			this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *)));
   setEnabled(false);
   proc->start();
 }
@@ -299,7 +299,7 @@ void TDELocaleConfig::loadLanguageList()
       menu_index = -2; // first entries should _not_ be sorted
       continue;
     }
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup("KCM Locale");
     TQString name = entry.readEntry("Name",
                                    m_locale->translate("without name"));
@@ -346,7 +346,7 @@ void TDELocaleConfig::loadCountryList()
     if (index != -1)
       tag.truncate(index);
 
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup("KCM Locale");
     TQString name = entry.readEntry("Name",
                                    m_locale->translate("without name"));
@@ -367,7 +367,7 @@ void TDELocaleConfig::loadCountryList()
   for ( TQStringList::ConstIterator it = countrylist.begin();
         it != countrylist.end(); ++it )
   {
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup("KCM Locale");
     TQString name = entry.readEntry("Name",
                                    m_locale->translate("without name"));
@@ -403,7 +403,7 @@ void TDELocaleConfig::readLocale(const TQString &path, TQString &name,
     .arg(sub)
     .arg(path);
 
-  KSimpleConfig entry(locate("locale", filepath));
+  TDESimpleConfig entry(locate("locale", filepath));
   entry.setGroup("KCM Locale");
   name = entry.readEntry("Name");
 
@@ -505,7 +505,7 @@ TQStringList TDELocaleConfig::languageList() const
                             TQString::fromLatin1("l10n/%1/entry.desktop")
                             .arg(m_locale->country()));
 
-  KSimpleConfig entry(fileName);
+  TDESimpleConfig entry(fileName);
   entry.setGroup("KCM Locale");
 
   return entry.readListEntry("Languages");
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index 4e09726b4..487a3455e 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -42,7 +42,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale,
     m_locale(locale)
 {
   TQGridLayout *lay = new TQGridLayout(this, 5, 2);
-  lay->setAutoAdd(TRUE);
+  lay->setAutoAdd(true);
 
   // Whatever the color scheme is, we want black text
   TQColorGroup a = palette().active();
@@ -78,7 +78,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale,
   lay->setColStretch(1, 3);
 
   TQTimer *timer = new TQTimer(this, "clock_timer");
-  connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime()));
+  connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateTime()));
   timer->start(1000);
 }
 
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 609e0c9ad..cd3780067 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -34,8 +34,8 @@
 
 #include <knuminput.h>
 #include <kdialog.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include "toplevel.h"
 #include "localemon.h"
@@ -55,22 +55,22 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale,
   lay->addWidget(m_labMonCurSym, 0, 0);
   m_edMonCurSym = new TQLineEdit(this);
   lay->addWidget(m_edMonCurSym, 0, 1);
-  connect( m_edMonCurSym, TQT_SIGNAL( textChanged(const TQString &) ),
-           TQT_SLOT( slotMonCurSymChanged(const TQString &) ) );
+  connect( m_edMonCurSym, TQ_SIGNAL( textChanged(const TQString &) ),
+           TQ_SLOT( slotMonCurSymChanged(const TQString &) ) );
 
   m_labMonDecSym = new TQLabel(this, I18N_NOOP("Decimal symbol:"));
   lay->addWidget(m_labMonDecSym, 1, 0);
   m_edMonDecSym = new TQLineEdit(this);
   lay->addWidget(m_edMonDecSym, 1, 1);
-  connect( m_edMonDecSym, TQT_SIGNAL( textChanged(const TQString &) ),
-           TQT_SLOT( slotMonDecSymChanged(const TQString &) ) );
+  connect( m_edMonDecSym, TQ_SIGNAL( textChanged(const TQString &) ),
+           TQ_SLOT( slotMonDecSymChanged(const TQString &) ) );
 
   m_labMonThoSep = new TQLabel(this, I18N_NOOP("Thousands separator:"));
   lay->addWidget(m_labMonThoSep, 2, 0);
   m_edMonThoSep = new TQLineEdit(this);
   lay->addWidget(m_edMonThoSep, 2, 1);
-  connect( m_edMonThoSep, TQT_SIGNAL( textChanged(const TQString &) ),
-           TQT_SLOT( slotMonThoSepChanged(const TQString &) ) );
+  connect( m_edMonThoSep, TQ_SIGNAL( textChanged(const TQString &) ),
+           TQ_SLOT( slotMonThoSepChanged(const TQString &) ) );
 
   m_labMonFraDig = new TQLabel(this, I18N_NOOP("Fract digits:"));
   lay->addWidget(m_labMonFraDig, 3, 0);
@@ -78,34 +78,34 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale,
   m_inMonFraDig->setRange(0, 10, 1, false);
   lay->addWidget(m_inMonFraDig, 3, 1);
 
-  connect( m_inMonFraDig, TQT_SIGNAL( valueChanged(int) ),
-           TQT_SLOT( slotMonFraDigChanged(int) ) );
+  connect( m_inMonFraDig, TQ_SIGNAL( valueChanged(int) ),
+           TQ_SLOT( slotMonFraDigChanged(int) ) );
 
   TQWidget *vbox = new TQVBox(this);
   lay->addMultiCellWidget(vbox, 4, 4, 0, 1);
   TQVGroupBox *vgrp;
   vgrp = new TQVGroupBox( vbox, I18N_NOOP("Positive") );
   m_chMonPosPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
-  connect( m_chMonPosPreCurSym, TQT_SIGNAL( clicked() ),
-           TQT_SLOT( slotMonPosPreCurSymChanged() ) );
+  connect( m_chMonPosPreCurSym, TQ_SIGNAL( clicked() ),
+           TQ_SLOT( slotMonPosPreCurSymChanged() ) );
 
   TQHBox *hbox;
   hbox = new TQHBox( vgrp );
   m_labMonPosMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:"));
   m_cmbMonPosMonSignPos = new TQComboBox(hbox, "signpos");
-  connect( m_cmbMonPosMonSignPos, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotMonPosMonSignPosChanged(int) ) );
+  connect( m_cmbMonPosMonSignPos, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotMonPosMonSignPosChanged(int) ) );
 
   vgrp = new TQVGroupBox( vbox, I18N_NOOP("Negative") );
   m_chMonNegPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
-  connect( m_chMonNegPreCurSym, TQT_SIGNAL( clicked() ),
-           TQT_SLOT( slotMonNegPreCurSymChanged() ) );
+  connect( m_chMonNegPreCurSym, TQ_SIGNAL( clicked() ),
+           TQ_SLOT( slotMonNegPreCurSymChanged() ) );
 
   hbox = new TQHBox( vgrp );
   m_labMonNegMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:"));
   m_cmbMonNegMonSignPos = new TQComboBox(hbox, "signpos");
-  connect( m_cmbMonNegMonSignPos, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotMonNegMonSignPosChanged(int) ) );
+  connect( m_cmbMonNegMonSignPos, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotMonNegMonSignPosChanged(int) ) );
 
   // insert some items
   int i = 5;
@@ -130,7 +130,7 @@ void TDELocaleConfigMoney::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
                            TQString::fromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
@@ -260,8 +260,8 @@ void TDELocaleConfigMoney::slotMonNegMonSignPosChanged(int i)
 void TDELocaleConfigMoney::slotTranslate()
 {
   TQObjectList list;
-  list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos));
-  list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos));
+  list.append(m_cmbMonPosMonSignPos);
+  list.append(m_cmbMonNegMonSignPos);
 
   TQComboBox *wc;
   for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li)
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index ca523d2e9..0079edbd1 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -28,8 +28,8 @@
 #include <tqregexp.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include "toplevel.h"
 #include "localenum.h"
@@ -43,36 +43,36 @@ TDELocaleConfigNumber::TDELocaleConfigNumber(TDELocale *locale,
   TQGridLayout *lay = new TQGridLayout(this, 5, 2,
 				     KDialog::marginHint(),
 				     KDialog::spacingHint());
-  lay->setAutoAdd(TRUE);
+  lay->setAutoAdd(true);
 
   m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:"));
   m_edDecSym = new TQLineEdit(this);
-  connect( m_edDecSym, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotDecSymChanged(const TQString &) ) );
+  connect( m_edDecSym, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotDecSymChanged(const TQString &) ) );
   m_labDecSym->setBuddy(m_edDecSym);
 
   m_labThoSep = new TQLabel(this, I18N_NOOP("Tho&usands separator:"));
   m_edThoSep = new TQLineEdit(this);
-  connect( m_edThoSep, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotThoSepChanged(const TQString &) ) );
+  connect( m_edThoSep, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotThoSepChanged(const TQString &) ) );
   m_labThoSep->setBuddy(m_edThoSep);
 
   m_labMonPosSign = new TQLabel(this, I18N_NOOP("Positive si&gn:"));
   m_edMonPosSign = new TQLineEdit(this);
-  connect( m_edMonPosSign, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotMonPosSignChanged(const TQString &) ) );
+  connect( m_edMonPosSign, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotMonPosSignChanged(const TQString &) ) );
   m_labMonPosSign->setBuddy(m_edMonPosSign);
 
   m_labMonNegSign = new TQLabel(this, I18N_NOOP("&Negative sign:"));
   m_edMonNegSign = new TQLineEdit(this);
-  connect( m_edMonNegSign, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotMonNegSignChanged(const TQString &) ) );
+  connect( m_edMonNegSign, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotMonNegSignChanged(const TQString &) ) );
   m_labMonNegSign->setBuddy(m_edMonNegSign);
 
   lay->setColStretch(1, 1);
 
-  connect(this, TQT_SIGNAL(localeChanged()),
-	  TQT_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+	  TQ_SLOT(slotLocaleChanged()));
 }
 
 TDELocaleConfigNumber::~TDELocaleConfigNumber()
@@ -88,7 +88,7 @@ void TDELocaleConfigNumber::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
 			   TQString::fromLatin1("l10n/%1/entry.desktop")
 			   .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 6cb8e9a8d..509b22c7f 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -28,8 +28,8 @@
 
 #include <kdialog.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include "localeother.h"
 #include "localeother.moc"
@@ -49,15 +49,15 @@ TDELocaleConfigOther::TDELocaleConfigOther(TDELocale *locale,
   lay->addWidget(m_labPageSize, 0, 0);
   m_combPageSize = new TQComboBox(this);
   lay->addWidget(m_combPageSize, 0, 1);
-  connect( m_combPageSize, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotPageSizeChanged(int) ) );
+  connect( m_combPageSize, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotPageSizeChanged(int) ) );
 
   m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:"));
   lay->addWidget(m_labMeasureSystem, 1, 0);
   m_combMeasureSystem = new TQComboBox(this);
   lay->addWidget(m_combMeasureSystem, 1, 1);
-  connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ),
-           TQT_SLOT( slotMeasureSystemChanged(int) ) );
+  connect( m_combMeasureSystem, TQ_SIGNAL( activated(int) ),
+           TQ_SLOT( slotMeasureSystemChanged(int) ) );
 
   m_combPageSize->insertItem(TQString::null);
   m_combPageSize->insertItem(TQString::null);
@@ -79,7 +79,7 @@ void TDELocaleConfigOther::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
                            TQString::fromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 1e31f14f7..4275965d3 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -29,8 +29,8 @@
 #include <tqvaluevector.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 
@@ -198,12 +198,12 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale,
   TQGridLayout *lay = new TQGridLayout(this, 7, 2,
 				     KDialog::marginHint(),
 				     KDialog::spacingHint());
-  lay->setAutoAdd(TRUE);
+  lay->setAutoAdd(true);
 
   m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:"));
   m_comboCalendarSystem = new TQComboBox(false, this);
-  connect(m_comboCalendarSystem, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotCalendarSystemChanged(int)));
+  connect(m_comboCalendarSystem, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotCalendarSystemChanged(int)));
   TQStringList tmpCalendars;
   tmpCalendars << TQString::null << TQString::null;
   m_comboCalendarSystem->insertStringList(tmpCalendars);
@@ -212,29 +212,29 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale,
   m_comboTimeFmt = new TQComboBox(true, this);
   //m_edTimeFmt = m_comboTimeFmt->lineEdit();
   //m_edTimeFmt = new TQLineEdit(this);
-  connect( m_comboTimeFmt, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotTimeFmtChanged(const TQString &) ) );
+  connect( m_comboTimeFmt, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotTimeFmtChanged(const TQString &) ) );
 
   m_labDateFmt = new TQLabel(this, I18N_NOOP("Date format:"));
   m_comboDateFmt = new TQComboBox(true, this);
-  connect( m_comboDateFmt, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotDateFmtChanged(const TQString &) ) );
+  connect( m_comboDateFmt, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotDateFmtChanged(const TQString &) ) );
 
   m_labDateFmtShort = new TQLabel(this, I18N_NOOP("Short date format:"));
   m_comboDateFmtShort = new TQComboBox(true, this);
-  connect( m_comboDateFmtShort, TQT_SIGNAL( textChanged(const TQString &) ),
-	   this, TQT_SLOT( slotDateFmtShortChanged(const TQString &) ) );
+  connect( m_comboDateFmtShort, TQ_SIGNAL( textChanged(const TQString &) ),
+	   this, TQ_SLOT( slotDateFmtShortChanged(const TQString &) ) );
 
   m_labWeekStartDay = new TQLabel(this, I18N_NOOP("First day of the week:"));
   m_comboWeekStartDay = new TQComboBox(false, this);
-  connect (m_comboWeekStartDay, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(slotWeekStartDayChanged(int)));
+  connect (m_comboWeekStartDay, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(slotWeekStartDayChanged(int)));
 
   updateWeekDayNames();
 
   m_chDateMonthNamePossessive = new TQCheckBox(this, I18N_NOOP("Use declined form of month name"));
-  connect( m_chDateMonthNamePossessive, TQT_SIGNAL( clicked() ),
-	     TQT_SLOT( slotDateMonthNamePossChanged() ) );
+  connect( m_chDateMonthNamePossessive, TQ_SIGNAL( clicked() ),
+	     TQ_SLOT( slotDateMonthNamePossChanged() ) );
 
   lay->setColStretch(1, 1);
 }
@@ -252,7 +252,7 @@ void TDELocaleConfigTime::save()
   TDEConfig *config = TDEGlobal::config();
   TDEConfigGroupSaver saver(config, "Locale");
 
-  KSimpleConfig ent(locate("locale",
+  TDESimpleConfig ent(locate("locale",
 			   TQString::fromLatin1("l10n/%1/entry.desktop")
 			   .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp
index 634c3bd45..8842b3852 100644
--- a/kcontrol/locale/main.cpp
+++ b/kcontrol/locale/main.cpp
@@ -22,7 +22,7 @@
 #include "toplevel.h"
 
 extern "C" {
-  KDE_EXPORT void *init_kcm_locale() {
+  TDE_EXPORT void *init_kcm_locale() {
     TDELocale::setMainCatalogue("kcmlocale");
     return new TDELocaleFactory("kcmlocale");
   }
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 339405461..525a73953 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kservice.h>
 
 #include "localenum.h"
@@ -64,7 +64,7 @@ TDELocaleApplication::TDELocaleApplication(TQWidget *parent, const char* /*name*
 
   m_locale = new TDELocale(TQString::fromLatin1("kcmlocale"), m_nullConfig);
   TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
-  l->setAutoAdd(TRUE);
+  l->setAutoAdd(true);
 
   m_tab = new TQTabWidget(this);
 
@@ -84,64 +84,64 @@ TDELocaleApplication::TDELocaleApplication(TQWidget *parent, const char* /*name*
   m_sample = new TDELocaleSample(m_locale, m_gbox);
 
   // getting signals from childs
-  connect(m_localemain, TQT_SIGNAL(localeChanged()),
-          this, TQT_SIGNAL(localeChanged()));
-  connect(m_localemain, TQT_SIGNAL(languageChanged()),
-          this, TQT_SIGNAL(languageChanged()));
+  connect(m_localemain, TQ_SIGNAL(localeChanged()),
+          this, TQ_SIGNAL(localeChanged()));
+  connect(m_localemain, TQ_SIGNAL(languageChanged()),
+          this, TQ_SIGNAL(languageChanged()));
 
   // run the slots on the childs
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localemain, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localenum, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localemon, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localetime, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_localeother, TQT_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localemain, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localenum, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localemon, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localetime, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_localeother, TQ_SLOT(slotLocaleChanged()));
 
   // keep the example up to date
   // NOTE: this will make the sample be updated 6 times the first time
   // because combo boxes++ emits the change signal not only when the user changes
   // it, but also when it's changed by the program.
-  connect(m_localenum, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
-  connect(m_localemon, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
-  connect(m_localetime, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
+  connect(m_localenum, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
+  connect(m_localemon, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
+  connect(m_localetime, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
   // No examples for this yet
-  //connect(m_localeother, TQT_SIGNAL(slotLocaleChanged()),
-  //m_sample, TQT_SLOT(slotLocaleChanged()));
-  connect(this, TQT_SIGNAL(localeChanged()),
-          m_sample, TQT_SLOT(slotLocaleChanged()));
+  //connect(m_localeother, TQ_SIGNAL(slotLocaleChanged()),
+  //m_sample, TQ_SLOT(slotLocaleChanged()));
+  connect(this, TQ_SIGNAL(localeChanged()),
+          m_sample, TQ_SLOT(slotLocaleChanged()));
 
   // make sure we always have translated interface
-  connect(this, TQT_SIGNAL(languageChanged()),
-          this, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localemain, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localenum, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localemon, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localetime, TQT_SLOT(slotTranslate()));
-  connect(this, TQT_SIGNAL(languageChanged()),
-          m_localeother, TQT_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          this, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localemain, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localenum, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localemon, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localetime, TQ_SLOT(slotTranslate()));
+  connect(this, TQ_SIGNAL(languageChanged()),
+          m_localeother, TQ_SLOT(slotTranslate()));
 
   // mark it as changed when we change it.
-  connect(m_localemain, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localenum, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localemon, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localetime, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
-  connect(m_localeother, TQT_SIGNAL(localeChanged()),
-          TQT_SLOT(slotChanged()));
+  connect(m_localemain, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localenum, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localemon, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localetime, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
+  connect(m_localeother, TQ_SIGNAL(localeChanged()),
+          TQ_SLOT(slotChanged()));
 
   load();
 }
diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp
index 2ff9d2c3c..41512a183 100644
--- a/kcontrol/nics/nic.cpp
+++ b/kcontrol/nics/nic.cpp
@@ -103,8 +103,8 @@ KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &)
    hbox->addStretch(1);
    TQTimer* timer=new TQTimer(this);
    timer->start(60000);
-   connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update()));
-   connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
+   connect(m_updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(update()));
+   connect(timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update()));
    update();
    TDEAboutData *about =
    new TDEAboutData(I18N_NOOP("kcminfo"),
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index 84959e34d..328e55294 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -28,12 +28,12 @@
 
 extern "C"
 {
-    KDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P )
+    TDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::Config( parent_P, name_P );
     }
 
-    KDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P )
+    TDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::KonquerorConfig( parent_P, name_P );
     }
@@ -52,11 +52,11 @@ Config::Config( TQWidget* parent_P, const char* )
     tabs = new TQTabWidget( this );
     konqueror_widget = new Konqueror( tabs );
     konqueror_widget->layout()->setMargin( KDialog::marginHint() );
-    connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
+    connect( konqueror_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed()));
     tabs->addTab( konqueror_widget, i18n( "Konqueror" ));
     system_widget = new SystemWidget( tabs );
     system_widget->layout()->setMargin( KDialog::marginHint() );
-    connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
+    connect( system_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed()));
     tabs->addTab( system_widget, i18n( "System" ));
     topLayout->add( tabs );
     load();
@@ -110,7 +110,7 @@ KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* )
 
     TQVBoxLayout *topLayout = new TQVBoxLayout( this );
     widget = new Konqueror( this );
-    connect( widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
+    connect( widget, TQ_SIGNAL( changed()), TQ_SLOT( changed()));
     topLayout->add( widget );
     load();
     }
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index 8cd82699b..199522729 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -51,9 +51,9 @@ Konqueror::Konqueror( TQWidget* parent_P )
               "thus reducing resource requirements."
               "<p>Be aware that this also means that, if something goes wrong, "
               "all your browsing windows will be closed simultaneously." ));
-    connect( rb_never_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
-    connect( rb_file_browsing_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
-    connect( rb_always_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    connect( rb_never_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
+    connect( rb_file_browsing_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
+    connect( rb_always_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
     rb_file_browsing_reuse->setChecked( true );
 
     TQString tmp =
@@ -77,10 +77,10 @@ Konqueror::Konqueror( TQWidget* parent_P )
               "so that windows will always open quickly."
               "<p><b>Warning:</b> In some cases, it is actually possible that this will "
               "reduce perceived performance." ));
-    connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( preload_count_changed( int )));
-    connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SIGNAL( changed()));
-    connect( cb_preload_on_startup, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
-    connect( cb_always_have_preloaded, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( preload_count_changed( int )));
+    connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( changed()));
+    connect( cb_preload_on_startup, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
+    connect( cb_always_have_preloaded, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
     defaults();
     }
 
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 056e78193..43e8c4c43 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -51,7 +51,7 @@ SystemWidget::SystemWidget( TQWidget* parent_P )
               " or turn on the developer mode for the crash handler).</p>" );
     TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp );
     TQWhatsThis::add( label_tdebuildsycoca, tmp );
-    connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed()));
+    connect( cb_disable_tdebuildsycoca, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed()));
     defaults();
     }
 
diff --git a/kcontrol/pics/cr128-app-background.png b/kcontrol/pics/cr128-app-background.png
index 3aff44a08..3bf8c1210 100644..100755
--- a/kcontrol/pics/cr128-app-background.png
+++ b/kcontrol/pics/cr128-app-background.png
diff --git a/kcontrol/pics/cr128-app-kcmkwm.png b/kcontrol/pics/cr128-app-kcmkwm.png
index e7278ae4d..6edeec619 100644..100755
--- a/kcontrol/pics/cr128-app-kcmkwm.png
+++ b/kcontrol/pics/cr128-app-kcmkwm.png
diff --git a/kcontrol/pics/cr16-app-background.png b/kcontrol/pics/cr16-app-background.png
index 63a893333..b32a42a1e 100644..100755
--- a/kcontrol/pics/cr16-app-background.png
+++ b/kcontrol/pics/cr16-app-background.png
diff --git a/kcontrol/pics/cr16-app-kcmkwm.png b/kcontrol/pics/cr16-app-kcmkwm.png
index 6bc50e3b8..017044d6f 100644..100755
--- a/kcontrol/pics/cr16-app-kcmkwm.png
+++ b/kcontrol/pics/cr16-app-kcmkwm.png
diff --git a/kcontrol/pics/cr22-app-background.png b/kcontrol/pics/cr22-app-background.png
index d4eaaaa89..571590eb5 100644..100755
--- a/kcontrol/pics/cr22-app-background.png
+++ b/kcontrol/pics/cr22-app-background.png
diff --git a/kcontrol/pics/cr22-app-kcmkwm.png b/kcontrol/pics/cr22-app-kcmkwm.png
index cd0271118..96e44ce6f 100644..100755
--- a/kcontrol/pics/cr22-app-kcmkwm.png
+++ b/kcontrol/pics/cr22-app-kcmkwm.png
diff --git a/kcontrol/pics/cr32-app-background.png b/kcontrol/pics/cr32-app-background.png
index ffc5ffaff..998b51050 100644..100755
--- a/kcontrol/pics/cr32-app-background.png
+++ b/kcontrol/pics/cr32-app-background.png
diff --git a/kcontrol/pics/cr32-app-kcmkwm.png b/kcontrol/pics/cr32-app-kcmkwm.png
index 4d9fd6b87..852d31e76 100644..100755
--- a/kcontrol/pics/cr32-app-kcmkwm.png
+++ b/kcontrol/pics/cr32-app-kcmkwm.png
diff --git a/kcontrol/pics/cr48-app-background.png b/kcontrol/pics/cr48-app-background.png
index 631905b93..3a0648c06 100644..100755
--- a/kcontrol/pics/cr48-app-background.png
+++ b/kcontrol/pics/cr48-app-background.png
diff --git a/kcontrol/pics/cr48-app-kcmkwm.png b/kcontrol/pics/cr48-app-kcmkwm.png
index b4b30269e..8398222b8 100644..100755
--- a/kcontrol/pics/cr48-app-kcmkwm.png
+++ b/kcontrol/pics/cr48-app-kcmkwm.png
diff --git a/kcontrol/pics/cr64-app-background.png b/kcontrol/pics/cr64-app-background.png
index 50706c290..04fed1c0a 100644..100755
--- a/kcontrol/pics/cr64-app-background.png
+++ b/kcontrol/pics/cr64-app-background.png
diff --git a/kcontrol/pics/cr64-app-kcmkwm.png b/kcontrol/pics/cr64-app-kcmkwm.png
index 982afdb16..76305acc8 100644..100755
--- a/kcontrol/pics/cr64-app-kcmkwm.png
+++ b/kcontrol/pics/cr64-app-kcmkwm.png
diff --git a/kcontrol/pics/crsc-app-background.svgz b/kcontrol/pics/crsc-app-background.svgz
index 0230d69c8..8098a345f 100644..100755
--- a/kcontrol/pics/crsc-app-background.svgz
+++ b/kcontrol/pics/crsc-app-background.svgz
diff --git a/kcontrol/pics/crsc-app-kcmkwm.svgz b/kcontrol/pics/crsc-app-kcmkwm.svgz
index f9993b78c..6af01fcb3 100644..100755
--- a/kcontrol/pics/crsc-app-kcmkwm.svgz
+++ b/kcontrol/pics/crsc-app-kcmkwm.svgz
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index c1ff81338..7f32c438a 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -22,13 +22,13 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <ksimpleconfig.h>
-#include <kprocess.h>
+#include <tdesimpleconfig.h>
+#include <tdeprocess.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tderecentdocument.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqstringlist.h>
 #include <tqfile.h>
@@ -36,8 +36,8 @@
 
 KPrivacyManager::KPrivacyManager()
 {
-  if (!kapp->dcopClient()->isAttached())
-    kapp->dcopClient()->attach();
+  if (!tdeApp->dcopClient()->isAttached())
+    tdeApp->dcopClient()->attach();
 
   m_error = false;
 }
@@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails()
 
 bool KPrivacyManager::clearRunCommandHistory() const
 {
-  return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearAllCookies() const
 {
-  return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
+  return tdeApp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
 }
 
 bool KPrivacyManager::clearSavedClipboardContents()
@@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
     return true;
   }
 
-  return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearFormCompletion() const
@@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const
 
 bool KPrivacyManager::clearQuickStartMenu() const
 {
-  return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
+  return tdeApp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
 }
 
 bool KPrivacyManager::clearWebHistory()
@@ -134,10 +134,10 @@ bool KPrivacyManager::clearWebHistory()
   if(!isApplicationRegistered("konqueror"))
   {
     kdDebug() << "couldn't find Konqueror instance, preloading." << endl;
-    kapp->tdeinitExec("konqueror", args, 0,0);
+    tdeApp->tdeinitExec("konqueror", args, 0,0);
   }
 
-  return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+  return tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
                                    "notifyClear(TQCString)", TQString("") );
 }
 
@@ -170,7 +170,7 @@ bool KPrivacyManager::clearKPDFDocData()
 bool KPrivacyManager::isApplicationRegistered(const TQString &appName)
 {
 
-  QCStringList regApps = kapp->dcopClient()->registeredApplications();
+  QCStringList regApps = tdeApp->dcopClient()->registeredApplications();
 
   for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it )
     if((*it).find(appName.latin1()) != -1) return true;
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 71fc3313b..87247547e 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -126,7 +126,7 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites"));
   clearKPDFDocData->setText(1, i18n("Clears all KPDF document data files"));
 
-  connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed()));
+  connect(sw, TQ_SIGNAL(selectionChanged()), TQ_SLOT(changed()));
 
   // store all entries in a list for easy access later on
   checklist.append(clearThumbnails);
@@ -141,9 +141,9 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   checklist.append(clearFavIcons);
   checklist.append(clearKPDFDocData);
 
-  connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup()));
-  connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll()));
-  connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone()));
+  connect(cleaningDialog->cleanupButton, TQ_SIGNAL(clicked()), TQ_SLOT(cleanup()));
+  connect(cleaningDialog->selectAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectAll()));
+  connect(cleaningDialog->selectNoneButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectNone()));
 
   load();
 }
@@ -318,7 +318,7 @@ void Privacy::cleanup()
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
   {
     TDEGlobal::locale()->insertCatalogue("privacy");
     return new Privacy(parent, "Privacy");
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 1c72b1ccc..140234a90 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent,
     if ( buttonMask & Cancel )
         buttonOnTimeout = Cancel;
 
-    connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) );
-    connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) );
+    connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) );
+    connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) );
 
     // create the widgets
     mainWidget = new QVBox( this, "mainWidget" );
diff --git a/kcontrol/randr/tderandrapp.cpp b/kcontrol/randr/tderandrapp.cpp
index e2a4b46f2..a6d704e30 100644
--- a/kcontrol/randr/tderandrapp.cpp
+++ b/kcontrol/randr/tderandrapp.cpp
@@ -28,7 +28,7 @@
 KRandRApp::KRandRApp()
 	: m_tray(new KRandRSystemTray(0L, "RANDRTray"))
 {
-	connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent()));
+	connect(&m_eventMergingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(handleX11ConfigChangeEvent()));
 	m_tray->show();
 }
 
@@ -41,7 +41,7 @@ void KRandRApp::handleX11ConfigChangeEvent()
 bool KRandRApp::x11EventFilter(XEvent* e)
 {
 	if (e->type == m_tray->screenChangeNotifyEvent()) {
-		m_eventMergingTimer.start(1000, TRUE);
+		m_eventMergingTimer.start(1000, true);
 	}
 	return TDEApplication::x11EventFilter( e );
 }
diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h
index 422c0f568..4a2856ad4 100644
--- a/kcontrol/randr/tderandrapp.h
+++ b/kcontrol/randr/tderandrapp.h
@@ -20,11 +20,11 @@
 #define TDERANDRAPP_H
 
 #include <tqtimer.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 class KRandRSystemTray;
 
-class KRandRApp : public KUniqueApplication
+class KRandRApp : public TDEUniqueApplication
 {
 	TQ_OBJECT
 
diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index b95441f08..a5ad3fe6d 100644
--- a/kcontrol/randr/tderandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -18,7 +18,7 @@
 */
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp
index 39e00980d..b8a53ce89 100644
--- a/kcontrol/randr/tderandrmodule.cpp
+++ b/kcontrol/randr/tderandrmodule.cpp
@@ -48,12 +48,12 @@ K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") )
 extern "C"
 
 {
-	KDE_EXPORT void init_randr()
+	TDE_EXPORT void init_randr()
 	{
 		KRandRModule::performApplyOnStartup();
 	}
 
-	KDE_EXPORT bool test_randr()
+	TDE_EXPORT bool test_randr()
 	{
 	        int eventBase, errorBase;
 		if( XRRQueryExtension(tqt_xdisplay(), &eventBase, &errorBase ) )
@@ -100,7 +100,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
         screenLabel->setBuddy( m_screenSelector );
 	TQWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list."));
 
-	connect(m_screenSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenChanged(int)));
+	connect(m_screenSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenChanged(int)));
 
 	if (numScreens() <= 1)
 		m_screenSelector->setEnabled(false);
@@ -110,7 +110,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 	TQLabel *sizeLabel = new TQLabel(i18n("Screen size:"), sizeBox);
 	m_sizeCombo = new KComboBox(sizeBox);
 	TQWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list."));
-	connect(m_sizeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeChanged(int)));
+	connect(m_sizeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeChanged(int)));
         sizeLabel->setBuddy( m_sizeCombo );
 
 	TQHBox* refreshBox = new TQHBox(this);
@@ -118,7 +118,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 	TQLabel *rateLabel = new TQLabel(i18n("Refresh rate:"), refreshBox);
 	m_refreshRates = new KComboBox(refreshBox);
 	TQWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list."));
-	connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int)));
+	connect(m_refreshRates, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRefreshChanged(int)));
         rateLabel->setBuddy( m_refreshRates );
 
 	m_rotationGroup = new TQButtonGroup(2, TQt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
@@ -129,14 +129,14 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 	m_applyOnStartup = new TQCheckBox(i18n("Apply settings on TDE startup"), this);
 	topLayout->addWidget(m_applyOnStartup);
 	TQWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when TDE starts."));
-	connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
+	connect(m_applyOnStartup, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged()));
 
 	TQHBox* syncBox = new TQHBox(this);
 	syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum));
 	m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox);
 	topLayout->addWidget(syncBox);
 	TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when TDE starts instead of being temporary."));
-	connect(m_syncTrayApp, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
+	connect(m_syncTrayApp, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged()));
 
 	topLayout->addStretch(1);
 
@@ -155,11 +155,11 @@ void KRandRModule::addRotationButton(int thisRotation, bool checkbox)
 	if (!checkbox) {
 		TQRadioButton* thisButton = new TQRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup);
 		thisButton->setEnabled(thisRotation & currentScreen()->rotations());
-		connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged()));
+		connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged()));
 	} else {
 		TQCheckBox* thisButton = new TQCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup);
 		thisButton->setEnabled(thisRotation & currentScreen()->rotations());
-		connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged()));
+		connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged()));
 	}
 }
 
diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp
index 5d2010f94..8dad337b7 100644
--- a/kcontrol/randr/tderandrpassivepopup.cpp
+++ b/kcontrol/randr/tderandrpassivepopup.cpp
@@ -28,7 +28,7 @@
 KRandrPassivePopup::KRandrPassivePopup( TQWidget *parent, const char *name, WFlags f )
     : KPassivePopup( parent, name, f )
     {
-    connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( slotPositionSelf()));
+    connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( slotPositionSelf()));
     }
     
 KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const TQString &text,
@@ -88,14 +88,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 	    }
 	}
     if( x11_events )
-	kapp->installX11EventFilter( this );
+	tdeApp->installX11EventFilter( this );
     }
     	
 bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )
     {
     if( e->type() == TQEvent::Move && o->isWidgetType()
-	&& watched_widgets.contains( TQT_TQWIDGET( o )))
-        TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf()));
+	&& watched_widgets.contains( static_cast<TQWidget*>( o )))
+        TQTimer::singleShot( 0, this, TQ_SLOT( slotPositionSelf()));
     return false;
     }
 
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 6a65662a7..0506639e3 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -36,7 +36,7 @@
 #include <kstdguiitem.h>
 #include <tdeglobal.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <cstdlib>
 #include <unistd.h>
@@ -59,15 +59,15 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	, m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()))
 {
 	TDEPopupMenu *help = m_help->menu();
-	help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+	help->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents()));
 	setPixmap(KSystemTray::loadIcon("randr"));
 	setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
-	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
+	connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(_quit()));
 	TQToolTip::add(this, i18n("Screen resize & rotate"));
 	my_parent = parent;
 
 	//printf("Reading configuration...\n");
-	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+	globalKeys = new TDEGlobalAccel(this);
 	TDEGlobalAccel* keys = globalKeys;
 #include "tderandrbindings.cpp"
 	// the keys need to be read from kdeglobals, not kickerrc
@@ -75,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	globalKeys->setEnabled(true);
 	globalKeys->updateConnections();
 
-	connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+	connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-//	connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized()));
+//	connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), tdeApp->desktop(), TQ_SLOT( desktopResized()));
 #endif
 
 	randr_display = XOpenDisplay(NULL);
@@ -88,7 +88,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 		last_known_y = currentScreen()->currentPixelHeight();
 	}
 
-	t_config = new KSimpleConfig("kiccconfigrc");
+	t_config = new TDESimpleConfig("kiccconfigrc");
 
 	TQString cur_profile;
 	cur_profile = getCurrentProfile();
@@ -98,17 +98,17 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 
 #ifdef WITH_TDEHWLIB
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 #endif
 }
 
 /*!
- * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user
+ * \b TQ_SLOT which called if tderandrtray is exited by the user. In this case the user
  * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the
  * result is written to the KDE configfile.
  */
 void KRandRSystemTray::_quit (){
-	r_config = new KSimpleConfig("tderandrtrayrc");
+	r_config = new TDESimpleConfig("tderandrtrayrc");
 
 	TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?");
 	int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
@@ -195,15 +195,15 @@ void KRandRSystemTray::reloadDisplayConfiguration()
 				if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) {
 					continue;
 				}
-	
+
 				// Activate this output
 				randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc;
 				randr_screen_info->cur_output = randr_screen_info->outputs[i];
 				randr_screen_info->cur_output->auto_set = 1;
 				randr_screen_info->cur_output->off_set = 0;
 				output_auto (randr_screen_info, randr_screen_info->cur_output);
-				i=main_low_apply(randr_screen_info);
-		
+				main_low_apply(randr_screen_info);
+
 				if (randr_screen_info->outputs[i]->cur_crtc) {
 					// Output successfully activated!
 					set_primary_output(randr_screen_info, randr_screen_info->cur_output->id);
@@ -253,25 +253,28 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 	menu->setCheckable(true);
 
 	bool valid = isValid();
-
-	if (!valid) {
+	if (!valid)
+	{
 		lastIndex = menu->insertItem(i18n("Required X Extension Not Available"));
 		menu->setItemEnabled(lastIndex, false);
-
 	}
-	else {
+	else
+	{
 		m_screenPopups.clear();
-		for (int s = 0; s < numScreens() /*&& numScreens() > 1 */; s++) {
-			setCurrentScreen(s);
-			if (s == screenIndexOfWidget(this)) {
-				/*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1));
-				menu->setItemEnabled(lastIndex, false);*/
-			} else {
-				TDEPopupMenu* subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
-				m_screenPopups.append(subMenu);
-				populateMenu(subMenu);
-				lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
-				connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenActivated()));
+		if (numScreens() > 1)
+		{
+			int screenOfWidget = screenIndexOfWidget(this);
+			for (int s = 0; s < numScreens(); s++)
+			{
+				setCurrentScreen(s);
+				if (s != screenOfWidget)
+				{
+					TDEPopupMenu *subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
+					m_screenPopups.append(subMenu);
+					populateMenu(subMenu);
+					lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
+					connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenActivated()));
+				}
 			}
 		}
 
@@ -282,52 +285,52 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 	addOutputMenu(menu);
 
 	// Find any user ICC profiles
-	TQStringList cfgProfiles;
-	cfgProfiles = t_config->groupList();
-	if (cfgProfiles.isEmpty() == false) {
-		menu->insertTitle(SmallIcon("kcoloredit"), i18n("Color Profile"));
-	}
-	for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) {
-		lastIndex = menu->insertItem(*t);
-		if (t_config->readEntry("CurrentProfile") == (*t)) {
-			menu->setItemChecked(lastIndex, true);
+	TQStringList cfgProfiles = t_config->groupList();
+	if (!cfgProfiles.isEmpty())
+	{
+		TDEPopupMenu *profileMenu = new TDEPopupMenu(menu);
+		for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t)
+		{
+			lastIndex = profileMenu->insertItem(*t);
+			if (t_config->readEntry("CurrentProfile") == (*t))
+			{
+				profileMenu->setItemChecked(lastIndex, true);
+			}
+			profileMenu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false));
+			profileMenu->connectItem(lastIndex, this, TQ_SLOT(slotColorProfileChanged(int)));
 		}
-		menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false));
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int)));
+		menu->insertItem(SmallIcon("kcoloredit"), i18n("Color Profile"), profileMenu);
 	}
 
-	if (valid) {
+	if (valid)
+	{
 		// Find any display profiles
-		TQStringList displayProfiles;
-		displayProfiles = getDisplayConfigurationProfiles(locateLocal("config", "/", true));
-		if (!displayProfiles.isEmpty()) {
-			menu->insertTitle(SmallIcon("background"), i18n("Display Profiles"));
-			lastIndex = menu->insertItem(SmallIcon("bookmark"), "<default>");
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int)));
-			for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t) {
-				lastIndex = menu->insertItem(SmallIcon("bookmark"), *t);
-				menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int)));
+		TQStringList displayProfiles = getDisplayConfigurationProfiles(locateLocal("config", "/", true));
+		if (!displayProfiles.isEmpty())
+		{
+			TDEPopupMenu *displayProfileMenu = new TDEPopupMenu(menu);
+			lastIndex = displayProfileMenu->insertItem(SmallIcon("bookmark"), "<default>");
+			displayProfileMenu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int)));
+			for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t)
+			{
+				lastIndex = displayProfileMenu->insertItem(SmallIcon("bookmark"), *t);
+				displayProfileMenu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int)));
 			}
+			menu->insertItem(SmallIcon("background"), i18n("Display Profiles"), displayProfileMenu);
 		}
 	}
 
-	menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration"));
-
-	TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ),
-		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
-		actionCollection() );
-	actColors->plug( menu );
-
-// 	TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ),
-// 		SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ),
-// 		actionCollection() );
-// 	actPrefs->plug( menu );
-
-	TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ),
-		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
-		actionCollection() );
-	actSKeys->plug( menu );
+	// Config menu
+	TDEPopupMenu *configMenu = new TDEPopupMenu(menu);
+	TDEAction *actColors = new TDEAction(i18n("Configure Displays..."), SmallIconSet("configure"),
+	        TDEShortcut(), this, TQ_SLOT(slotDisplayConfig()), actionCollection());
+	actColors->plug(configMenu);
+	TDEAction *actSKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"),
+	        TDEShortcut(), this, TQ_SLOT(slotSKeys()), actionCollection());
+	actSKeys->plug(configMenu);
+	menu->insertItem(SmallIcon("randr"), i18n("Global Configuration"), configMenu);
 
+	menu->insertSeparator();
 	menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), m_help->menu());
 	TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
 	quitAction->plug(menu);
@@ -411,74 +414,85 @@ int KRandRSystemTray::GetHackResolutionParameter() {
 	return resparm;
 }
 
-void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
+void KRandRSystemTray::populateMenu(TDEPopupMenu *menu)
 {
-	int lastIndex = 0;
-
-	menu->insertTitle(SmallIcon("view-fullscreen"), i18n("Screen Size"));
+	int lastIndex;
 
 	int numSizes = currentScreen()->numSizes();
-	int* sizeSort = new int[numSizes];
-
-	for (int i = 0; i < numSizes; i++) {
+	int *sizeSort = new int[numSizes];
+	for (int i = 0; i < numSizes; i++)
+	{
 		sizeSort[i] = currentScreen()->pixelCount(i);
 	}
 
-	for (int j = 0; j < numSizes; j++) {
-		int highest = -1, highestIndex = -1;
-
-		for (int i = 0; i < numSizes; i++) {
-			if (sizeSort[i] && sizeSort[i] > highest) {
+	TDEPopupMenu *screenSizeMenu = new TDEPopupMenu(menu);
+	for (int j = 0; j < numSizes; j++)
+	{
+		int highest = 0, highestIndex = -1;
+		for (int i = 0; i < numSizes; i++)
+		{
+			if (sizeSort[i] > highest)
+			{
 				highest = sizeSort[i];
 				highestIndex = i;
 			}
 		}
-		sizeSort[highestIndex] = -1;
 		Q_ASSERT(highestIndex != -1);
+		sizeSort[highestIndex] = 0;
 
-		lastIndex = menu->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(highestIndex).width()).arg(currentScreen()->pixelSize(highestIndex).height()));
-
+		lastIndex = screenSizeMenu->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(highestIndex).width()).arg(currentScreen()->pixelSize(highestIndex).height()));
 		if (currentScreen()->proposedSize() == highestIndex)
-			menu->setItemChecked(lastIndex, true);
+		{
+			screenSizeMenu->setItemChecked(lastIndex, true);
+		}
 
-		menu->setItemParameter(lastIndex, highestIndex);
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int)));
+		screenSizeMenu->setItemParameter(lastIndex, highestIndex);
+		screenSizeMenu->connectItem(lastIndex, this, TQ_SLOT(slotResolutionChanged(int)));
 	}
 	delete [] sizeSort;
-	sizeSort = 0L;
+	sizeSort = nullptr;
+
+	menu->insertItem(SmallIcon("view-fullscreen"), i18n("Screen Size"), screenSizeMenu);
 
 	// Don't display the rotation options if there is no point (ie. none are supported)
 	// XFree86 4.3 does not include rotation support.
-	if (currentScreen()->rotations() != RandRScreen::Rotate0) {
-		menu->insertTitle(SmallIcon("reload"), i18n("Orientation"));
-
-		for (int i = 0; i < 6; i++) {
-			if ((1 << i) & currentScreen()->rotations()) {
-				lastIndex = menu->insertItem(currentScreen()->rotationIcon(1 << i), RandRScreen::rotationName(1 << i));
-
+	if (currentScreen()->rotations() != RandRScreen::Rotate0)
+	{
+		TDEPopupMenu *orientationMenu = new TDEPopupMenu(menu);
+		for (int i = 0; i < 6; i++)
+		{
+			if ((1 << i) & currentScreen()->rotations())
+			{
+				lastIndex = orientationMenu->insertItem(currentScreen()->rotationIcon(1 << i), RandRScreen::rotationName(1 << i));
 				if (currentScreen()->proposedRotation() & (1 << i))
-					menu->setItemChecked(lastIndex, true);
+				{
+					orientationMenu->setItemChecked(lastIndex, true);
+				}
 
-				menu->setItemParameter(lastIndex, 1 << i);
-				menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int)));
+				orientationMenu->setItemParameter(lastIndex, 1 << i);
+				orientationMenu->connectItem(lastIndex, this, TQ_SLOT(slotOrientationChanged(int)));
 			}
 		}
+		menu->insertItem(SmallIcon("reload"), i18n("Orientation"), orientationMenu);
 	}
 
 	TQStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize());
-
 	if (rr.count())
-		menu->insertTitle(SmallIcon("clock"), i18n("Refresh Rate"));
-
-	int i = 0;
-	for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) {
-		lastIndex = menu->insertItem(*it);
-
-		if (currentScreen()->proposedRefreshRate() == i)
-			menu->setItemChecked(lastIndex, true);
+	{
+		TDEPopupMenu *refreshRatesMenu = new TDEPopupMenu(menu);
+		int i = 0;
+		for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++)
+		{
+			lastIndex = refreshRatesMenu->insertItem(*it);
+			if (currentScreen()->proposedRefreshRate() == i)
+			{
+				refreshRatesMenu->setItemChecked(lastIndex, true);
+			}
 
-		menu->setItemParameter(lastIndex, i);
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int)));
+			refreshRatesMenu->setItemParameter(lastIndex, i);
+			refreshRatesMenu->connectItem(lastIndex, this, TQ_SLOT(slotRefreshRateChanged(int)));
+		}
+		menu->insertItem(SmallIcon("clock"), i18n("Refresh Rate"), refreshRatesMenu);
 	}
 }
 
@@ -738,86 +752,89 @@ void KRandRSystemTray::findPrimaryDisplay()
 	}
 }
 
-void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
+void KRandRSystemTray::addOutputMenu(TDEPopupMenu *menu)
 {
 	XRROutputInfo *output_info;
 	char *output_name;
-	int i;
 	int lastIndex = 0;
 	int connected_displays = 0;
 
-	if (isValid() == true) {
-		menu->insertTitle(SmallIcon("kcmkwm"), i18n("Output Port"));
+	if (isValid())
+	{
+		TDEPopupMenu *outputMenu = new TDEPopupMenu(menu);
 
-		for (i = 0; i < randr_screen_info->n_output; i++) {
+		// Look for active (i.e. switched on) outputs
+		for (int i = 0; i < randr_screen_info->n_output; i++)
+		{
 			output_info = randr_screen_info->outputs[i]->info;
-			// Look for ON outputs
-			if (!randr_screen_info->outputs[i]->cur_crtc) {
+			if (!randr_screen_info->outputs[i]->cur_crtc)
+			{
 				continue;
 			}
-			if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) {
+			if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection)
+			{
 				continue;
 			}
 
 			output_name = output_info->name;
-			//printf("ON: Found output %s\n", output_name);
-
-			lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name));
-			menu->setItemChecked(lastIndex, true);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
-			menu->setItemParameter(lastIndex, i);
+			lastIndex = outputMenu->insertItem(i18n("%1 (Active)").arg(output_name));
+			outputMenu->setItemChecked(lastIndex, true);
+			outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
+			outputMenu->setItemParameter(lastIndex, i);
 
 			connected_displays++;
 		}
 
-		for (i = 0; i < randr_screen_info->n_output; i++) {
+		// Look for inactive (i.e. switched off) but connected outputs
+		for (int i = 0; i < randr_screen_info->n_output; i++)
+		{
 			output_info = randr_screen_info->outputs[i]->info;
-			// Look for CONNECTED outputs....
-			if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) {
+			if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection)
+			{
 				continue;
 			}
-			// ...that are not ON
-			if (randr_screen_info->outputs[i]->cur_crtc) {
+			if (randr_screen_info->outputs[i]->cur_crtc)
+			{
 				continue;
 			}
 
 			output_name = output_info->name;
-			//printf("CONNECTED, NOT ON: Found output %s\n", output_name);
-
-			lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name));
-			menu->setItemChecked(lastIndex, false);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
-			menu->setItemParameter(lastIndex, i);
+			lastIndex = outputMenu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name));
+			outputMenu->setItemChecked(lastIndex, false);
+			outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
+			outputMenu->setItemParameter(lastIndex, i);
 
 			connected_displays++;
 		}
 
-		for (i = 0; i < randr_screen_info->n_output; i++) {
+		// Look for all outputs that are not connected
+		for (int i = 0; i < randr_screen_info->n_output; i++)
+		{
 			output_info = randr_screen_info->outputs[i]->info;
-			// Look for ALL outputs that are not connected....
-			if (RR_Disconnected != randr_screen_info->outputs[i]->info->connection) {
+			if (RR_Disconnected != randr_screen_info->outputs[i]->info->connection)
+			{
 				continue;
 			}
-			// ...or ON
-			if (randr_screen_info->outputs[i]->cur_crtc) {
+			if (randr_screen_info->outputs[i]->cur_crtc)
+			{
 				continue;
 			}
 
 			output_name = output_info->name;
-			//printf("DISCONNECTED, NOT ON: Found output %s\n", output_name);
-
-			lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name));
-			menu->setItemChecked(lastIndex, false);
-			menu->setItemEnabled(lastIndex, false);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
-			menu->setItemParameter(lastIndex, i);
+			lastIndex = outputMenu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name));
+			outputMenu->setItemChecked(lastIndex, false);
+			outputMenu->setItemEnabled(lastIndex, false);
+			outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
+			outputMenu->setItemParameter(lastIndex, i);
 		}
 
-		lastIndex = menu->insertItem(SmallIcon("forward"), i18n("Next available output"));
-		if (connected_displays < 2) {
-			menu->setItemEnabled(lastIndex, false);
+		if (connected_displays >= 2)
+		{
+			lastIndex = outputMenu->insertItem(SmallIcon("forward"), i18n("Next available output"));
+			outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotCycleDisplays()));
 		}
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays()));
+
+		menu->insertItem(SmallIcon("kcmkwm"), i18n("Output Port"), outputMenu);
 	}
 }
 
@@ -834,7 +851,7 @@ void KRandRSystemTray::slotDisplayProfileChanged(int parameter)
 		profileName = "";
 	}
 	TQPtrList<SingleScreenData> profileData = loadDisplayConfiguration(profileName, locateLocal("config", "/", true));
-	applyDisplayConfiguration(profileData, TRUE, locateLocal("config", "/", true));
+	applyDisplayConfiguration(profileData, true, locateLocal("config", "/", true));
 	destroyScreenInformationObject(profileData);
 }
 
@@ -862,7 +879,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
 		randr_screen_info->cur_output->auto_set = 1;
  		randr_screen_info->cur_output->off_set = 0;
 		output_auto (randr_screen_info, randr_screen_info->cur_output);
-		i=main_low_apply(randr_screen_info);
+		main_low_apply(randr_screen_info);
 
 		if (!randr_screen_info->outputs[parameter]->cur_crtc) {
 			output_name = randr_screen_info->outputs[parameter]->info->name;
@@ -877,7 +894,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
 			randr_screen_info->cur_output->auto_set = 0;
 			randr_screen_info->cur_output->off_set = 1;
 			output_off(randr_screen_info, randr_screen_info->cur_output);
-			i=main_low_apply(randr_screen_info);
+			main_low_apply(randr_screen_info);
 
 			findPrimaryDisplay();
 			refresh();
@@ -907,6 +924,6 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
 
 void KRandRSystemTray::slotHelpContents()
 {
-  kapp->invokeHelp(TQString::null, "tderandrtray");
+  tdeApp->invokeHelp(TQString::null, "tderandrtray");
 }
 
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index af0d3b1f8..5d6e16053 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -22,7 +22,7 @@
 #include <tqptrlist.h>
 
 #include <ksystemtray.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 
 #ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
@@ -91,8 +91,8 @@ private:
 	int last_known_y;
 
 	TDEPopupMenu* m_menu;
-	KSimpleConfig *r_config;
-	KSimpleConfig *t_config;
+	TDESimpleConfig *r_config;
+	TDESimpleConfig *t_config;
 
 private slots:
 	void _quit();
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index c25867fa5..b4553c6a8 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -56,7 +56,7 @@ ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name
       " resource is mounted.") );
  
     timer.start(10000);
-    TQObject::connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList()));
+    TQObject::connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateList()));
     updateList();
 }
 
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index 4ba0ceb74..fdb21bb1e 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -90,7 +90,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
 
    logFileName.setURL("/var/log/samba.log");
 
-   viewHistory.setAllColumnsShowFocus(TRUE);
+   viewHistory.setAllColumnsShowFocus(true);
    viewHistory.setFocusPolicy(TQWidget::ClickFocus);
    viewHistory.setShowSortIndicator(true);
 
@@ -108,12 +108,12 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
      " If the list is empty, try clicking the \"Update\" button. The samba"
      " log file will be read and the list refreshed.") );
 
-   showConnOpen.setChecked(TRUE);
-   showConnClose.setChecked(TRUE);
-   showFileOpen.setChecked(FALSE);
-   showFileClose.setChecked(FALSE);
+   showConnOpen.setChecked(true);
+   showConnClose.setChecked(true);
+   showFileOpen.setChecked(false);
+   showFileClose.setChecked(false);
 
-   connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
+   connect(&updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(updateList()));
    emit contentsChanged(&viewHistory,0,0);
 
    label.setMinimumSize(label.sizeHint());
@@ -132,10 +132,10 @@ void LogView::loadSettings()
    configFile->setGroup(LOGGROUPNAME);
    logFileName.setURL(configFile->readPathEntry( "SambaLogFile", "/var/log/samba.log"));
 
-   showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", TRUE));
-   showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", FALSE));
-   showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", TRUE));
-   showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", FALSE));
+   showConnOpen.setChecked(configFile->readBoolEntry( "ShowConnectionOpen", true));
+   showConnClose.setChecked(configFile->readBoolEntry( "ShowConnectionClose", false));
+   showFileOpen.setChecked(configFile->readBoolEntry( "ShowFileOpen", true));
+   showFileClose.setChecked(configFile->readBoolEntry( "ShowFileClose", false));
 }
 
 void LogView::saveSettings()
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 34de75d9b..650c43a05 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -59,7 +59,7 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
   expandedInfoCb = new TQCheckBox( i18n( "Show expanded service info" ), this );
   expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this );
 
-   viewStatistics->setAllColumnsShowFocus(TRUE);
+   viewStatistics->setAllColumnsShowFocus(true);
    viewStatistics->setFocusPolicy(TQWidget::ClickFocus);
    viewStatistics->setShowSortIndicator(true);
    
@@ -73,8 +73,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
    eventCb->insertItem(i18n("Connection"));
    eventCb->insertItem(i18n("File Access"));
    
-   expandedInfoCb->setChecked(FALSE);
-   expandedUserCb->setChecked(FALSE);
+   expandedInfoCb->setChecked(false);
+   expandedUserCb->setChecked(false);
    clearStatistics();
    serviceLe->setText("*");
    hostLe->setText("*");
@@ -116,8 +116,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
    subLayout->addWidget(expandedInfoCb,3,1);
    subLayout->addWidget(expandedUserCb,3,2);
 
-   connect(clearButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearStatistics()));
-   connect(calcButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(calculate()));
+   connect(clearButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearStatistics()));
+   connect(calcButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(calculate()));
    setListInfo(0,0,0);
 }
 
@@ -142,8 +142,8 @@ void StatisticsView::calculate()
    if ((expandedInfoCb->isChecked()) || (expandedUserCb->isChecked()))
    {
       SambaLog sLog;
-      TQRegExp rService(serviceLe->text(),FALSE,TRUE);
-      TQRegExp rHost(hostLe->text(),FALSE,TRUE);
+      TQRegExp rService(serviceLe->text(),false,true);
+      TQRegExp rHost(hostLe->text(),false,true);
       TQString item2, item3;
       TQListViewItem* item=dataList->firstChild();
       while (item!=0)
@@ -194,8 +194,8 @@ void StatisticsView::calculate()
    {
       calcCount++;
       int count(0);
-      TQRegExp rService(serviceLe->text(),FALSE,TRUE);
-      TQRegExp rHost(hostLe->text(),FALSE,TRUE);
+      TQRegExp rService(serviceLe->text(),false,true);
+      TQRegExp rHost(hostLe->text(),false,true);
       TQListViewItem* item=dataList->firstChild();
       while (item!=0)
       {
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 157fc62b3..cf7817ce5 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -50,7 +50,7 @@ class LogItem
   LogItem():name(""), accessed(),count(0) {};
   LogItem(TQString n, TQString a):name(n), accessed(), count(1)
 	{
-	  accessed.setAutoDelete(TRUE);
+	  accessed.setAutoDelete(true);
 	  accessed.append(new SmallLogItem(a));
 	};
   TQString name;
@@ -66,7 +66,7 @@ class SambaLog
  public:
   SambaLog()
 	{
-	  items.setAutoDelete(TRUE);
+	  items.setAutoDelete(true);
 	};
   TQPtrList<LogItem> items;
   void addItem (TQString share, TQString host);
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index abd423d13..e51a3c137 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -70,7 +70,7 @@ NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name )
 
     timer = new TQTimer(this);
     timer->start(15000);
-    TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+    TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
     update();
 }
 
@@ -175,8 +175,8 @@ void NetMon::update()
    nrpid=0;
    process->setEnvironment("PATH", path);
    connect(process,
-           TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-           TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
+           TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+           TQ_SLOT(slotReceivedData(TDEProcess *, char *, int)));
    *process << "smbstatus";
    if (!process->start(TDEProcess::Block,TDEProcess::Stdout))
       version->setText(i18n("Error: Unable to run smbstatus"));
@@ -200,12 +200,12 @@ void NetMon::update()
    showmountProc=new TDEProcess();
    showmountProc->setEnvironment("PATH", path);
    *showmountProc<<"showmount"<<"-a"<<"localhost";
-   connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int)));
+   connect(showmountProc,TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQ_SLOT(slotReceivedData(TDEProcess *, char *, int)));
    //without this timer showmount hangs up to 5 minutes
    //if the portmapper daemon isn't running
-   TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount()));
+   TQTimer::singleShot(5000,this,TQ_SLOT(killShowmount()));
    //kdDebug()<<"starting kill timer with 5 seconds"<<endl;
-   connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount()));
+   connect(showmountProc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(killShowmount()));
    if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount
    {
       delete showmountProc;
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index 4f9b076b1..41eba7207 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -21,7 +21,7 @@
  
 #include <tqtimer.h>
 #include <tqlabel.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tqcstring.h>
 #include <tqlistview.h>
 #include <tdeconfig.h>
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index d5af28c1a..4bb099fae 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -66,7 +66,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
    tabs.addTab(&imports,i18n("&Imports"));
    tabs.addTab(&logView,i18n("&Log"));
    tabs.addTab(&statisticsView,i18n("&Statistics"));
-   connect(&logView,TQT_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQT_SLOT(setListInfo(TQListView *, int, int)));
+   connect(&logView,TQ_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQ_SLOT(setListInfo(TQListView *, int, int)));
    setButtons(Help);
    load();
 
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp
index 7a28178d5..ca4bbfae6 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -1,5 +1,5 @@
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqcombobox.h>
 #include <kdebug.h>
 
@@ -24,17 +24,17 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c
 
 	readSettings();
 
-	connect(dialog->qcbPriority, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotPriorityChanged(int)));
-
-	connect(dialog->qcbTopLeft, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
-	connect(dialog->qcbTopRight, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
-	connect(dialog->qcbBottomLeft, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
-	connect(dialog->qcbBottomRight, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbPriority, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotPriorityChanged(int)));
+
+	connect(dialog->qcbTopLeft, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbTopRight, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbBottomLeft, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
+	connect(dialog->qcbBottomRight, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotChangeTopLeftCorner(int)));
 
 #ifndef HAVE_SETPRIORITY
     dialog->qgbPriority->setEnabled(false);
diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp
index 75ee227f1..f85740911 100644
--- a/kcontrol/screensaver/saverconfig.cpp
+++ b/kcontrol/screensaver/saverconfig.cpp
@@ -1,4 +1,4 @@
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdelocale.h>
 
 #include "saverconfig.h"
@@ -9,7 +9,7 @@ SaverConfig::SaverConfig()
 
 bool SaverConfig::read(const TQString &file)
 {
-    KDesktopFile config(file, true);
+    TDEDesktopFile config(file, true);
     if( !config.tryExec())
       return false;
     mExec = config.readPathEntry("Exec");
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 67a93a5e2..c639bba4e 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -40,10 +40,10 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kservicegroup.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 
 #include <X11/Xlib.h>
 #include "scrnsave.h"
@@ -84,10 +84,10 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
 
     struct stat st;
     if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {
-			mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+			mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
 		}
 		else {
-			mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+			mTDMConfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
 		}
 		mTDMConfig->setGroup("X-:*-Greeter");
 
@@ -124,12 +124,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     readSettings( false );
 
     mSetupProc = new TDEProcess;
-    connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(slotSetupDone(TDEProcess *)));
+    connect(mSetupProc, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(slotSetupDone(TDEProcess *)));
 
     mPreviewProc = new TDEProcess;
-    connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(slotPreviewExited(TDEProcess *)));
+    connect(mPreviewProc, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(slotPreviewExited(TDEProcess *)));
 
     TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -153,18 +153,18 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSaverListView->header()->hide();
     mSelected = -1;
     groupLayout->addWidget( mSaverListView, 10 );
-    connect( mSaverListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotSetup()));
+    connect( mSaverListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQ_SLOT( slotSetup()));
     TQWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") );
 
     TQBoxLayout* hlay = new TQHBoxLayout(groupLayout, KDialog::spacingHint());
     mSetupBt = new TQPushButton( i18n("&Setup..."), mSaverGroup );
-    connect( mSetupBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetup() ) );
+    connect( mSetupBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetup() ) );
     mSetupBt->setEnabled(false);
     hlay->addWidget( mSetupBt );
     TQWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") );
 
     mTestBt = new TQPushButton( i18n("&Test"), mSaverGroup );
-    connect( mTestBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotTest() ) );
+    connect( mTestBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotTest() ) );
     mTestBt->setEnabled(false);
     hlay->addWidget( mTestBt );
     TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") );
@@ -177,7 +177,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup);
     mEnabledCheckBox->setChecked(mEnabled);
     TQWhatsThis::add( mEnabledCheckBox, i18n("Automatically start the screen saver after a period of inactivity.") );
-    connect(mEnabledCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnable(bool)));
+    connect(mEnabledCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnable(bool)));
     settingsGroupLayout->addWidget(mEnabledCheckBox, 0, 0);
 
     TQBoxLayout *hbox = new TQHBoxLayout();
@@ -192,8 +192,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mWaitEdit->setSuffix(i18n(" min"));
     mWaitEdit->setValue(mTimeout/60);
     mWaitEdit->setEnabled(mEnabled);
-    connect(mWaitEdit, TQT_SIGNAL(valueChanged(int)),
-            this, TQT_SLOT(slotTimeoutChanged(int)));
+    connect(mWaitEdit, TQ_SIGNAL(valueChanged(int)),
+            this, TQ_SLOT(slotTimeoutChanged(int)));
     mActivateLbl->setBuddy(mWaitEdit);
     hbox->addWidget(mWaitEdit);
     hbox->addStretch(1);
@@ -204,7 +204,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mLockCheckBox = new TQCheckBox( i18n("&Require password to stop"), mSettingsGroup );
     mLockCheckBox->setEnabled( mEnabled );
     mLockCheckBox->setChecked( mLock );
-    connect( mLockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotLock( bool ) ) );
+    connect( mLockCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotLock( bool ) ) );
     settingsGroupLayout->addWidget(mLockCheckBox, 2, 0);
     TQWhatsThis::add( mLockCheckBox, i18n("Prevent potential unauthorized use by requiring a password to stop the screen saver.") );
 
@@ -230,7 +230,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
         mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
     }
-    connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int)));
+    connect(mWaitLockEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLockTimeoutChanged(int)));
     mLockLbl->setBuddy(mWaitLockEdit);
     hbox->addWidget(mWaitLockEdit);
     hbox->addStretch(1);
@@ -241,35 +241,35 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mDelaySaverStartCheckBox = new TQCheckBox( i18n("&Delay saver start after lock"), mSettingsGroup );
     mDelaySaverStartCheckBox->setEnabled( true );
     mDelaySaverStartCheckBox->setChecked( mDelaySaverStart );
-    connect( mDelaySaverStartCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotDelaySaverStart( bool ) ) );
+    connect( mDelaySaverStartCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotDelaySaverStart( bool ) ) );
     settingsGroupLayout->addWidget(mDelaySaverStartCheckBox, 0, 1);
     TQWhatsThis::add( mDelaySaverStartCheckBox, i18n("When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed.") );
 
     mUseTSAKCheckBox = new TQCheckBox( i18n("&Use Secure Attention Key"), mSettingsGroup );
     mUseTSAKCheckBox->setEnabled( true );
     mUseTSAKCheckBox->setChecked( mUseTSAK );
-    connect( mUseTSAKCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseTSAK( bool ) ) );
+    connect( mUseTSAKCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseTSAK( bool ) ) );
     settingsGroupLayout->addWidget(mUseTSAKCheckBox, 1, 1);
     TQWhatsThis::add( mUseTSAKCheckBox, i18n("Require Secure Attention Key prior to displaying the unlock dialog.") );
 
     mUseUnmanagedLockWindowsCheckBox = new TQCheckBox( i18n("Use &legacy lock windows"), mSettingsGroup );
     mUseUnmanagedLockWindowsCheckBox->setEnabled( true );
     mUseUnmanagedLockWindowsCheckBox->setChecked( mUseUnmanagedLockWindows );
-    connect( mUseUnmanagedLockWindowsCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseUnmanagedLockWindows( bool ) ) );
+    connect( mUseUnmanagedLockWindowsCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseUnmanagedLockWindows( bool ) ) );
     settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1);
     TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") );
 
     mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("Hide active &windows from saver"), mSettingsGroup );
     mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
     mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
-    connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
+    connect( mHideActiveWindowsFromSaverCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotHideActiveWindowsFromSaver( bool ) ) );
     settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
     TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
 
     mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup );
     mHideCancelButtonCheckBox->setEnabled( true );
     mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
-    connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) );
+    connect( mHideCancelButtonCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotHideCancelButton(bool)) );
     settingsGroupLayout->addWidget(mHideCancelButtonCheckBox, 4, 1);
     TQWhatsThis::add(mHideCancelButtonCheckBox, i18n("Hide Cancel button from the \"Desktop Session Locked\" dialog."));
 
@@ -288,8 +288,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         i18n( "Advanced &Options" ), this, "advancedBtn" );
     advancedBt->setSizePolicy( TQSizePolicy(
         TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
-    connect( advancedBt, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( slotAdvanced() ) );
+    connect( advancedBt, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( slotAdvanced() ) );
     advancedLayout->addWidget( advancedBt );
     advancedLayout->addWidget( new TQWidget( this ) );
 
@@ -306,7 +306,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     // we've started up.
     mNumLoaded = 0;
     mLoadTimer = new TQTimer( this );
-    connect( mLoadTimer, TQT_SIGNAL(timeout()), TQT_SLOT(findSavers()) );
+    connect( mLoadTimer, TQ_SIGNAL(timeout()), TQ_SLOT(findSavers()) );
     mLoadTimer->start( 100 );
     mChanged = false;
     emit changed(false);
@@ -497,7 +497,7 @@ void KScreenSaver::save()
     // TODO (GJ): When you changed anything, these two lines will give a segfault
     // on exit. I don't know why yet.
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     client->send("kdesktop", "KScreensaverIface", "configure()", TQString(""));
 
     mChanged = false;
@@ -615,8 +615,8 @@ void KScreenSaver::findSavers()
             mTestBt->setEnabled(true);
         }
 
-        connect( mSaverListView, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
-                 this, TQT_SLOT( slotScreenSaver( TQListViewItem * ) ) );
+        connect( mSaverListView, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+                 this, TQ_SLOT( slotScreenSaver( TQListViewItem * ) ) );
 
         setMonitor();
     }
@@ -842,7 +842,7 @@ void KScreenSaver::slotSetup()
         }
 
         mSetupBt->setEnabled( false );
-        kapp->flushX();
+        tdeApp->flushX();
 
         mSetupProc->start();
     }
@@ -886,8 +886,8 @@ void KScreenSaver::slotTest()
         {
             mTestWin = new TestWin();
             mTestWin->setBackgroundMode(TQWidget::NoBackground);
-            mTestWin->setGeometry(0, 0, kapp->desktop()->width(),
-                                    kapp->desktop()->height());
+            mTestWin->setGeometry(0, 0, tdeApp->desktop()->width(),
+                                    tdeApp->desktop()->height());
         }
 
         mTestWin->show();
@@ -899,7 +899,7 @@ void KScreenSaver::slotTest()
 	grabMouse();
 	grabKeyboard();
 
-        mTestBt->setEnabled( FALSE );
+        mTestBt->setEnabled( false );
 	mPreviewProc->kill();
 
         while (!ts.atEnd())
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index f5c32adee..f7953f1e4 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -125,7 +125,7 @@ protected:
     bool        mHideActiveWindowsFromSaver;
     bool        mHideCancelButton;
 
-    KSimpleConfig* mTDMConfig;
+    TDESimpleConfig* mTDMConfig;
 };
 
 #endif
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index f0891db16..998f936e8 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -50,7 +50,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   config = new TDEConfig("ksmartcardrc", false, false);
 
-  DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
+  DCOPClient *dc = tdeApp->dcopClient();
 
   _ok = false;
   dc->remoteInterfaces("kded", "kardsvc", &_ok);
@@ -72,19 +72,19 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
      _popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser");
      _popUpKardChooser->insertItem(i18n("Change Module..."),
 				   this,
-				   TQT_SLOT(slotLaunchChooser()));
+				   TQ_SLOT(slotLaunchChooser()));
      // The config backend
 
-     connect(base->launchManager, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
-     connect(base->beepOnInsert,  TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
-     connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+     connect(base->launchManager, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
+     connect(base->beepOnInsert,  TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
+     connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
 
 
-     connect(base->enablePolling, TQT_SIGNAL(clicked()), TQT_SLOT( changed() ));
+     connect(base->enablePolling, TQ_SIGNAL(clicked()), TQ_SLOT( changed() ));
      connect(base->_readerHostsListView,
-	     TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),
+	     TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),
 	     this,
-	     TQT_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int)));
+	     TQ_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int)));
 
 
 
@@ -92,7 +92,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
 			    "",
 			    "signalReaderListChanged(TQStringList)",
 			    "loadReadersTab(TQStringList)",
-			    FALSE))
+			    false))
 
        kdDebug()<<"Error connecting to DCOP server" <<endl;
 
@@ -101,7 +101,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
 			    "",
 			    "signalCardStateChanged(TQString,bool,TQString)",
 			    "updateReadersState (TQString,bool,TQString) ",
-			    FALSE))
+			    false))
 
        kdDebug()<<"Error connecting to DCOP server" <<endl;
      _cardDB= new KCardDB();
@@ -189,7 +189,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
 
     //  New view items
     TDEListViewItem * temp;
-    kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
 			     data, rettype, retval);
 
     (void) new TDEListViewItem(base->_readerHostsListView,
@@ -217,7 +217,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
    TQDataStream argATR(dataATR,IO_WriteOnly);
    argATR << *_slot;
 
-   kapp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
+   tdeApp->dcopClient()->call("kded", "kardsvc", "getCardATR(TQString)",
 			   dataATR, rettype, retval);
 
 
@@ -263,14 +263,14 @@ void KSmartcardConfig::getSupportingModule( TDEListViewItem * ant,
                                                type,
                                                subType,
                                                subSubType);
-        hil->setSelectable(FALSE);
+        hil->setSelectable(false);
     }
     else{
 
 
         TDEListViewItem * hil =new TDEListViewItem(ant,
                                                i18n("No module managing this card"));
-        hil->setSelectable(FALSE);
+        hil->setSelectable(false);
     }
 
   }
@@ -304,7 +304,7 @@ void KSmartcardConfig::load(bool useDefaults )
   }
 
   // We call kardsvc to retrieve the current readers
-  kapp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
+  tdeApp->dcopClient()->call("kded", "kardsvc", "getSlotList ()",
 			   data, rettype, retval);
   TQStringList readers;
   readers.clear();
@@ -337,17 +337,17 @@ if (_ok) {
   // Start or stop the server as needed
   if (base->enableSupport->isChecked()) {
 
-    kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
 			     data, rettype, retval);
     config->sync();
 
-    kapp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
+    tdeApp->dcopClient()->call("kded", "kardsvc", "reconfigure()",
 			     data, rettype, retval);
   } else {
 
 
 
-    kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
+    tdeApp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
 			     data, rettype, retval);
   }
 
@@ -372,12 +372,12 @@ TQString KSmartcardConfig::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
   {
     return new KSmartcardConfig(parent, "kcmsmartcard");
   }
 
-  KDE_EXPORT void init_smartcard()
+  TDE_EXPORT void init_smartcard()
   {
     TDEConfig *config = new TDEConfig("ksmartcardrc", false, false);
     bool start = config->readBoolEntry("Enable Support", false);
@@ -389,7 +389,7 @@ extern "C"
 	TQDataStream arg(data, IO_WriteOnly);
 	TQCString modName = "kardsvc";
 	arg << modName;
-	kapp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
+	tdeApp->dcopClient()->call("kded", "kded", "loadModule(TQCString)",
 			         data, rettype, retval);
     }
   }
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index 9dee7d69b..dd138d5b3 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -297,11 +297,11 @@
 <includes>
     <include location="local" impldecl="in implementation">smartcardbase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>slotTestReader()</slot>
     <slot>enableSupport_toggled(bool)</slot>
     <slot>enablePolling_toggled(bool)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 99f1b729a..c5e0ad784 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -48,7 +48,7 @@ SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStri
 
     TQVBoxLayout *topLayout = new TQVBoxLayout(this);
     dialog = new SMServerConfigImpl(this);
-    connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed()));
+    connect(dialog, TQ_SIGNAL(changed()), TQ_SLOT(changed()));
 
     dialog->show();
     topLayout->add(dialog);
@@ -94,6 +94,7 @@ void SMServerConfig::load(bool useDefaults )
 
   c->setGroup("Logout");
   dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
+  dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false));
   dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true));
   dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true));
   dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()),
@@ -126,6 +127,7 @@ void SMServerConfig::save()
   c->writeEntry("excludeApps", dialog->excludeLineedit->text());
   c->setGroup("Logout");
   c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
+  c->writeEntry( "doUbuntuLogout", dialog->showUbuntuStyleDialog->isChecked());
   c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked());
   c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked());
   c->sync();
@@ -133,7 +135,7 @@ void SMServerConfig::save()
 
   // update the k menu if necessary
   TQByteArray data;
-  kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
+  tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data );
 }
 
 void SMServerConfig::defaults()
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index 1449e9d6f..9179722c7 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -62,10 +62,10 @@
                     <bool>false</bool>
                   </property>
                   <property name="text">
-                    <string>Show &amp;logout fadeaway</string>
+                    <string>Fadeaway screen during &amp;logout</string>
                   </property>
                   <property name="whatsThis" stdset="0">
-                    <string>Check this option if you want to see a fadeaway when displaying a logout confirmation dialog box.</string>
+                    <string>Check this option if you want screen to be faded when displaying a logout confirmation dialog box.</string>
                   </property>
                 </widget>
                 <widget class="TQCheckBox">
@@ -76,10 +76,10 @@
                     <bool>false</bool>
                   </property>
                   <property name="text">
-                    <string>Sho&amp;w fancy logout fadeaway</string>
+                    <string>Use effects for logout fadea&amp;way</string>
                   </property>
                   <property name="whatsThis" stdset="0">
-                    <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string>
+                    <string>Check this option if you want to enable additional graphical effects for fadeaway during logout process. Namely the fadeaway will be smoothly animated and semitransparent.</string>
                   </property>
                 </widget>
                 <widget class="TQCheckBox">
@@ -104,6 +104,17 @@
                         <string>Check this option if you want to see a dialog box showing the logout status.</string>
                     </property>
                 </widget>
+                <widget class="TQCheckBox">
+                    <property name="name">
+                        <cstring>showUbuntuStyleDialog</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Use &amp;alternative shutdown dialog layout</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Check this option if you want to use an alternative shutdown dialog, where buttons are arranged in rows rathen then columns. This layout is popular in Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog.</string>
+                    </property>
+                </widget>
             </vbox>
         </widget>
         <widget class="TQButtonGroup">
@@ -243,40 +254,22 @@
 </widget>
 <connections>
     <connection>
-        <sender>confirmLogoutCheck</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>SMServerConfigDlg</receiver>
-        <slot>configChanged()</slot>
-    </connection>
-    <connection>
       <sender>confirmLogoutCheck</sender>
       <signal>toggled(bool)</signal>
-      <receiver>showFadeAway</receiver>
-      <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-      <sender>confirmLogoutCheck</sender>
-      <signal>toggled(bool)</signal>
-      <receiver>showFancyFadeAway</receiver>
-      <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-      <sender>showFadeAway</sender>
-      <signal>toggled(bool)</signal>
-      <receiver>showFancyFadeAway</receiver>
-      <slot>setEnabled(bool)</slot>
+      <receiver>SMServerConfigDlg</receiver>
+      <slot>fadeAwayConfigChanged()</slot>
     </connection>
     <connection>
       <sender>showFadeAway</sender>
       <signal>toggled(bool)</signal>
       <receiver>SMServerConfigDlg</receiver>
-      <slot>configChanged()</slot>
+      <slot>fadeAwayConfigChanged()</slot>
     </connection>
     <connection>
       <sender>showFancyFadeAway</sender>
       <signal>toggled(bool)</signal>
       <receiver>SMServerConfigDlg</receiver>
-      <slot>configChanged()</slot>
+      <slot>fadeAwayConfigChanged()</slot>
     </connection>
     <connection>
         <sender>showLogoutStatusDialog</sender>
@@ -285,6 +278,12 @@
         <slot>configChanged()</slot>
     </connection>
     <connection>
+        <sender>showUbuntuStyleDialog</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
+    <connection>
         <sender>loginGroup</sender>
         <signal>clicked(int)</signal>
         <receiver>SMServerConfigDlg</receiver>
@@ -316,12 +315,14 @@
     </connection>
 </connections>
 <includes>
+    <include location="global" impldecl="in declaration">tqcheckbox.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>configChanged()</slot>
-</Q_SLOTS>
+    <slot>fadeAwayConfigChanged()</slot>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp
index d9507a9d8..af04d774a 100644
--- a/kcontrol/smserver/smserverconfigimpl.cpp
+++ b/kcontrol/smserver/smserverconfigimpl.cpp
@@ -18,14 +18,20 @@
 #include "smserverconfigimpl.h"
 #include "smserverconfigimpl.moc"
 
-SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {
+SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {}
 
+SMServerConfigImpl::~SMServerConfigImpl() {}
+
+void SMServerConfigImpl::configChanged()
+{
+  emit changed();
 }
-SMServerConfigImpl::~SMServerConfigImpl(){
-}
-/** No descriptions */
-void SMServerConfigImpl::configChanged(){
 
- emit changed();
+void SMServerConfigImpl::fadeAwayConfigChanged()
+{
+  // Update showFadeAway and showFancyFadeAway status correctly
+  showFadeAway->setEnabled(confirmLogoutCheck->isChecked());
+  showFancyFadeAway->setEnabled(confirmLogoutCheck->isChecked() && showFadeAway->isChecked());
 
+  configChanged();
 }
diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h
index 592609e9e..2e1186936 100644
--- a/kcontrol/smserver/smserverconfigimpl.h
+++ b/kcontrol/smserver/smserverconfigimpl.h
@@ -33,6 +33,7 @@ public:
 public slots: // Public slots
   /** No descriptions */
   void configChanged();
+  void fadeAwayConfigChanged();
 signals: // Signals
   /** No descriptions */
   void changed();
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index 805a98d6b..6816cd6c2 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -41,7 +41,7 @@ KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, c
 
   spellConfig = new KSpellConfig(box, 0L ,0L, false );
   layout->addStretch(1);
-  connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() ));
+  connect(spellConfig,TQ_SIGNAL(configChanged()), TQ_SLOT( changed() ));
 
   setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the TDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The TDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between TDE applications and non-TDE applications.</p>"));
 
@@ -56,9 +56,9 @@ void KSpellCheckingConfig::save()
 {
     spellConfig->writeGlobalSettings();
     TQByteArray data;
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
 }
 
 void KSpellCheckingConfig::defaults()
@@ -66,7 +66,7 @@ void KSpellCheckingConfig::defaults()
     spellConfig->setNoRootAffix(0);
     spellConfig->setRunTogether(0);
     spellConfig->setDictionary("");
-    spellConfig->setDictFromList(FALSE);
+    spellConfig->setDictFromList(false);
     spellConfig->setEncoding (KS_E_UTF8);
     spellConfig->setClient (KS_CLIENT_ISPELL);
 }
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index cc052e4c3..d72467364 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -51,9 +51,9 @@
 #include <klibloader.h>
 #include <tdelistview.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdestyle.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "../krdb/krdb.h"
 
@@ -73,13 +73,13 @@
 // Danimo: Why do we use the old interface?!
 extern "C"
 {
-    KDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*)
+    TDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*)
     {
         TDEGlobal::locale()->insertCatalogue("kcmstyle");
         return new KCMStyle(parent, "kcmstyle");
     }
 
-    KDE_EXPORT void init_style()
+    TDE_EXPORT void init_style()
     {
         uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings;
         TDEConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/);
@@ -92,11 +92,10 @@ extern "C"
         runRdb( flags );
 
         // Write some Qt root property.
-#ifndef __osf__      // this crashes under Tru64 randomly -- will fix later
         TQByteArray properties;
         TQDataStream d(properties, IO_WriteOnly);
         d.setVersion( 3 );      // Qt2 apps need this.
-        d << kapp->palette() << TDEGlobalSettings::generalFont();
+        d << tdeApp->palette() << TDEGlobalSettings::generalFont();
         Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
 
         // do it for all root windows - multihead support
@@ -105,7 +104,6 @@ extern "C"
             XChangeProperty(tqt_xdisplay(),  RootWindow(tqt_xdisplay(), i),
                             a, a, 8, PropModeReplace,
                             (unsigned char*) properties.data(), properties.size());
-#endif
     }
 }
 
@@ -165,12 +163,12 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
 
 	cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
-	cbStyle->setEditable( FALSE );
+	cbStyle->setEditable( false );
 	hbLayout->addWidget( cbStyle );
 
 	pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
 	pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
-	pbConfigStyle->setEnabled( FALSE );
+	pbConfigStyle->setEnabled( false );
 	hbLayout->addWidget( pbConfigStyle );
 
 	gbWidgetStyleLayout->addLayout( hbLayout );
@@ -197,7 +195,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 
 	m_popupMenuDelay = new KIntNumInput(250, gbWidgetStyle);
 	m_popupMenuDelay->setLabel(i18n("Menu popup delay:"));
-	m_popupMenuDelay->setRange(0, 5000, 50);
+	m_popupMenuDelay->setRange(0, 5000, 10);
 	m_popupMenuDelay->setSuffix(i18n(" msec"));
 	m_popupMenuDelay->setSteps(50, 50);
 	gbWidgetStyleLayout->addWidget(m_popupMenuDelay);
@@ -216,9 +214,9 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	page1Layout->addWidget( gbPreview );
 
 	// Connect all required stuff
-	connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) );
-	connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton()));
-	connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig()));
+	connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(styleChanged()) );
+	connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateConfigButton()));
+	connect( pbConfigStyle, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleSpecificConfig()));
 
 	// Add Page2 (Effects)
 	// -------------------
@@ -229,7 +227,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	containerLayout = new TQGridLayout( containerFrame, 1, 1,	// rows, columns
 		KDialog::marginHint(), KDialog::spacingHint() );
 
-	comboComboEffect = new TQComboBox( FALSE, containerFrame );
+	comboComboEffect = new TQComboBox( false, containerFrame );
 	comboComboEffect->insertItem( i18n("Disable") );
 	comboComboEffect->insertItem( i18n("Animate") );
 	lblComboEffect = new TQLabel( i18n("Combobo&x effect:"), containerFrame );
@@ -237,7 +235,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	containerLayout->addWidget( lblComboEffect, 0, 0 );
 	containerLayout->addWidget( comboComboEffect, 0, 1 );
 
-	comboTooltipEffect = new TQComboBox( FALSE, containerFrame );
+	comboTooltipEffect = new TQComboBox( false, containerFrame );
 	comboTooltipEffect->insertItem( i18n("Disable") );
 	comboTooltipEffect->insertItem( i18n("Animate") );
 	comboTooltipEffect->insertItem( i18n("Fade") );
@@ -246,7 +244,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	containerLayout->addWidget( lblTooltipEffect, 1, 0 );
 	containerLayout->addWidget( comboTooltipEffect, 1, 1 );
 
-	comboRubberbandEffect = new TQComboBox( FALSE, containerFrame );
+	comboRubberbandEffect = new TQComboBox( false, containerFrame );
 	comboRubberbandEffect->insertItem( i18n("Disable") );
 	comboRubberbandEffect->insertItem( i18n("Make translucent") );
 	lblRubberbandEffect = new TQLabel( i18n("&Rubberband effect:"), containerFrame );
@@ -254,7 +252,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	containerLayout->addWidget( lblRubberbandEffect, 2, 0 );
 	containerLayout->addWidget( comboRubberbandEffect, 2, 1 );
 	
-	comboMenuEffect = new TQComboBox( FALSE, containerFrame );
+	comboMenuEffect = new TQComboBox( false, containerFrame );
 	comboMenuEffect->insertItem( i18n("Disable") );
 	comboMenuEffect->insertItem( i18n("Animate") );
 	comboMenuEffect->insertItem( i18n("Fade") );
@@ -264,7 +262,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	containerLayout->addWidget( lblMenuEffect, 3, 0 );
 	containerLayout->addWidget( comboMenuEffect, 3, 1 );
 
-	comboMenuHandle = new TQComboBox( FALSE, containerFrame );
+	comboMenuHandle = new TQComboBox( false, containerFrame );
 	comboMenuHandle->insertItem( i18n("Disable") );
 	comboMenuHandle->insertItem( i18n("Application Level") );
 //	comboMenuHandle->insertItem( i18n("Enable") );
@@ -293,7 +291,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 
 	menuPreview = new MenuPreview( menuContainer, /* opacity */ 90, MenuPreview::Blend );
 
-	comboMenuEffectType = new TQComboBox( FALSE, menuContainer );
+	comboMenuEffectType = new TQComboBox( false, menuContainer );
 	comboMenuEffectType->insertItem( i18n("Software Tint") );
 	comboMenuEffectType->insertItem( i18n("Software Blend") );
 #ifdef HAVE_XRENDER
@@ -338,13 +336,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	page2Layout->addItem( sp1 );
 
 	// Data flow stuff.
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) );
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) );
-	connect( slOpacity,           TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) );
-	connect( comboMenuEffect,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) );
-	connect( comboMenuEffect,     TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) );
-	connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
-	connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)), containerFrame, TQ_SLOT(setEnabled(bool)) );
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(menuEffectChanged(bool)) );
+	connect( slOpacity,           TQ_SIGNAL(valueChanged(int)),menuPreview, TQ_SLOT(setOpacity(int)) );
+	connect( comboMenuEffect,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectChanged()) );
+	connect( comboMenuEffect,     TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectChanged()) );
+	connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectTypeChanged()) );
+	connect( comboMenuEffectType, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectTypeChanged()) );
 
 	// Add Page3 (Miscellaneous)
 	// -------------------------
@@ -355,7 +353,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	
 	TQHBoxLayout* box2 = new TQHBoxLayout( dummy, 0, KDialog::spacingHint() );
 	lbl = new TQLabel( i18n("Text pos&ition:"), dummy );
-	comboToolbarIcons = new TQComboBox( FALSE, dummy );
+	comboToolbarIcons = new TQComboBox( false, dummy );
 	comboToolbarIcons->insertItem( i18n("Icons Only") );
 	comboToolbarIcons->insertItem( i18n("Text Only") );
 	comboToolbarIcons->insertItem( i18n("Text Alongside Icons") );
@@ -379,29 +377,29 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	load();
 
 	// Do all the setDirty connections.
-	connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
+	connect(cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
 	// Page2
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbEnableEffects,     TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setStyleDirty()));
-	connect( comboTooltipEffect,  TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
-	connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)),   this, TQT_SLOT(setStyleDirty()));
-	connect( comboComboEffect,    TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
-	connect( comboMenuEffect,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
-	connect( comboMenuHandle,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
-	connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
-	connect( slOpacity,           TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty()));
-	connect( cbMenuShadow,        TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setStyleDirty()));
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbEnableEffects,     TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setStyleDirty()));
+	connect( comboTooltipEffect,  TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty()));
+	connect( comboRubberbandEffect, TQ_SIGNAL(activated(int)),   this, TQ_SLOT(setStyleDirty()));
+	connect( comboComboEffect,    TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty()));
+	connect( comboMenuEffect,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+	connect( comboMenuHandle,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+	connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+	connect( slOpacity,           TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty()));
+	connect( cbMenuShadow,        TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setStyleDirty()));
 	// Page1 & Page3
-	connect( cbHoverButtons,        TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setToolbarsDirty()));
-	connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setToolbarsDirty()));
-	connect( cbEnableTooltips,      TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbIconsOnButtons,      TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbScrollablePopupMenus,TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbAutoHideAccelerators,TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbMenuAltKeyNavigation,TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( cbTearOffHandles,      TQT_SIGNAL(toggled(bool)),    this, TQT_SLOT(setEffectsDirty()));
-	connect( comboToolbarIcons,     TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty()));
-	connect( m_popupMenuDelay,      TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty()));
+	connect( cbHoverButtons,        TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setToolbarsDirty()));
+	connect( cbTransparentToolbars, TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setToolbarsDirty()));
+	connect( cbEnableTooltips,      TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbIconsOnButtons,      TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbScrollablePopupMenus,TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbAutoHideAccelerators,TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbMenuAltKeyNavigation,TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( cbTearOffHandles,      TQ_SIGNAL(toggled(bool)),    this, TQ_SLOT(setEffectsDirty()));
+	connect( comboToolbarIcons,     TQ_SIGNAL(activated(int)), this, TQ_SLOT(setToolbarsDirty()));
+	connect( m_popupMenuDelay,      TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty()));
 
 	addWhatsThis();
 
@@ -479,9 +477,9 @@ void KCMStyle::styleSpecificConfig()
 	dial->setMainWidget( pluginConfig );
 
 	//..and connect it to the wrapper
-	connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool)));
-	connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults()));
-	connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save()));
+	connect(pluginConfig, TQ_SIGNAL(changed(bool)), dial, TQ_SLOT(setDirty(bool)));
+	connect(dial, TQ_SIGNAL(defaults()), pluginConfig, TQ_SLOT(defaults()));
+	connect(dial, TQ_SIGNAL(save()), pluginConfig, TQ_SLOT(save()));
 
 	if (dial->exec() == TQDialog::Accepted  && dial->isDirty() ) {
 		// Force re-rendering of the preview, to apply settings
@@ -670,12 +668,12 @@ void KCMStyle::save()
 
 	if (m_bEffectsDirty) {
 		KIPC::sendMessageAll(KIPC::SettingsChanged);
-		kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+		tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	}
         //update kicker to re-used tooltips kicker parameter otherwise, it overwritted
         //by style tooltips parameters.
         TQByteArray data;
-        kapp->dcopClient()->send( "kicker", "kicker", "configure()", data );
+        tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data );
 
 	// Clean up
 	m_bEffectsDirty  = false;
@@ -699,11 +697,11 @@ bool KCMStyle::findStyle( const TQString& str, int& combobox_item )
 		if ( cbStyle->text(i) == name )
 		{
 			combobox_item = i;
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 
@@ -747,7 +745,7 @@ void KCMStyle::loadStyle( TDEConfig& config )
 	TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
 	for (TQStringList::iterator it = list.begin(); it != list.end(); ++it)
 	{
-		KSimpleConfig config( *it, true );
+		TDESimpleConfig config( *it, true );
 		if ( !(config.hasGroup("KDE") && config.hasGroup("Misc")) )
 			continue;
 
@@ -851,7 +849,7 @@ void KCMStyle::styleChanged()
 void KCMStyle::switchStyle(const TQString& styleName, bool force)
 {
 	// Don't flicker the preview if the same style is chosen in the cb
-	if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) 
+	if (!force && appliedStyle && appliedStyle->name() == styleName) 
 		return;
          
 	// Create an instance of the new style...
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 7fa6ef698..17000c1d2 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-	KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
+	TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
 	{
 		return new KeramikStyleConfig(parent);
 	}
@@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
 	origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false);
 	animateProgressBar->setChecked(origAnimProgressBar);
 	
-	//connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
+	//connect(highlightLineEdits, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(highlightScrollBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
 }
 
 KeramikStyleConfig::~KeramikStyleConfig()
diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp
index 8cb426b3f..feb5deba7 100644
--- a/kcontrol/style/styleconfdialog.cpp
+++ b/kcontrol/style/styleconfdialog.cpp
@@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
            KDialogBase::Cancel)
 {
   m_dirty = false;
-  connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() ));
-  connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() ));
+  connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SIGNAL( defaults() ));
+  connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SIGNAL( save() ));
 }
 
 bool StyleConfigDialog::isDirty() const
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index ed6d2e43a..6b2f2a51c 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -276,10 +276,10 @@
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">stylepreview.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot returnType="bool">eventFilter( TQObject *, TQEvent * ev )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="10"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index 38f47ecee..2d2128396 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -59,9 +59,9 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
         case TQEvent::Leave:
         case TQEvent::Wheel:
         case TQEvent::ContextMenu:
-            return TRUE; // ignore
+            return true; // ignore
         default:
             break;
     }
-    return FALSE;
+    return false;
 }
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 570544a72..0d6de4f0c 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -35,7 +35,7 @@
 #include <kgenericfactory.h>
 #include <twin.h>
 #include <kcolorbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 
 #define protected public
@@ -192,15 +192,15 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_isGlobalConfig = true;
     }
-    connect(m_widget->globalConfigReload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadConfigurationFromGlobals()));
-    connect(m_widget->globalConfigEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditGlobalConfiguration()));
-    connect(m_widget->kcfg_UseGlobalSettings, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
-    connect(m_widget->kcfg_SortByApp, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
+    connect(m_widget->globalConfigReload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadConfigurationFromGlobals()));
+    connect(m_widget->globalConfigEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditGlobalConfiguration()));
+    connect(m_widget->kcfg_UseGlobalSettings, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
+    connect(m_widget->kcfg_SortByApp, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
 
     TQFile configFile(locateLocal("config", m_configFileName));
     if (!configFile.exists())
     {
-        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true);
         TDEConfig localConfig(m_configFileName);
         globalConfig.copyTo(m_configFileName, &localConfig);
         localConfig.sync();
@@ -222,10 +222,10 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     }
     m_widget->appearance->insertItem(i18n("Custom"));
 
-    connect(m_widget->appearance, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(appearanceChanged(int)));
-    connect(m_widget->kcfg_DisplayIconsNText, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(displayIconsNTextChanged(int)));
+    connect(m_widget->appearance, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(appearanceChanged(int)));
+    connect(m_widget->kcfg_DisplayIconsNText, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(displayIconsNTextChanged(int)));
     addConfig(m_settingsObject, m_widget);
 
     setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here."
@@ -241,9 +241,9 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList());
     m_widget->kcfg_ShowTaskStates->insertStringList(i18nShowTaskStatesList());
 
-    connect(m_widget->kcfg_GroupTasks, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(slotUpdateComboBox()));
-    connect(m_widget->kcfg_UseCustomColors, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCustomColors()));
+    connect(m_widget->kcfg_GroupTasks, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(slotUpdateComboBox()));
+    connect(m_widget->kcfg_UseCustomColors, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotUpdateCustomColors()));
 
     slotUpdateCustomColors();
     updateAppearanceCombo();
@@ -263,8 +263,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_widget->showAllScreens->show();
     }
-    connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed()));
-    connect( m_widget->smallIcons, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+    connect( m_widget->showAllScreens, TQ_SIGNAL( stateChanged( int )), TQ_SLOT( changed()));
+    connect( m_widget->smallIcons, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
 
     TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"),
                                        I18N_NOOP("TDE Taskbar Control Module"),
@@ -279,7 +279,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     load();
     processLockouts();
 
-    TQTimer::singleShot(0, this, TQT_SLOT(notChanged()));
+    TQTimer::singleShot(0, this, TQ_SLOT(notChanged()));
 }
 
 TaskbarConfig::~TaskbarConfig()
@@ -292,7 +292,7 @@ TaskbarConfig::~TaskbarConfig()
 
 void TaskbarConfig::slotEditGlobalConfiguration() {
     TQByteArray data;
-    kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
+    tdeApp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
 }
 
 void TaskbarConfig::processLockouts()
@@ -333,7 +333,7 @@ void TaskbarConfig::processLockouts()
 
 void TaskbarConfig::slotReloadConfigurationFromGlobals()
 {
-    TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+    TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true);
     TDEConfig localConfig(m_configFileName);
     globalConfig.copyTo(m_configFileName, &localConfig);
     localConfig.sync();
@@ -445,7 +445,7 @@ void TaskbarConfig::load()
     m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
 
     int iconSize = m_settingsObject->iconSize();
-    if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
+    if(tdeApp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
     {
         m_widget->smallIcons->setChecked(false);
     }
@@ -457,11 +457,11 @@ void TaskbarConfig::save()
 
     if(m_widget->smallIcons->isChecked())
     {
-        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small));
+        m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Small));
     }
     else
     {
-        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel));
+        m_settingsObject->setIconSize(tdeApp->iconLoader()->currentSize(TDEIcon::Panel));
     }
 
     m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked());
@@ -474,7 +474,7 @@ void TaskbarConfig::save()
     m_settingsObject->writeConfig();
 
     TQByteArray data;
-    kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
+    tdeApp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
 }
 
 void TaskbarConfig::defaults()
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index f81fba326..1298677b6 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     {
         itsSplitter=new TQSplitter(this);
         fontsFrame=new TQFrame(itsSplitter),
-        itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart");
+        itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
         itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 
         TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
@@ -156,7 +156,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1);
 
     KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame);
-    connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts()));
+    connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addFonts()));
     button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     fontsLayout->addWidget(button, 1, 0);
     fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
@@ -182,15 +182,15 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
     topMnu->popupMenu()->clear();
-    connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu()));
+    connect(topMnu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupMenu()));
     if((act=itsDirOp->actionCollection()->action("up")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(cdUp()));
     if((act=itsDirOp->actionCollection()->action("home")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(home()));
     if((act=itsDirOp->actionCollection()->action("back")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(back()));
     if((act=itsDirOp->actionCollection()->action("forward")))
-        act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward()));
+        act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(forward()));
 
     if((act=itsDirOp->actionCollection()->action("reload")))
         act->plug(toolbar);
@@ -199,26 +199,26 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view"))))
     {
-        disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView()));
-        connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView()));
+        disconnect(itsIconAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotSimpleView()));
+        connect(itsIconAct, TQ_SIGNAL(activated()), TQ_SLOT(iconView()));
         itsIconAct->plug(toolbar);
     }
 
     if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
     {
-        disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView()));
-        connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView()));
+        disconnect(itsListAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotDetailedView()));
+        connect(itsListAct, TQ_SIGNAL(activated()), TQ_SLOT(listView()));
         itsListAct->plug(toolbar);
     }
 
-    itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), 
+    itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQ_SLOT(filterFonts()), 
                                        itsDirOp->actionCollection(), "showbitmap");
     itsShowBitmapAct->setChecked(showBitmap);
     itsShowBitmapAct->plug(toolbar);
 
     toolbar->insertLineSeparator();
 
-    act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
+    act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQ_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
     act->plug(toolbar);
     topMnu->insert(act);
 
@@ -227,24 +227,24 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
         itsDeleteAct->plug(toolbar);
         itsDeleteAct->setEnabled(false);
         topMnu->insert(itsDeleteAct);
-        disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected()));
-        connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts()));
+        disconnect(itsDeleteAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(deleteSelected()));
+        connect(itsDeleteAct, TQ_SIGNAL(activated()), this, TQ_SLOT(removeFonts()));
     }
 
     toolbar->insertLineSeparator();
-    act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
+    act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(configure()), itsDirOp->actionCollection(), "configure");
     act->plug(toolbar);
 #ifdef HAVE_XFT
     toolbar->insertLineSeparator();
-    act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+    act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQ_SLOT(print()), itsDirOp->actionCollection(), "print");
     act->plug(toolbar);
 #endif
 
     if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) &&
         (itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden")))
     {
-        //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions()));
-        connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu()));
+        //disconnect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), itsDirOp, TQ_SLOT(insertViewDependentActions()));
+        connect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupViewMenu()));
         setupViewMenu();
     }
 
@@ -267,12 +267,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     itsDirOp->dirLister()->setShowingDotFiles(true);
 
-    connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *)));
-    connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished()));
-    connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)),
-                      TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)));
-    connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &)));
-    connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int)));
+    connect(itsDirOp, TQ_SIGNAL(fileHighlighted(const KFileItem *)), TQ_SLOT(fileHighlighted(const KFileItem *)));
+    connect(itsDirOp, TQ_SIGNAL(finishedLoading()), TQ_SLOT(loadingFinished()));
+    connect(itsDirOp, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)),
+                      TQ_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)));
+    connect(itsDirOp->dirLister(), TQ_SIGNAL(infoMessage(const TQString &)), TQ_SLOT(infoMessage(const TQString &)));
+    connect(itsDirOp, TQ_SIGNAL(updateInformation(int, int)), TQ_SLOT(updateInformation(int, int)));
 }
 
 CKCmFontInst::~CKCmFontInst()
@@ -465,7 +465,7 @@ void CKCmFontInst::removeFonts()
         if(doIt)
         {
             TDEIO::DeleteJob *job = TDEIO::del(urls, false, true);
-            connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *)));
+            connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(delResult(TDEIO::Job *)));
             job->setWindow(this);
             job->setAutoErrorHandlingEnabled(true, this);
         }
@@ -637,7 +637,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
         }
 
         TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true);
-        connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *)));
+        connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(jobResult(TDEIO::Job *)));
         job->setWindow(this);
         job->setAutoErrorHandlingEnabled(true, this);
     }
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
index 559c8c4c5..e9f5b7dae 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
@@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(TQWidget *parent, const char *name)
     setAllColumnsShowFocus(true);
     setDragEnabled(false);
 
-    connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int)));
-    connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *)));
-    connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *)));
-    connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *)));
-    connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-	    this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &)));
+    connect(header(), TQ_SIGNAL(sectionClicked(int)), TQ_SLOT(slotSortingChanged(int)));
+    connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(slotActivate(TQListViewItem *)));
+    connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(selected( TQListViewItem *)));
+    connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotActivate(TQListViewItem *)));
+    connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+	    this, TQ_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &)));
 
     // DND
-    connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen()));
+    connect(&(d->itsAutoOpenTimer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoOpen()));
     setSelectionMode(KFileView::selectionMode());
     itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this);
 }
@@ -211,8 +211,8 @@ void CKFileFontView::highlighted( TQListViewItem *item )
 
 void CKFileFontView::setSelectionMode(KFile::SelectionMode sm)
 {
-    disconnect(TQT_SIGNAL(selectionChanged()), this);
-    disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this);
+    disconnect(TQ_SIGNAL(selectionChanged()), this);
+    disconnect(TQ_SIGNAL(selectionChanged(TQListViewItem *)), this);
 
     switch (sm)
     {
@@ -233,9 +233,9 @@ void CKFileFontView::setSelectionMode(KFile::SelectionMode sm)
 
     // for highlighting
     if (KFile::Multi==sm || KFile::Extended==sm)
-        connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+        connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
     else
-        connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * )));
+        connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(highlighted(TQListViewItem * )));
 }
 
 bool CKFileFontView::isSelected(const KFileItem *i) const
diff --git a/kcontrol/tdefontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h
index 535baa6e1..5db48b0c3 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.h
+++ b/kcontrol/tdefontinst/lib/FcEngine.h
@@ -45,7 +45,7 @@ typedef struct _XftFont  XftFont;
 namespace KFI
 {
 
-class KDE_EXPORT CFcEngine
+class TDE_EXPORT CFcEngine
 {
     public:
 
diff --git a/kcontrol/tdefontinst/lib/Misc.cpp b/kcontrol/tdefontinst/lib/Misc.cpp
index 1a5952ce4..7f21abf0b 100644
--- a/kcontrol/tdefontinst/lib/Misc.cpp
+++ b/kcontrol/tdefontinst/lib/Misc.cpp
@@ -28,8 +28,8 @@
 
 #include "Misc.h"
 #include <tqfile.h>
-#include <kprocess.h> 
-#include <kstandarddirs.h>
+#include <tdeprocess.h> 
+#include <tdestandarddirs.h>
 #include <klargefile.h>
 #include <tdeio/netaccess.h>
 #include <unistd.h>
diff --git a/kcontrol/tdefontinst/lib/Misc.h b/kcontrol/tdefontinst/lib/Misc.h
index ee8de5445..3fd49d34a 100644
--- a/kcontrol/tdefontinst/lib/Misc.h
+++ b/kcontrol/tdefontinst/lib/Misc.h
@@ -50,25 +50,25 @@ namespace Misc
         DIR_PERMS    = 0755
     };
 
-    extern KDE_EXPORT bool    check(const TQString &path, unsigned int fmt, bool checkW=false);
-    inline KDE_EXPORT bool    fExists(const TQString &p)     { return check(p, S_IFREG, false); }
-    inline KDE_EXPORT bool    dExists(const TQString &p)     { return check(p, S_IFDIR, false); }
-    inline KDE_EXPORT bool    fWritable(const TQString &p)   { return check(p, S_IFREG, true); }
-    inline KDE_EXPORT bool    dWritable(const TQString &p)   { return check(p, S_IFDIR, true); }
-    inline KDE_EXPORT bool    isLink(const TQString &i)      { return check(i, S_IFLNK, false); }
-    extern KDE_EXPORT TQString linkedTo(const TQString &i);
-    extern KDE_EXPORT TQString dirSyntax(const TQString &d);  // Has trailing slash:  /file/path/
-    extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash:   /file/path
-    inline KDE_EXPORT TQString fileSyntax(const TQString &f)  { return xDirSyntax(f); }
-    extern KDE_EXPORT TQString getDir(const TQString &f);
-    extern KDE_EXPORT TQString getFile(const TQString &f);
-    extern KDE_EXPORT bool    createDir(const TQString &dir);
-    extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt);
-    extern KDE_EXPORT bool    doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null);
-    inline KDE_EXPORT bool    root() { return 0==getuid(); }
-    extern KDE_EXPORT void    getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL);
-    extern KDE_EXPORT void    createBackup(const TQString &f);
-    extern KDE_EXPORT time_t  getTimeStamp(const TQString &item);
+    extern TDE_EXPORT bool    check(const TQString &path, unsigned int fmt, bool checkW=false);
+    inline TDE_EXPORT bool    fExists(const TQString &p)     { return check(p, S_IFREG, false); }
+    inline TDE_EXPORT bool    dExists(const TQString &p)     { return check(p, S_IFDIR, false); }
+    inline TDE_EXPORT bool    fWritable(const TQString &p)   { return check(p, S_IFREG, true); }
+    inline TDE_EXPORT bool    dWritable(const TQString &p)   { return check(p, S_IFDIR, true); }
+    inline TDE_EXPORT bool    isLink(const TQString &i)      { return check(i, S_IFLNK, false); }
+    extern TDE_EXPORT TQString linkedTo(const TQString &i);
+    extern TDE_EXPORT TQString dirSyntax(const TQString &d);  // Has trailing slash:  /file/path/
+    extern TDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash:   /file/path
+    inline TDE_EXPORT TQString fileSyntax(const TQString &f)  { return xDirSyntax(f); }
+    extern TDE_EXPORT TQString getDir(const TQString &f);
+    extern TDE_EXPORT TQString getFile(const TQString &f);
+    extern TDE_EXPORT bool    createDir(const TQString &dir);
+    extern TDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt);
+    extern TDE_EXPORT bool    doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null);
+    inline TDE_EXPORT bool    root() { return 0==getuid(); }
+    extern TDE_EXPORT void    getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL);
+    extern TDE_EXPORT void    createBackup(const TQString &f);
+    extern TDE_EXPORT time_t  getTimeStamp(const TQString &item);
 }
 
 }
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index 54de7bdcf..753e412cd 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -52,15 +52,15 @@
 #include <tqtextstream.h>
 #include <kmimetype.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tqdir.h>
 #include <tqdatastream.h>
 #include <tqregexp.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <klargefile.h>
 #include <tdetempfile.h>
 #include <tdesu/su.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kdebug.h>
 #include <ktar.h>
 #include <kxftconfig.h>
@@ -97,7 +97,7 @@ static const int    constMaxFcCheckTime=10;
 
 extern "C"
 {
-    KDE_EXPORT int kdemain(int argc, char **argv);
+    TDE_EXPORT int kdemain(int argc, char **argv);
 }
 
 int kdemain(int argc, char **argv)
diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
index a053393f4..c7c00ef0f 100644
--- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
@@ -38,7 +38,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new KFI::CFontThumbnail;
     }
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index ff2eaae77..7b5a7a5bf 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     {
         if(!itsCurrentUrl.isEmpty())
         {
-            paint.setPen(kapp->palette().active().text());
+            paint.setPen(tdeApp->palette().active().text());
             paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
         }
     }
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index 3dc0f62b6..b3f3b1c94 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -45,7 +45,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 #include <tdeio/netaccess.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kstdaction.h>
@@ -103,14 +103,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
     toolsLayout->addWidget(itsInstallButton);
     itsToolsFrame->hide();
-    connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool)));
-    connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
-    connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
+    connect(itsPreview, TQ_SIGNAL(status(bool)), TQ_SLOT(previewStatus(bool)));
+    connect(itsInstallButton, TQ_SIGNAL(clicked()), TQ_SLOT(install()));
+    connect(itsFaceSelector, TQ_SIGNAL(valueChanged(int)), itsPreview, TQ_SLOT(showFace(int)));
 
     itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(),
-                                    this, TQT_SLOT(changeText()), actionCollection(), "changeText");
+                                    this, TQ_SLOT(changeText()), actionCollection(), "changeText");
     itsChangeTextAction->setEnabled(false);
-    itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
+    itsPrintAction=KStdAction::print(this, TQ_SLOT(print()), actionCollection(), "print");
     itsPrintAction->setEnabled(false);
 
     setXMLFile("tdefontviewpart.rc");
@@ -143,7 +143,7 @@ bool CFontViewPart::openFile()
 {
     // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up.
     // Bug report 111535 indicates that calling "konqueror <font>" crashes.
-    TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
+    TQTimer::singleShot(0, this, TQ_SLOT(timeout()));
     return true;
 }
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
index a43f9d1d2..a2ea58602 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
@@ -30,12 +30,12 @@
 #include "FontViewPart.h"
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <assert.h>
 
 extern "C"
 {
-    KDE_EXPORT void* init_libtdefontviewpart()
+    TDE_EXPORT void* init_libtdefontviewpart()
     {
         TDEGlobal::locale()->insertCatalogue("tdefontinst");
         return new KFI::CFontViewPartFactory;
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index df1fa92d2..057b54831 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
     if(factory)
     {
-        KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-        KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+        KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+        KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
-        itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart");
+        itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         KURL         openURL;
@@ -72,9 +72,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
             itsPreview->openURL(openURL);
 
         TQSize             defSize(450, 380);
-        TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
+        TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
 
-        resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
+        resize(tdeApp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
         show();
     }
     else
@@ -83,9 +83,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
 CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
 {
-    TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
-    kapp->config()->writeEntry(CFG_SIZE_KEY, size());
-    kapp->config()->sync();
+    TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP);
+    tdeApp->config()->writeEntry(CFG_SIZE_KEY, size());
+    tdeApp->config()->sync();
 }
 
 void CFontViewerAppMainWindow::fileOpen()
diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp
index 42c0fc28f..b05f11b47 100644
--- a/kcontrol/tdeio/cache.cpp
+++ b/kcontrol/tdeio/cache.cpp
@@ -29,7 +29,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <knuminput.h>
 
 #include "ksaveioconfig.h"
@@ -66,10 +66,10 @@ void KCacheConfigDialog::load()
       m_dlg->rbCacheIfPossible->setChecked( true );
 
   // Config changed notifications...
-  connect ( m_dlg->cbUseCache, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) );
-  connect ( m_dlg->bgCachePolicy, TQT_SIGNAL(clicked (int)), TQT_SLOT(configChanged()) );
-  connect ( m_dlg->sbMaxCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) );
-  connect ( m_dlg->pbClearCache, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearCache()) );
+  connect ( m_dlg->cbUseCache, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) );
+  connect ( m_dlg->bgCachePolicy, TQ_SIGNAL(clicked (int)), TQ_SLOT(configChanged()) );
+  connect ( m_dlg->sbMaxCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(configChanged()) );
+  connect ( m_dlg->pbClearCache, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearCache()) );
   emit changed( false );
 } 
 
diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp
index b48d19738..b31645574 100644
--- a/kcontrol/tdeio/fakeuaprovider.cpp
+++ b/kcontrol/tdeio/fakeuaprovider.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "fakeuaprovider.h"
 
diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp
index 9869c6c92..10ed75d26 100644
--- a/kcontrol/tdeio/kcookiesmain.cpp
+++ b/kcontrol/tdeio/kcookiesmain.cpp
@@ -46,7 +46,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
     tab->addTab(policies, i18n("&Policy"));
     policiesTabNumber = currentTabNumber;
     currentTabNumber++;
-    connect(policies, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(policies, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
     if( managerOK )
     {
@@ -54,7 +54,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
         tab->addTab(management, i18n("&Management"));
         managementTabNumber = currentTabNumber;
         currentTabNumber++;
-        connect(management, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+        connect(management, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
     }
 }
 
diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp
index 1a9314d91..e3737ff6b 100644
--- a/kcontrol/tdeio/kcookiesmanagement.cpp
+++ b/kcontrol/tdeio/kcookiesmanagement.cpp
@@ -114,15 +114,15 @@ KCookiesManagement::KCookiesManagement(TQWidget *parent)
   mainLayout->addWidget(dlg);
   dlg->lvCookies->setSorting(0);
 
-  connect(dlg->lvCookies, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(getCookies(TQListViewItem*)) );
-  connect(dlg->lvCookies, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(showCookieDetails(TQListViewItem*)) );
+  connect(dlg->lvCookies, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(getCookies(TQListViewItem*)) );
+  connect(dlg->lvCookies, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(showCookieDetails(TQListViewItem*)) );
 
-  connect(dlg->pbDelete, TQT_SIGNAL(clicked()), TQT_SLOT(deleteCookie()));
-  connect(dlg->pbDeleteAll, TQT_SIGNAL(clicked()), TQT_SLOT(deleteAllCookies()));
-  connect(dlg->pbReload, TQT_SIGNAL(clicked()), TQT_SLOT(getDomains()));
-  connect(dlg->pbPolicy, TQT_SIGNAL(clicked()), TQT_SLOT(doPolicy()));
+  connect(dlg->pbDelete, TQ_SIGNAL(clicked()), TQ_SLOT(deleteCookie()));
+  connect(dlg->pbDeleteAll, TQ_SIGNAL(clicked()), TQ_SLOT(deleteAllCookies()));
+  connect(dlg->pbReload, TQ_SIGNAL(clicked()), TQ_SLOT(getDomains()));
+  connect(dlg->pbPolicy, TQ_SIGNAL(clicked()), TQ_SLOT(doPolicy()));
 
-  connect(dlg->lvCookies, TQT_SIGNAL(doubleClicked (TQListViewItem *)), TQT_SLOT(doPolicy()));
+  connect(dlg->lvCookies, TQ_SIGNAL(doubleClicked (TQListViewItem *)), TQ_SLOT(doPolicy()));
   deletedCookies.setAutoDelete(true);
   m_bDeleteAll = false;
   mainWidget = parent;
diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index a39773cf1..6febd106e 100644
--- a/kcontrol/tdeio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -323,40 +323,40 @@ void KCookiesPolicies::load()
   }
 
   // Connect the main swicth :) Enable/disable cookie support
-  connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ),
-           TQT_SLOT( cookiesEnabled(bool) ) );
-  connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ),
-           TQT_SLOT( configChanged() ) );
+  connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ),
+           TQ_SLOT( cookiesEnabled(bool) ) );
+  connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ),
+           TQ_SLOT( configChanged() ) );
 
   // Connect the preference check boxes...
-  connect ( dlg->cbRejectCrossDomainCookies, TQT_SIGNAL(clicked()),
-            TQT_SLOT(configChanged()));
-  connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(configChanged()));
-  connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(configChanged()));
-
-  connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(autoAcceptSessionCookies(bool)));
-  connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(ignoreCookieExpirationDate(bool)));
+  connect ( dlg->cbRejectCrossDomainCookies, TQ_SIGNAL(clicked()),
+            TQ_SLOT(configChanged()));
+  connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(configChanged()));
+  connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(configChanged()));
+
+  connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(autoAcceptSessionCookies(bool)));
+  connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(ignoreCookieExpirationDate(bool)));
 
   // Connect the default cookie policy radio buttons...
-  connect(dlg->bgDefault, TQT_SIGNAL(clicked(int)), TQT_SLOT(configChanged()));
+  connect(dlg->bgDefault, TQ_SIGNAL(clicked(int)), TQ_SLOT(configChanged()));
 
   // Connect signals from the domain specific policy listview.
-  connect( dlg->lvDomainPolicy, TQT_SIGNAL(selectionChanged()),
-           TQT_SLOT(selectionChanged()) );
-  connect( dlg->lvDomainPolicy, TQT_SIGNAL(doubleClicked (TQListViewItem *)),
-           TQT_SLOT(changePressed() ) );
-  connect( dlg->lvDomainPolicy, TQT_SIGNAL(returnPressed ( TQListViewItem * )),
-           TQT_SLOT(changePressed() ) );
+  connect( dlg->lvDomainPolicy, TQ_SIGNAL(selectionChanged()),
+           TQ_SLOT(selectionChanged()) );
+  connect( dlg->lvDomainPolicy, TQ_SIGNAL(doubleClicked (TQListViewItem *)),
+           TQ_SLOT(changePressed() ) );
+  connect( dlg->lvDomainPolicy, TQ_SIGNAL(returnPressed ( TQListViewItem * )),
+           TQ_SLOT(changePressed() ) );
 
   // Connect the buttons...
-  connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) );
-  connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
-  connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
-  connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
+  connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) );
+  connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) );
+  connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) );
+  connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) );
 }
 
 void KCookiesPolicies::save()
diff --git a/kcontrol/tdeio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp
index e8d1c0e47..2a8b348c7 100644
--- a/kcontrol/tdeio/kenvvarproxydlg.cpp
+++ b/kcontrol/tdeio/kenvvarproxydlg.cpp
@@ -83,9 +83,9 @@ void KEnvVarProxyDlg::init()
 {
   m_bHasValidData = false;
 
-  connect( mDlg->cbShowValue, TQT_SIGNAL( clicked() ), TQT_SLOT( showValuePressed() ) );
-  connect( mDlg->pbVerify, TQT_SIGNAL( clicked() ), TQT_SLOT( verifyPressed() ) );
-  connect( mDlg->pbDetect, TQT_SIGNAL( clicked() ), TQT_SLOT( autoDetectPressed() ) );
+  connect( mDlg->cbShowValue, TQ_SIGNAL( clicked() ), TQ_SLOT( showValuePressed() ) );
+  connect( mDlg->pbVerify, TQ_SIGNAL( clicked() ), TQ_SLOT( verifyPressed() ) );
+  connect( mDlg->pbDetect, TQ_SIGNAL( clicked() ), TQ_SLOT( autoDetectPressed() ) );
 }
 
 void KEnvVarProxyDlg::setProxyData( const KProxyData& data )
diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index 01d2b584c..0d785025d 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -63,19 +63,19 @@ void KManualProxyDlg::init()
     mDlg->sbHttps->setRange( 0, MAX_PORT_VALUE );
     mDlg->sbFtp->setRange( 0, MAX_PORT_VALUE );
 
-    connect( mDlg->pbNew, TQT_SIGNAL( clicked() ), TQT_SLOT( newPressed() ) );
-    connect( mDlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
-    connect( mDlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
-    connect( mDlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
+    connect( mDlg->pbNew, TQ_SIGNAL( clicked() ), TQ_SLOT( newPressed() ) );
+    connect( mDlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) );
+    connect( mDlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) );
+    connect( mDlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) );
 
-    connect( mDlg->lbExceptions, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) );
-    connect( mDlg->lbExceptions, TQT_SIGNAL(doubleClicked (TQListBoxItem *)), TQT_SLOT(changePressed()));
+    connect( mDlg->lbExceptions, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) );
+    connect( mDlg->lbExceptions, TQ_SIGNAL(doubleClicked (TQListBoxItem *)), TQ_SLOT(changePressed()));
 
-    connect( mDlg->cbSameProxy, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( sameProxy(bool) ) );
-    connect( mDlg->pbCopyDown, TQT_SIGNAL( clicked() ), TQT_SLOT( copyDown() ) );
+    connect( mDlg->cbSameProxy, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( sameProxy(bool) ) );
+    connect( mDlg->pbCopyDown, TQ_SIGNAL( clicked() ), TQ_SLOT( copyDown() ) );
 
-    connect( mDlg->leHttp, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) );
-    connect( mDlg->sbHttp, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChanged (int)) );
+    connect( mDlg->leHttp, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) );
+    connect( mDlg->sbHttp, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChanged (int)) );
 }
 
 void KManualProxyDlg::setProxyData( const KProxyData &data )
diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp
index 9253916d7..344392b91 100644
--- a/kcontrol/tdeio/kproxydlg.cpp
+++ b/kcontrol/tdeio/kproxydlg.cpp
@@ -54,9 +54,9 @@ KProxyOptions::KProxyOptions (TQWidget* parent )
   mTab->addTab(mProxy, i18n("&Proxy"));
   mTab->addTab(mSocks, i18n("&SOCKS"));
 
-  connect(mProxy, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(mSocks, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(mTab, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SIGNAL(quickHelpChanged()));
+  connect(mProxy, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(mSocks, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(mTab, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SIGNAL(quickHelpChanged()));
 }
 
 KProxyOptions::~KProxyOptions()
@@ -121,27 +121,27 @@ KProxyDialog::KProxyDialog( TQWidget* parent)
   mainLayout->addStretch();
   
   // signals and slots connections
-  connect( mDlg->rbNoProxy, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotUseProxyChanged() ) );
+  connect( mDlg->rbNoProxy, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotUseProxyChanged() ) );
   
-  connect( mDlg->rbAutoDiscover, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
-  connect( mDlg->rbAutoScript, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->rbAutoDiscover, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
+  connect( mDlg->rbAutoScript, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->rbPrompt, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
-  connect( mDlg->rbPresetLogin, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->rbPrompt, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
+  connect( mDlg->rbPresetLogin, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->cbPersConn, TQT_SIGNAL( toggled(bool) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->cbPersConn, TQ_SIGNAL( toggled(bool) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->location, TQT_SIGNAL( textChanged(const TQString&) ),
-            TQT_SLOT( slotChanged() ) );
+  connect( mDlg->location, TQ_SIGNAL( textChanged(const TQString&) ),
+            TQ_SLOT( slotChanged() ) );
   
-  connect( mDlg->pbEnvSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupEnvProxy() ) );
-  connect( mDlg->pbManSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupManProxy() ) );
+  connect( mDlg->pbEnvSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupEnvProxy() ) );
+  connect( mDlg->pbManSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupManProxy() ) );
   
   load();
 }
diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp
index c0770af9e..7000f2542 100644
--- a/kcontrol/tdeio/main.cpp
+++ b/kcontrol/tdeio/main.cpp
@@ -40,37 +40,37 @@
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/)
   {
     return new KCookiesMain(parent);
   }
 
-  KDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/)
   {
     return new SMBRoOptions(parent);
   }
 
-  KDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/)
   {
     return new UserAgentDlg(parent);
   }
 
-  KDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/)
   {
     return new KProxyOptions(parent);
   }
 
-  KDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/)
   {
     return new KCacheConfigDialog( parent );
   }
 
-  KDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/)
+  TDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/)
   {
     return new KIOPreferences(parent);
   }
 
-  KDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *)
   {
     return new LanBrowser(parent);
   }
@@ -110,7 +110,7 @@ LanBrowser::LanBrowser(TQWidget *parent)
    tabs.addTab(smbPage, i18n("&Windows Shares"));
    smbPageTabNumber = currentTabNumber;
    currentTabNumber++;
-   connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() ));
+   connect(smbPage,TQ_SIGNAL(changed(bool)), TQ_SLOT( changed() ));
 
    lisaPage = TDECModuleLoader::loadModule("kcmlisa", TDECModuleLoader::None, &tabs);
    if (lisaPage)
@@ -118,14 +118,14 @@ LanBrowser::LanBrowser(TQWidget *parent)
      tabs.addTab(lisaPage,i18n("&LISa Daemon"));
      lisaPageTabNumber = currentTabNumber;
      currentTabNumber++;
-     connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+     connect(lisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
    }
 
 //   resLisaPage = TDECModuleLoader::loadModule("kcmreslisa", &tabs);
 //   if (resLisaPage)
 //   {
 //     tabs.addTab(resLisaPage,i18n("R&esLISa Daemon"));
-//     connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+//     connect(resLisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
 //   }
 
    tdeioLanPage = TDECModuleLoader::loadModule("kcmtdeiolan",  TDECModuleLoader::None, &tabs);
@@ -134,7 +134,7 @@ LanBrowser::LanBrowser(TQWidget *parent)
      tabs.addTab(tdeioLanPage,i18n("lan:/ Iosla&ve"));
      tdeioLanPageTabNumber = currentTabNumber;
      currentTabNumber++;
-     connect(tdeioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
+     connect(tdeioLanPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() ));
    }
 
    setButtons(Apply|Help);
diff --git a/kcontrol/tdeio/netpref.cpp b/kcontrol/tdeio/netpref.cpp
index acde5635e..2cf465977 100644
--- a/kcontrol/tdeio/netpref.cpp
+++ b/kcontrol/tdeio/netpref.cpp
@@ -29,29 +29,29 @@ KIOPreferences::KIOPreferences( TQWidget* parent )
     sb_socketRead = new KIntNumInput( gb_Timeout, "sb_socketRead" );
     sb_socketRead->setSuffix( i18n( " sec" ) );
     sb_socketRead->setLabel( i18n( "Soc&ket read:" ), AlignVCenter);
-    connect(sb_socketRead, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_socketRead, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     sb_proxyConnect = new KIntNumInput( sb_socketRead, 0, gb_Timeout,
             10, "sb_proxyConnect" );
     sb_proxyConnect->setSuffix( i18n( " sec" ) );
     sb_proxyConnect->setLabel( i18n( "Pro&xy connect:" ), AlignVCenter);
-    connect(sb_proxyConnect, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_proxyConnect, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     sb_serverConnect = new KIntNumInput( sb_proxyConnect, 0, gb_Timeout,
             10, "sb_serverConnect" );
     sb_serverConnect->setSuffix( i18n( " sec" ) );
     sb_serverConnect->setLabel( i18n("Server co&nnect:"), AlignVCenter);
-    connect(sb_serverConnect, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_serverConnect, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     sb_serverResponse = new KIntNumInput( sb_serverConnect, 0, gb_Timeout,
             10, "sb_serverResponse" );
     sb_serverResponse->setSuffix( i18n( " sec" ) );
     sb_serverResponse->setLabel( i18n("&Server response:"), AlignVCenter);
-    connect(sb_serverResponse, TQT_SIGNAL(valueChanged ( int )),
-            this, TQT_SLOT(configChanged()));
+    connect(sb_serverResponse, TQ_SIGNAL(valueChanged ( int )),
+            this, TQ_SLOT(configChanged()));
 
     gb_Ftp = new TQVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" );
     cb_ftpEnablePasv = new TQCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp );
@@ -64,8 +64,8 @@ KIOPreferences::KIOPreferences( TQWidget* parent )
 
     mainLayout->addWidget( gb_Ftp );
 
-    connect(cb_ftpEnablePasv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
-    connect(cb_ftpMarkPartial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
+    connect(cb_ftpEnablePasv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()));
+    connect(cb_ftpMarkPartial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()));
 
     mainLayout->addStretch();
 
diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp
index c45dd837e..77c818cf2 100644
--- a/kcontrol/tdeio/policydlg.cpp
+++ b/kcontrol/tdeio/policydlg.cpp
@@ -63,12 +63,12 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent,
   m_dlgUI = new PolicyDlgUI (this);
   setMainWidget(m_dlgUI);
 
-  m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain)));
+  m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain));
   m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 );
   
   enableButtonOK( false );
-  connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)),
-    TQT_SLOT(slotTextChanged(const TQString&)));
+  connect(m_dlgUI->leDomain, TQ_SIGNAL(textChanged(const TQString&)),
+    TQ_SLOT(slotTextChanged(const TQString&)));
 
   setFixedSize (sizeHint());
   m_dlgUI->leDomain->setFocus ();
diff --git a/kcontrol/tdeio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp
index ccb070e33..4df8ff396 100644
--- a/kcontrol/tdeio/smbrodlg.cpp
+++ b/kcontrol/tdeio/smbrodlg.cpp
@@ -73,11 +73,11 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent)
 
    layout->addWidget(new TQWidget(this),4,0);
 
-//   connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
-   connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
-   connect(m_passwordLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
-//   connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
-//   connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) );
+//   connect(m_showHiddenShares, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+   connect(m_userLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed()));
+   connect(m_passwordLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed()));
+//   connect(m_workgroupLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed()));
+//   connect( m_encodingList, TQ_SIGNAL( activated( const TQString & ) ), this , TQ_SLOT( changed() ) );
 
    layout->setRowStretch(4, 1);
 
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index 91d8cfd5c..40dbf24dd 100644
--- a/kcontrol/tdeio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -52,26 +52,26 @@ KSocksConfig::KSocksConfig(TQWidget *parent)
   base = new SocksBase(this);
   layout->add(base);
 
-  connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
-  connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int)));
+  connect(base->_c_enableSocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+  connect(base->bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(methodChanged(int)));
 
   // The custom library
-  connect(base->_c_customPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *)));
-  connect(base->_c_customPath, TQT_SIGNAL(textChanged(const TQString&)),
-                     this, TQT_SLOT(customPathChanged(const TQString&)));
+  connect(base->_c_customPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *)));
+  connect(base->_c_customPath, TQ_SIGNAL(textChanged(const TQString&)),
+                     this, TQ_SLOT(customPathChanged(const TQString&)));
 
   // Additional libpaths
-  connect(base->_c_newPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *)));
-  connect(base->_c_newPath, TQT_SIGNAL(returnPressed(const TQString&)),
-          this, TQT_SLOT(addThisLibrary(const TQString&)));
-  connect(base->_c_newPath, TQT_SIGNAL(textChanged(const TQString&)),
-          this, TQT_SLOT(libTextChanged(const TQString&)));
-  connect(base->_c_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(addLibrary()));
-  connect(base->_c_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeLibrary()));
-  connect(base->_c_libs, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(libSelection()));
+  connect(base->_c_newPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *)));
+  connect(base->_c_newPath, TQ_SIGNAL(returnPressed(const TQString&)),
+          this, TQ_SLOT(addThisLibrary(const TQString&)));
+  connect(base->_c_newPath, TQ_SIGNAL(textChanged(const TQString&)),
+          this, TQ_SLOT(libTextChanged(const TQString&)));
+  connect(base->_c_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(addLibrary()));
+  connect(base->_c_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeLibrary()));
+  connect(base->_c_libs, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(libSelection()));
 
   // The "Test" button
-  connect(base->_c_test, TQT_SIGNAL(clicked()), this, TQT_SLOT(testClicked()));
+  connect(base->_c_test, TQ_SIGNAL(clicked()), this, TQ_SLOT(testClicked()));
 
   // The config backend
   load();
@@ -194,7 +194,7 @@ void KSocksConfig::libSelection()
 
 void KSocksConfig::load()
 {
-  TDEConfigGroup config(kapp->config(), "Socks");
+  TDEConfigGroup config(tdeApp->config(), "Socks");
   base->_c_enableSocks->setChecked(config.readBoolEntry("SOCKS_enable", false));
   int id = config.readNumEntry("SOCKS_method", 1);
   base->bg->setButton(id);
@@ -228,7 +228,7 @@ void KSocksConfig::load()
 
 void KSocksConfig::save()
 {
-  TDEConfigGroup config(kapp->config(), "Socks");
+  TDEConfigGroup config(tdeApp->config(), "Socks");
   config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true);
   config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true);
   config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true);
@@ -241,7 +241,7 @@ void KSocksConfig::save()
   }
   config.writePathEntry("SOCKS_lib_path", libs, ',', true, true);
 
-  kapp->config()->sync();
+  tdeApp->config()->sync();
 
   emit changed(false);
 }
diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp
index 821d2e8e4..430261a45 100644
--- a/kcontrol/tdeio/uagentproviderdlg.cpp
+++ b/kcontrol/tdeio/uagentproviderdlg.cpp
@@ -82,14 +82,14 @@ UAProviderDlg::~UAProviderDlg()
 
 void UAProviderDlg::init()
 {
-  connect( dlg->pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-  connect( dlg->pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+  connect( dlg->pbOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+  connect( dlg->pbCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
-  connect( dlg->leSite, TQT_SIGNAL(textChanged(const TQString&)),
-                TQT_SLOT(slotTextChanged( const TQString&)) );
+  connect( dlg->leSite, TQ_SIGNAL(textChanged(const TQString&)),
+                TQ_SLOT(slotTextChanged( const TQString&)) );
 
-  connect( dlg->cbAlias, TQT_SIGNAL(activated(const TQString&)),
-                TQT_SLOT(slotActivated(const TQString&)) );
+  connect( dlg->cbAlias, TQ_SIGNAL(activated(const TQString&)),
+                TQ_SLOT(slotActivated(const TQString&)) );
 
   dlg->cbAlias->clear();
   dlg->cbAlias->insertStringList( m_provider->userAgentAliasList() );
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index 7b1f4b3d7..9bab933b8 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -36,7 +36,7 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeio/http_slave_defaults.h>
 
 #include "ksaveioconfig.h"
@@ -56,22 +56,22 @@ UserAgentDlg::UserAgentDlg( TQWidget * parent )
 
   dlg->lvDomainPolicyList->setSorting(0);
 
-  connect( dlg->cbSendUAString, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
+  connect( dlg->cbSendUAString, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
 
-  connect( dlg->gbDefaultId, TQT_SIGNAL(clicked(int)),
-           TQT_SLOT(changeDefaultUAModifiers(int)));
+  connect( dlg->gbDefaultId, TQ_SIGNAL(clicked(int)),
+           TQ_SLOT(changeDefaultUAModifiers(int)));
 
-  connect( dlg->lvDomainPolicyList, TQT_SIGNAL(selectionChanged()),
-           TQT_SLOT(selectionChanged()) );
-  connect( dlg->lvDomainPolicyList, TQT_SIGNAL(doubleClicked (TQListViewItem *)),
-           TQT_SLOT(changePressed()) );
-  connect( dlg->lvDomainPolicyList, TQT_SIGNAL( returnPressed ( TQListViewItem * ) ),
-           TQT_SLOT( changePressed() ));
+  connect( dlg->lvDomainPolicyList, TQ_SIGNAL(selectionChanged()),
+           TQ_SLOT(selectionChanged()) );
+  connect( dlg->lvDomainPolicyList, TQ_SIGNAL(doubleClicked (TQListViewItem *)),
+           TQ_SLOT(changePressed()) );
+  connect( dlg->lvDomainPolicyList, TQ_SIGNAL( returnPressed ( TQListViewItem * ) ),
+           TQ_SLOT( changePressed() ));
 
-  connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) );
-  connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) );
-  connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) );
-  connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) );
+  connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) );
+  connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) );
+  connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) );
+  connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) );
 
   load();
 }
@@ -186,7 +186,7 @@ void UserAgentDlg::save()
   if (!deleteList.isEmpty())
   {
      // Remove entries from local file.
-     KSimpleConfig cfg("tdeio_httprc");
+     TDESimpleConfig cfg("tdeio_httprc");
      for ( TQStringList::Iterator it = deleteList.begin();
            it != deleteList.end(); ++it )
      {
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp
index 832940d7d..efeb6b088 100644
--- a/kcontrol/tdm/background.cpp
+++ b/kcontrol/tdm/background.cpp
@@ -34,10 +34,10 @@
 #include "../background/bgdialog.h"
 #include "background.h"
 #include <tqcheckbox.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdialog.h>
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 KBackground::KBackground(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -51,17 +51,17 @@ KBackground::KBackground(TQWidget *parent, const char *name)
 		" This is done by running some program (possibly xsetroot) in the script"
 		" specified in the Setup= option in tdmrc (usually Xsetup).") );
     config->setGroup( "X-*-Greeter" );
-    m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) );
+    m_simpleConf=new TDESimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) );
     m_background = new BGDialog( this, m_simpleConf, false );
 
-    connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+    connect(m_background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
     // Top layout
     TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() );
     top->addWidget(m_pCBEnable);
     top->addWidget(m_background);
     top->addStretch();
-    connect( m_pCBEnable, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotEnableChanged()) );
+    connect( m_pCBEnable, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotEnableChanged()) );
 }
 
 KBackground::~KBackground()
diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h
index 74f1b09ec..a15377784 100644
--- a/kcontrol/tdm/background.h
+++ b/kcontrol/tdm/background.h
@@ -14,7 +14,7 @@
 #include <tqwidget.h>
 
 
-class KSimpleConfig;
+class TDESimpleConfig;
 class BGDialog;
 class TDEGlobalBackgroundSettings;
 class TQCheckBox;
@@ -42,7 +42,7 @@ private:
 
     TQCheckBox *m_pCBEnable;
     TQLabel *m_pMLabel;
-    KSimpleConfig *m_simpleConf;
+    TDESimpleConfig *m_simpleConf;
     BGDialog *m_background;
 };
 
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index be0ee58a7..fdba26c5d 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -76,7 +76,7 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
     return 0;
 }
 
-KSimpleConfig *config;
+TDESimpleConfig *config;
 
 TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
   : TDECModule(TDMFactory::instance(), parent, name)
@@ -175,10 +175,10 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
 
   struct stat st;
   if( stat( KDE_CONFDIR "/tdm/tdmdistrc" ,&st ) == 0) {
-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+    config = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
   }
   else {
-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+    config = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
   }
 
   TQVBoxLayout *top = new TQVBoxLayout(this);
@@ -190,34 +190,34 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
 
   appearance = new TDMAppearanceWidget(this);
   tab->addTab(appearance, i18n("A&ppearance"));
-  connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool)));
+  connect(appearance, TQ_SIGNAL(changed(bool)), TQ_SIGNAL( changed(bool)));
 
   font = new TDMFontWidget(this);
   tab->addTab(font, i18n("&Font"));
-  connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(font, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   background = new KBackground(this);
   tab->addTab(background, i18n("&Background"));
-  connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   sessions = new TDMSessionsWidget(this);
   tab->addTab(sessions, i18n("&Shutdown"));
-  connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(sessions, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   users = new TDMUsersWidget(this, 0);
   tab->addTab(users, i18n("&Users"));
-  connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int)));
-  connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers()));
+  connect(users, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(users, TQ_SIGNAL(setMinMaxUID(int,int)), TQ_SLOT(slotMinMaxUID(int,int)));
+  connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(clearUsers()), users, TQ_SLOT(slotClearUsers()));
 
   convenience = new TDMConvenienceWidget(this, 0);
   tab->addTab(convenience, i18n("Con&venience"));
-  connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-  connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
-  connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers()));
+  connect(convenience, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
+  connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
+  connect(this, TQ_SIGNAL(clearUsers()), convenience, TQ_SLOT(slotClearUsers()));
 
   load();
   if (getuid() != 0 || !config->checkConfigFilesWritable( true )) {
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 21745ef5d..c057867d1 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -40,7 +40,7 @@
 #include <kimageio.h>
 #include <kcombobox.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
@@ -51,7 +51,7 @@
 
 #include "config.h"
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 #define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock"
 
@@ -76,8 +76,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   greetstr_lined = new KLineEdit(group);
   TQLabel *label = new TQLabel(greetstr_lined, i18n("&Greeting:"), group);
   hlay->addWidget(label);
-  connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)),
-      TQT_SLOT(changed()));
+  connect(greetstr_lined, TQ_SIGNAL(textChanged(const TQString&)),
+      TQ_SLOT(changed()));
   hlay->addWidget(greetstr_lined);
   wtstr = i18n("This is the \"headline\" for TDM's login window. You may want to "
            "put some nice greeting or information about the operating system here.<p>"
@@ -107,8 +107,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   logoRadio = new TQRadioButton( i18n("Sho&w logo"), group );
   TQButtonGroup *buttonGroup = new TQButtonGroup( group );
   label->setBuddy( buttonGroup );
-  connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotAreaRadioClicked(int)) );
-  connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()) );
+  connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotAreaRadioClicked(int)) );
+  connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed()) );
   buttonGroup->hide();
   buttonGroup->insert(noneRadio, KdmNone);
   buttonGroup->insert(clockRadio, KdmClock);
@@ -128,7 +128,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   logobutton->setAutoDefault(false);
   logobutton->setAcceptDrops(true);
   logobutton->installEventFilter(this); // for drag and drop
-  connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked()));
+  connect(logobutton, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogoButtonClicked()));
   hglay->addWidget(logoLabel, 1, 0);
   hglay->addWidget(logobutton, 1, 1, TQt::AlignCenter);
   hglay->addRowSpacing(1, 110);
@@ -146,18 +146,18 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
 
   label = new TQLabel(i18n("Position:"), group);
   hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter);
-  TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group));
+  TQValidator *posValidator = new TQIntValidator(0, 100, group);
   TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group);
   hglay->addWidget(xLineLabel, 0, 1);
   xLineEdit = new TQLineEdit (group);
-  connect( xLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
+  connect( xLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() ));
   hglay->addWidget(xLineEdit, 0, 2);
   xLineLabel->setBuddy(xLineEdit);
   xLineEdit->setValidator(posValidator);
   TQLabel *yLineLabel = new TQLabel(i18n("&Y:"), group);
   hglay->addWidget(yLineLabel, 1, 1);
   yLineEdit = new TQLineEdit (group);
-  connect( yLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
+  connect( yLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() ));
   hglay->addWidget(yLineEdit, 1, 2);
   yLineLabel->setBuddy(yLineEdit);
   yLineEdit->setValidator(posValidator);
@@ -179,7 +179,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   compositorcombo->insertItem( "", i18n("None") );
   compositorcombo->insertItem( TDE_COMPOSITOR_BINARY, i18n("Trinity compositor") );
   label = new TQLabel(compositorcombo, i18n("Compositor:"), group);
-  connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(compositorcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 0, 0);
   hglay->addWidget(compositorcombo, 0, 1);
   wtstr = i18n("Choose a compositor to be used in TDM.  Note that the chosen compositor will continue to run after login.");
@@ -191,7 +191,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   loadGuiStyles(guicombo);
   guicombo->listBox()->sort();
   label = new TQLabel(guicombo, i18n("GUI s&tyle:"), group);
-  connect(guicombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(guicombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 1, 0);
   hglay->addWidget(guicombo, 1, 1);
   wtstr = i18n("You can choose a basic GUI style here that will be "
@@ -204,7 +204,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   loadColorSchemes(colcombo);
   colcombo->listBox()->sort();
   label = new TQLabel(colcombo, i18n("&Color scheme:"), group);
-  connect(colcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(colcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 2, 0);
   hglay->addWidget(colcombo, 2, 1);
   wtstr = i18n("You can choose a basic Color Scheme here that will be "
@@ -217,7 +217,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   echocombo->insertItem("OneStar", i18n("One Star"));
   echocombo->insertItem("ThreeStars", i18n("Three Stars"));
   label = new TQLabel(echocombo, i18n("Echo &mode:"), group);
-  connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(echocombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hglay->addWidget(label, 3, 0);
   hglay->addWidget(echocombo, 3, 1);
   wtstr = i18n("You can choose whether and how TDM shows your password when you type it.");
@@ -231,7 +231,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
 
   langcombo = new KLanguageButton(group);
   loadLanguageList(langcombo);
-  connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+  connect(langcombo, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed()));
   label = new TQLabel(langcombo, i18n("Languag&e:"), group);
   TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
   hbox->setColStretch(1, 1);
@@ -247,7 +247,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   vbox->addWidget(group);
 
   sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
-  connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+  connect( sakbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
   TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
   hbox2->setColStretch(1, 1);
   hbox2->addWidget(sakbox, 1, 0);
@@ -266,7 +266,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   vbox->addWidget(group);
 
   kbdledbox = new TQCheckBox(i18n("Sync keyboard led status"), group);
-  connect(kbdledbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  connect(kbdledbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
   TQGridLayout *hbox3 = new TQGridLayout(group->layout(), 2, 2, KDialog::spacingHint());
   hbox3->setColStretch(1, 1);
   hbox3->addWidget(kbdledbox, 1, 0);
@@ -277,8 +277,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
 
 void TDMAppearanceWidget::makeReadOnly()
 {
-    disconnect( logobutton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotLogoButtonClicked()) );
+    disconnect( logobutton, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slotLogoButtonClicked()) );
     logobutton->setAcceptDrops(false);
     greetstr_lined->setReadOnly(true);
     noneRadio->setEnabled(false);
@@ -307,7 +307,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
     int index = fpath.findRev('/');
     TQString nid = fpath.mid(index + 1);
 
-    KSimpleConfig entry(*it);
+    TDESimpleConfig entry(*it);
     entry.setGroup(TQString::fromLatin1("KCM Locale"));
     TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
     combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null);
@@ -321,7 +321,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
       findAllResources("data", "tdedisplay/color-schemes/*.kcsrc", false, true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
   {
-    KSimpleConfig config(*it, true);
+    TDESimpleConfig config(*it, true);
     config.setGroup("Color Scheme");
 
     TQString str;
@@ -342,7 +342,7 @@ void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
       findAllResources("data", "tdestyle/themes/*.themerc", false, true);
   for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
   {
-    KSimpleConfig config(*it, true);
+    TDESimpleConfig config(*it, true);
 
     if (!(config.hasGroup("KDE") && config.hasGroup("Misc")))
 	continue;
diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp
index 487e8adbb..1d73dc4c8 100644
--- a/kcontrol/tdm/tdm-conv.cpp
+++ b/kcontrol/tdm/tdm-conv.cpp
@@ -32,12 +32,12 @@
 #include <tqheader.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 
 #include "tdm-conv.h"
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -55,7 +55,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
 	" This applies only to TDM's graphical login."
 	" Think twice before enabling this!") );
-    connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(alGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     TQWidget *hlpw1 = new TQWidget( alGroup );
     userlb = new KComboBox( hlpw1 );
@@ -64,7 +64,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     hlpl1->setColStretch(2, 1);
     hlpl1->addWidget(u_label, 0, 0);
     hlpl1->addWidget(userlb, 0, 1);
-    connect(userlb, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotChanged()));
+    connect(userlb, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotChanged()));
     wtstr = i18n("Select the user to be logged in automatically.");
     TQWhatsThis::add( u_label, wtstr );
     TQWhatsThis::add( userlb, wtstr );
@@ -74,18 +74,18 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     d_label = new TQLabel( delaysb, i18n("D&elay:"), hlpw1 );
     hlpl1->addWidget(d_label, 1, 0);
     hlpl1->addWidget(delaysb, 1, 1);
-    connect(delaysb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+    connect(delaysb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
     wtstr = i18n("The delay (in seconds) before the automatic login kicks in. "
                  "This feature is also known as \"timed login\".");
     TQWhatsThis::add( d_label, wtstr );
     TQWhatsThis::add( delaysb, wtstr );
     againcb = new TQCheckBox( i18n("P&ersistent"), alGroup );
-    connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
+    connect( againcb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) );
     TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only "
 	"when TDM starts up. If this is checked, automatic login will kick in "
 	"after finishing a session as well.") );
     autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup );
-    connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
+    connect( autoLockCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) );
     TQWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session "
 	"will be locked immediately (provided it is a TDE session). This can "
 	"be used to obtain a super-fast login restricted to one user.") );
@@ -94,8 +94,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     puGroup = new TQVButtonGroup(i18n("Preselect User"), this );
     puGroup->setSizePolicy( vpref );
 
-    connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged()));
-    connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));
+    connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPresChanged()));
+    connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotChanged()));
     npRadio = new TQRadioButton(i18n("preselected user", "&None"), puGroup);
     ppRadio = new TQRadioButton(i18n("Prev&ious"), puGroup);
     TQWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. "
@@ -106,7 +106,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     TQWidget *hlpw = new TQWidget(puGroup);
     puserlb = new KComboBox(true, hlpw);
     pu_label = new TQLabel(puserlb, i18n("Us&er:"), hlpw);
-    connect(puserlb, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged()));
+    connect(puserlb, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged()));
     wtstr = i18n("Select the user to be preselected for login. "
 	"This box is editable, so you can specify an arbitrary non-existent "
 	"user to mislead possible attackers.");
@@ -121,7 +121,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
 	"in the password field instead of the user field after preselecting a user. "
 	"Use this to save one key press per login, if the preselection usually does not need to "
 	"be changed.") );
-    connect(cbjumppw, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(cbjumppw, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     npGroup = new TQVGroupBox(i18n("Enable Password-&Less Logins"), this );
     npGroup->setCheckable( true );
@@ -131,7 +131,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
 	" password. This applies only to TDM's graphical login."
 	" Think twice before enabling this!") );
 
-    connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(npGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup);
     npuserlv = new TDEListView(npGroup);
@@ -141,8 +141,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     npuserlv->setResizeMode(TQListView::LastColumn);
     TQWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for."
 	" Entries denoted with '@' are user groups. Checking a group is like checking all users in that group."));
-    connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotChanged()) );
+    connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotChanged()) );
 
     btGroup = new TQVGroupBox( i18n("Miscellaneous"), this );
 
@@ -152,12 +152,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
 	" X server crash; note that this can open a security hole: if you use"
 	" a screen locker than TDE's integrated one, this will make"
 	" circumventing a password-secured screen lock possible.") );
-    connect(cbarlen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(cbarlen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     allowRootLogin = new TQCheckBox(i18n("Allow &Root Login"), btGroup);
     TQWhatsThis::add( allowRootLogin, i18n("When set this allows root logins directly in TDM. "
     "This is discouraged by some people. Use with caution.") );
-    connect(allowRootLogin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+    connect(allowRootLogin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
     TQGridLayout *main = new TQGridLayout(this, 5, 2, 10);
     main->addWidget(paranoia, 0, 0);
@@ -169,12 +169,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     main->setColStretch(1, 2);
     main->setRowStretch(3, 1);
 
-    connect( userlb, TQT_SIGNAL(activated( const TQString & )),
-	     TQT_SLOT(slotSetAutoUser( const TQString & )) );
-    connect( puserlb, TQT_SIGNAL(textChanged( const TQString & )),
-	     TQT_SLOT(slotSetPreselUser( const TQString & )) );
-    connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotUpdateNoPassUser( TQListViewItem * )) );
+    connect( userlb, TQ_SIGNAL(activated( const TQString & )),
+	     TQ_SLOT(slotSetAutoUser( const TQString & )) );
+    connect( puserlb, TQ_SIGNAL(textChanged( const TQString & )),
+	     TQ_SLOT(slotSetPreselUser( const TQString & )) );
+    connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotUpdateNoPassUser( TQListViewItem * )) );
 
 }
 
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 65dbea179..1e103d915 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -30,14 +30,14 @@
 #include <tqwhatsthis.h>
 
 #include <kdialog.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdefontrequester.h>
 #include <tdelocale.h>
 
 #include "tdm-font.h"
 
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   : TQWidget(parent, name)
@@ -47,7 +47,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   stdFontChooser = new TDEFontRequester(this);
   label->setBuddy(stdFontChooser);
   TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") );
-  connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
+  connect(stdFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged()));
   ml->addWidget(label, 1, 0);
   ml->addWidget(stdFontChooser, 1, 1);
 
@@ -55,7 +55,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   failFontChooser = new TDEFontRequester(this);
   label->setBuddy(failFontChooser);
   TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") );
-  connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
+  connect(failFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged()));
   ml->addWidget(label, 2, 0);
   ml->addWidget(failFontChooser, 2, 1);
 
@@ -63,14 +63,14 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   greetingFontChooser = new TDEFontRequester(this);
   label->setBuddy(greetingFontChooser);
   TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") );
-  connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
+  connect(greetingFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged()));
   ml->addWidget(label, 3, 0);
   ml->addWidget(greetingFontChooser, 3, 1);
 
   aacb = new TQCheckBox (i18n("Use anti-aliasing for fonts"), this);
   TQWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, "
 	"fonts will be antialiased (smoothed) in the login dialog.") );
-  connect(aacb, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(configChanged()));
+  connect(aacb, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(configChanged()));
   ml->addMultiCellWidget(aacb, 4, 4, 0, 1);
   ml->setRowStretch(5, 10);
 }
diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp
index da120ae4c..03fef8cae 100644
--- a/kcontrol/tdm/tdm-shut.cpp
+++ b/kcontrol/tdm/tdm-shut.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <karrowbutton.h>
 #include <klineedit.h>
 #include <tdelocale.h>
@@ -39,7 +39,7 @@
 #include "tdm-shut.h"
 #include "kbackedcombobox.h"
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 
 TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
@@ -49,18 +49,18 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
 
       TQGroupBox *group0 = new TQGroupBox( i18n("Allow Shutdown"), this );
 
-      sdlcombo = new TQComboBox( FALSE, group0 );
+      sdlcombo = new TQComboBox( false, group0 );
       sdllabel = new TQLabel (sdlcombo, i18n ("&Local:"), group0);
       sdlcombo->insertItem(i18n("Everybody"), SdAll);
       sdlcombo->insertItem(i18n("Only Root"), SdRoot);
       sdlcombo->insertItem(i18n("Nobody"), SdNone);
-      connect(sdlcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-      sdrcombo = new TQComboBox( FALSE, group0 );
+      connect(sdlcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+      sdrcombo = new TQComboBox( false, group0 );
       sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0);
       sdrcombo->insertItem(i18n("Everybody"), SdAll);
       sdrcombo->insertItem(i18n("Only Root"), SdRoot);
       sdrcombo->insertItem(i18n("Nobody"), SdNone);
-      connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+      connect(sdrcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
       TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown"
         " the computer using TDM. You can specify different values for local (console) and remote displays. "
 	"Possible values are:<ul>"
@@ -73,16 +73,16 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
 
       shutdown_lined = new KURLRequester(group1);
       TQLabel *shutdown_label = new TQLabel(shutdown_lined, i18n("H&alt:"), group1);
-      connect(shutdown_lined, TQT_SIGNAL(textChanged(const TQString&)),
-	      TQT_SLOT(changed()));
+      connect(shutdown_lined, TQ_SIGNAL(textChanged(const TQString&)),
+	      TQ_SLOT(changed()));
       wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt");
       TQWhatsThis::add( shutdown_label, wtstr );
       TQWhatsThis::add( shutdown_lined, wtstr );
 
       restart_lined = new KURLRequester(group1);
       TQLabel *restart_label = new TQLabel(restart_lined, i18n("Reb&oot:"), group1);
-      connect(restart_lined, TQT_SIGNAL(textChanged(const TQString&)),
-	      TQT_SLOT(changed()));
+      connect(restart_lined, TQ_SIGNAL(textChanged(const TQString&)),
+	      TQ_SLOT(changed()));
       wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot");
       TQWhatsThis::add( restart_label, wtstr );
       TQWhatsThis::add( restart_lined, wtstr );
@@ -97,13 +97,13 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
       bm_combo->insertItem("Lilo", i18n("Lilo"));
 #endif
       TQLabel *bm_label = new TQLabel( bm_combo, i18n("Boot manager:"), group4 );
-      connect(bm_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+      connect(bm_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
       wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog.");
       TQWhatsThis::add( bm_label, wtstr );
       TQWhatsThis::add( bm_combo, wtstr );
 
       tsbox = new TQCheckBox( i18n("Restart X-Server with session exit"), this );
-      connect( tsbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+      connect( tsbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
       wtstr = i18n("Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this option when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues or artifacts.");
       TQWhatsThis::add( tsbox, wtstr );
 
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index 4b7b64ba3..35929102c 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -34,7 +34,7 @@
 #include <kimagefilepreview.h>
 #include <tdeio/netaccess.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kurldrag.h>
 
@@ -43,7 +43,7 @@
 #include <sys/stat.h>
 
 
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
 
 TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -98,25 +98,25 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
       " Note that users with the UID 0 (typically root) are not affected by this and must be"
       " explicitly hidden in \"Not hidden\" mode."));
     TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed );
-    TQValidator *valid = new TQIntValidator( 0, 999999, TQT_TQOBJECT(minGroup) );
+    TQValidator *valid = new TQIntValidator( 0, 999999, minGroup );
     TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
     leminuid = new KLineEdit( minGroup );
     minlab->setBuddy( leminuid );
     leminuid->setSizePolicy( sp_ign_fix );
     leminuid->setValidator( valid );
-    connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
-    connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
+    connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) );
+    connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) );
     TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup );
     lemaxuid = new KLineEdit( minGroup );
     maxlab->setBuddy( lemaxuid );
     lemaxuid->setSizePolicy( sp_ign_fix );
     lemaxuid->setValidator( valid );
-    connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
-    connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
+    connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) );
+    connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) );
 
     usrGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("Users"), this );
-    connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) );
-    connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+    connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotShowOpts()) );
+    connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) );
     cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup );
     TQWhatsThis::add( cbshowlist, i18n("If this option is checked, TDM will show a list of users,"
       " so users can click on their name or image rather than typing in their login.") );
@@ -129,7 +129,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
       "If not checked, select only the checked users. "
       "If checked, select all non-system users, except the checked ones."));
     cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup );
-    connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) );
+    connect( cbusrsrt, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotChanged()) );
     TQWhatsThis::add( cbusrsrt, i18n("If this is checked, TDM will alphabetically sort the user list."
       " Otherwise users are listed in the order they appear in the password file.") );
 
@@ -140,27 +140,27 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     optinlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
     wstack->addWidget( optinlv );
-    connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) );
-    connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotChanged()) );
+    connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotUpdateOptIn( TQListViewItem * )) );
+    connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotChanged()) );
     optoutlv = new TDEListView( this );
     optoutlv->addColumn( i18n("Hidden Users") );
     optoutlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
     wstack->addWidget( optoutlv );
-    connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) );
-    connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
-	     TQT_SLOT(slotChanged()) );
+    connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotUpdateOptOut( TQListViewItem * )) );
+    connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )),
+	     TQ_SLOT(slotChanged()) );
 
     faceGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("User Image Source"), this );
     TQWhatsThis::add( faceGroup, i18n("Here you can specify where TDM will obtain the images that represent users."
       " \"Admin\" represents the global folder; these are the pictures you can set below."
       " \"User\" means that TDM should read the user's $HOME/.face.icon file."
       " The two selections in the middle define the order of preference if both sources are available.") );
-    connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) );
-    connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+    connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotFaceOpts()) );
+    connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) );
     rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup );
     rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup );
     rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup );
@@ -170,23 +170,23 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     TQWidget *hlpw = new TQWidget( picGroup );
     usercombo = new KComboBox( hlpw );
     TQWhatsThis::add( usercombo, i18n("The user the image below belongs to.") );
-    connect( usercombo, TQT_SIGNAL(activated( int )),
-	     TQT_SLOT(slotUserSelected()) );
+    connect( usercombo, TQ_SIGNAL(activated( int )),
+	     TQ_SLOT(slotUserSelected()) );
     TQLabel *userlabel = new TQLabel( usercombo, i18n("User:"), hlpw );
     userbutton = new TQPushButton( hlpw );
     userbutton->setAcceptDrops( true );
     userbutton->installEventFilter( this ); // for drag and drop
     uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
     userbutton->setFixedSize( sz, sz );
-    connect( userbutton, TQT_SIGNAL(clicked()),
-	     TQT_SLOT(slotUserButtonClicked()) );
+    connect( userbutton, TQ_SIGNAL(clicked()),
+	     TQ_SLOT(slotUserButtonClicked()) );
     TQToolTip::add( userbutton, i18n("Click or drop an image here") );
     TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list"
       " of images or drag and drop your own image on to the button (e.g. from Konqueror).") );
     rstuserbutton = new TQPushButton( i18n("Unset"), hlpw );
     TQWhatsThis::add( rstuserbutton, i18n("Click this button to make TDM use the default image for the selected user.") );
-    connect( rstuserbutton, TQT_SIGNAL(clicked()),
-	     TQT_SLOT(slotUnsetUserPix()) );
+    connect( rstuserbutton, TQ_SIGNAL(clicked()),
+	     TQ_SLOT(slotUnsetUserPix()) );
     TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() );
     hlpl->addWidget( userlabel, 0, 0 );
 //    hlpl->addSpacing( KDialog::spacingHint() );
@@ -227,7 +227,7 @@ void TDMUsersWidget::makeReadOnly()
     rbprefusr->setEnabled(false);
     rbusronly->setEnabled(false);
     wstack->setEnabled(false);
-    disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) );
+    disconnect( userbutton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUserButtonClicked()) );
     userbutton->setAcceptDrops(false);
     rstuserbutton->setEnabled(false);
 }
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 223a201d1..de61a61b2 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -63,9 +63,9 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
   // 1 sec seems to be a good compromise between latency and polling load.
   refreshTimer->start(1000);
 
-  connect(refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refresh()));
-  connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-	  this, TQT_SLOT(selectionChanged(TQListViewItem*)));
+  connect(refreshTimer, TQ_SIGNAL(timeout()), TQ_SLOT(refresh()));
+  connect(_devices, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+	  this, TQ_SLOT(selectionChanged(TQListViewItem*)));
 
   TDEAboutData *about =
   new TDEAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"),
diff --git a/kcontrol/usbview/usbdb.cpp b/kcontrol/usbview/usbdb.cpp
index be5f3b63a..8e920952b 100644
--- a/kcontrol/usbview/usbdb.cpp
+++ b/kcontrol/usbview/usbdb.cpp
@@ -17,7 +17,7 @@
 #include <tqregexp.h>
 
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 #include "usbdb.h"
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index d6f879fd4..5db7c84da 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "view1394.h"
 
@@ -85,8 +85,8 @@ View1394::View1394(TQWidget *parent, const char *name)
    m_view->m_listview->setColumnAlignment(8, AlignRight);
    m_view->m_listview->setColumnAlignment(9, AlignRight);
    box->addWidget(m_view);
-   connect(m_view->m_busResetPb, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateBusReset()));
-   connect(&m_rescanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(rescanBus()));
+   connect(m_view->m_busResetPb, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateBusReset()));
+   connect(&m_rescanTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(rescanBus()));
    m_notifiers.setAutoDelete(true);
    rescanBus();
 }
@@ -188,7 +188,7 @@ void View1394::rescanBus()
       raw1394_set_userdata(handle, this);
       raw1394_set_bus_reset_handler(handle, my_reset_handler);
       TQSocketNotifier *notif=new TQSocketNotifier(raw1394_get_fd(handle),TQSocketNotifier::Read);
-      connect(notif, TQT_SIGNAL(activated(int)), this, TQT_SLOT(callRaw1394EventLoop(int)));
+      connect(notif, TQ_SIGNAL(activated(int)), this, TQ_SLOT(callRaw1394EventLoop(int)));
       m_notifiers.append(notif);
       m_handles.append(handle);
       
@@ -323,7 +323,7 @@ TQString OuiDb::vendor(octlet_t guid)
 extern "C"
 {
 
-   KDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name)
+   TDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name)
    {
       TDEGlobal::locale()->insertCatalogue("kcmview1394");
       return new View1394(parent, name);
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index f5d74a191..32380a591 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -59,7 +59,7 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
 	config = new TDEConfig("kdeglobals", false, false);
 	ksplashrc = new TDEConfig("ksplashrc", false, false);
 
-	connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator()));
+	connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearIndicator()));
 
 	TQGridLayout *grid = new TQGridLayout(this, 1, 1, KDialog::marginHint(),
 							KDialog::spacingHint());
@@ -91,14 +91,14 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
 
 		xw->headTable->setRowLabels(dpyList);
 
-		connect(xw->_ksplashDisplay, TQT_SIGNAL(activated(int)),
-			this, TQT_SLOT(windowIndicator(int)));
-		connect(xw->_unmanagedDisplay, TQT_SIGNAL(activated(int)),
-			this, TQT_SLOT(windowIndicator(int)));
-		connect(xw->_identify, TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(indicateWindows()));
+		connect(xw->_ksplashDisplay, TQ_SIGNAL(activated(int)),
+			this, TQ_SLOT(windowIndicator(int)));
+		connect(xw->_unmanagedDisplay, TQ_SIGNAL(activated(int)),
+			this, TQ_SLOT(windowIndicator(int)));
+		connect(xw->_identify, TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(indicateWindows()));
 
-		connect(xw, TQT_SIGNAL(configChanged()), this, TQT_SLOT(changed()));
+		connect(xw, TQ_SIGNAL(configChanged()), this, TQ_SLOT(changed()));
 	} else { // no Xinerama
 		TQLabel *ql = new TQLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this);
 		grid->addWidget(ql, 0, 0);
@@ -175,9 +175,9 @@ void KCMXinerama::save() {
 		config->writeEntry("Unmanaged", item == _displays ? -3 : item);
 		config->sync();
 
-		if (!kapp->dcopClient()->isAttached())
-			kapp->dcopClient()->attach();
-		kapp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
+		if (!tdeApp->dcopClient()->isAttached())
+			tdeApp->dcopClient()->attach();
+		tdeApp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
 
 		ksplashrc->setGroup("Xinerama");
 		ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */);
@@ -239,12 +239,12 @@ void KCMXinerama::clearIndicator() {
 }
 
 extern "C" {
-        KDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) {
+        TDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) {
    	    TDEGlobal::locale()->insertCatalogue("kcmxinerama");
 	    return new KCMXinerama(parent, name);
         }
 
-	KDE_EXPORT bool test_xinerama() {
+	TDE_EXPORT bool test_xinerama() {
 		return TQApplication::desktop()->isVirtualDesktop();
 	}
 }
diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui
index a5e3664de..a999d68a3 100644
--- a/kcontrol/xinerama/xineramawidget.ui
+++ b/kcontrol/xinerama/xineramawidget.ui
@@ -315,12 +315,12 @@
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">xineramawidget.ui.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
     <signal>configChanged()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="private">emitConfigChanged()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 059fa2125..b0f8d85bb 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -71,7 +71,7 @@ public:
 		new TQLabel(caption + ": ", l);
 		KLineEdit* e = new KLineEdit( l );
 		m_widgets.insert(key, e ) ;
-        	e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        	e->setValidator( new TQIntValidator( e ) );
 	}
 	int field(int key)
 	{
@@ -133,7 +133,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
 	TQString mainWindowName= rx.cap(1) + "-mainwindow#1" ;
 
 	TQByteArray data;
-	int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
+	int callId=tdeApp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
 
 	if(!callId)
 	{
@@ -142,7 +142,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << TQCString( "MainWindow" );
 
-		kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQT_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
+		tdeApp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
 	}
 }
 
@@ -163,7 +163,7 @@ DCOPBrowserApplicationItem::populate()
   bool ok = false;
   bool isDefault = false;
 
-  QCStringList objs = kapp->dcopClient()->remoteObjects(app_, &ok);
+  QCStringList objs = tdeApp->dcopClient()->remoteObjects(app_, &ok);
 
   for (QCStringList::ConstIterator it = objs.begin(); it != objs.end(); ++it)
   {
@@ -191,8 +191,8 @@ void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCStri
 		if(!mainWindowName.isEmpty())
 		{
 			TQByteArray data;
-			kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
-				this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
+			tdeApp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
+				this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
 		}
 	}
 }
@@ -245,7 +245,7 @@ DCOPBrowserInterfaceItem::populate()
 
   bool ok = false;
 
-  QCStringList funcs = kapp->dcopClient()->remoteFunctions(app_, object_, &ok);
+  QCStringList funcs = tdeApp->dcopClient()->remoteFunctions(app_, object_, &ok);
 
   for (QCStringList::ConstIterator it = funcs.begin(); it != funcs.end(); ++it)
     if ((*it) != "QCStringList functions()")
@@ -283,7 +283,7 @@ DCOPBrowserFunctionItem::setOpen(bool o)
 KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
   : TDEMainWindow(parent, name)
 {
-  dcopClient = kapp->dcopClient();
+  dcopClient = tdeApp->dcopClient();
   resize( 377, 480 );
   statusBar()->message(i18n("Welcome to the TDE DCOP browser"));
   setIcon(TDEGlobal::iconLoader()->loadIcon("enhanced_browsing", TDEIcon::NoGroup, TDEIcon::SizeSmall));
@@ -295,20 +295,20 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
 	mainView->lv->header()->setStretchEnabled(true, 0);
 //	mainView->lv->addColumn(i18n("Interface"));
 //	mainView->lv->addColumn(i18n("Function"));
-	mainView->lv->setDragAutoScroll( FALSE );
-	mainView->lv->setRootIsDecorated( TRUE );
-  connect(mainView->lv, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotCallFunction(TQListViewItem *)));
-  connect(mainView->lv, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(slotCurrentChanged(TQListViewItem *)));
-  connect(mainView->lb_replyData, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
-          TQT_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&)));
+	mainView->lv->setDragAutoScroll( false );
+	mainView->lv->setRootIsDecorated( true );
+  connect(mainView->lv, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotCallFunction(TQListViewItem *)));
+  connect(mainView->lv, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(slotCurrentChanged(TQListViewItem *)));
+  connect(mainView->lb_replyData, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
+          TQ_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&)));
 
   // set up the actions
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-  KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy()), actionCollection() );
-  KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
+  KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
+  KStdAction::copy( this, TQ_SLOT( slotCopy()), actionCollection() );
+  KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
 
 
-  (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+  (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotReload() ), actionCollection(), "reload" );
 
   exeaction =
     new TDEAction
@@ -316,8 +316,8 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
      i18n("&Execute"),
       "application-x-executable",
      CTRL + Key_E,
-     TQT_TQOBJECT(this),
-     TQT_SLOT(slotItemExecuted()),
+     this,
+     TQ_SLOT(slotItemExecuted()),
      actionCollection(),
      "execute"
     );
@@ -327,8 +327,8 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
 
   langmode = new TDESelectAction ( i18n("Language Mode"),
   		CTRL + Key_M,
-		TQT_TQOBJECT(this),
-		TQT_SLOT(slotMode()),
+		this,
+		TQ_SLOT(slotMode()),
 		actionCollection(),
 		"langmode");
   langmode->setEditable(false);
@@ -339,22 +339,22 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
   connect
     (
      dcopClient,
-     TQT_SIGNAL(applicationRegistered(const TQCString &)),
-     TQT_SLOT(slotApplicationRegistered(const TQCString &))
+     TQ_SIGNAL(applicationRegistered(const TQCString &)),
+     TQ_SLOT(slotApplicationRegistered(const TQCString &))
     );
 
   connect
     (
      dcopClient,
-     TQT_SIGNAL(applicationRemoved(const TQCString &)),
-     TQT_SLOT(slotApplicationUnregistered(const TQCString &))
+     TQ_SIGNAL(applicationRemoved(const TQCString &)),
+     TQ_SLOT(slotApplicationUnregistered(const TQCString &))
     );
 
   dcopClient->setNotifications(true);
   createGUI();
   setCaption(i18n("DCOP Browser"));
 	mainView->lb_replyData->hide();
-  TQTimer::singleShot(0, this, TQT_SLOT(slotFillApplications()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotFillApplications()));
 }
 
 
@@ -458,7 +458,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "unsigned"  || type == "uint" || type == "unsigned int"
              || type == "TQ_UINT32" )
@@ -471,7 +471,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         grid->addWidget( e, i, 2 );
         wl.append( e );
 
-        TQIntValidator* iv = new TQIntValidator( TQT_TQOBJECT(e) );
+        TQIntValidator* iv = new TQIntValidator( e );
         iv->setBottom( 0 );
         e->setValidator( iv );
       }
@@ -484,7 +484,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int"
              || type == "TQ_UINT64" )
@@ -496,7 +496,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "short" || type == "short int" )
       {
@@ -507,7 +507,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "ushort" || type == "unsigned short" || type == "unsigned short int"  )
       {
@@ -518,7 +518,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "float" )
       {
@@ -529,7 +529,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQDoubleValidator( e ) );
       }
       else if ( type == "double" )
       {
@@ -540,7 +540,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = new KLineEdit( frame );
         grid->addWidget( e, i, 2 );
         wl.append( e );
-        e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
+        e->setValidator( new TQDoubleValidator( e ) );
       }
       else if ( type == "bool" )
       {
@@ -797,7 +797,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
     }
   }
 
-  DCOPRef( fitem->app(), "MainApplication-Interface" ).call( "updateUserTimestamp", kapp->userTimestamp());
+  DCOPRef( fitem->app(), "MainApplication-Interface" ).call( "updateUserTimestamp", tdeApp->userTimestamp());
 
   // Now do the DCOP call
 
@@ -1233,7 +1233,7 @@ void KDCOPWindow::slotMode()
 void KDCOPWindow::slotResultListContextMenu(TQListBoxItem *item, const TQPoint &point)
 {
 	TQPopupMenu* contextMenu = new TQPopupMenu(this);
-	contextMenu->insertItem(i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+	contextMenu->insertItem(i18n("&Copy"), this, TQ_SLOT(slotCopy()));
 	contextMenu->exec(point);
 }
 
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index ff0394f4b..c65986368 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -96,9 +96,9 @@ set( ${target}_SRCS
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK
-    pthread kdesktopsettings-static bgnd-static dmctl-static
+    ${CMAKE_THREAD_LIBS_INIT} kdesktopsettings-static bgnd-static dmctl-static
     konq-shared tdeutils-shared tdesu-shared ${TDEHW_LIBRARIES}
-    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES}
+    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${CMAKE_DL_LIBS}
     ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES}
 )
 
diff --git a/kdesktop/DESIGN b/kdesktop/DESIGN
index f69ee2198..170a86a75 100644
--- a/kdesktop/DESIGN
+++ b/kdesktop/DESIGN
@@ -7,6 +7,7 @@ Author :
 
 Last modified: 24 Oct 1999
 
+
 Overall design of KDesktop :
 =============================
 
@@ -14,6 +15,7 @@ KDesktop is the program that handles the desktop icons,
 the popup menus for the desktop, the mac menubar, and the
 screensaver system.
 
+
 Files :
 =======
 
@@ -34,6 +36,7 @@ KDesktopIface* : DCOP interface for kdesktop, used by kfmclient
 
 lock* : screen saver/locker
 
+
 Libs used by KDesktop
 ======================
  
@@ -41,6 +44,7 @@ tdecore, tdeui, tdefile  - usual stuff :)
 libtdeio - I/O stuff, mimetypes, services, registry
 libkonq - properties dialog, templates ("new") menu, dir lister, settings
 
+
 Screensaver
 ===========
 
@@ -69,6 +73,7 @@ The new background code is in bgrender.cpp and bgmanager.cpp. Some features:
 * Support for xearth like programs.
 * Can export a pixmap of the desktop background for pseudo transparency.
 
+
 Multiple monitors
 =================
 Two monitors showing different things (not a mirror-setup) can be configured
@@ -92,3 +97,43 @@ In case of 2 screen (multihead)
     |    | |     |  desktopGeometry = 3200 x 1200
     +----+ +-----+  screenGeometry = 1600 x 1200 (for each monitor)
 
+
+Interaction between kdesktop and kdesktop_lock
+==============================================
+kdesktop and kdesktop_lock interact using POSIX signals to coordinate their activities.
+Each time the screensaver or lock is activated and then stopped/unlocked, the current
+kdesktop_lock process is terminated and respawned, while kdesktop waits for the new process
+to be ready.
+
+kdesktop to kdesktop_lock communication:
+  kdesktop uses four signals to request different types of locks. These signals do not activate
+  the lock/screensaver. Some of the signals can be combined together, for example to request a
+  lock with blank screen.
+
+   - USR1 : request lock of the screen
+   - USR2 : request screensaver only, no lock
+   - WINCH: request lock of the screen using SAK (Secure Attention Key)
+   - TTIN : request blank screen for saver or lock
+
+  The lock/screensaver is started using a fifth signal.
+   - TTOU : activate the scrensaver or lock
+
+kdesktop_lock to kdesktop communication:
+  kdesktop_lock uses three signals to inform kdesktop of status changes.
+
+   - TTIN: the lock process is ready. This is sent after the process has been created/respawned
+   - USR2: the lock/screensaver has been activated
+   - USR1: the lock/screensaver has been unlocked/stopped
+
+Communication is handled by the screen saver engine defined in 'lockeng.{h,cpp}'.
+The engine is split into two parts, the 'SaverEngine' running in the GUI thread and
+the 'SaverEngineEventHandler' running in a separate thread and eventloop.
+The 'SaverEngine' handles communication with X11, DCOP and DBUS while the
+'SaverEngineEventHandler' handles communication with the actual lock process.
+Several actions require cooperation of the two parts, so in various methods
+there will be inter-thread calls (using timers or by emitting signals) to
+trigger the other side remaining logic.
+This complex design is necessary to avoid blocking the main GUI application event loop,
+which has several tasks to manage and therefore can't affort to wait in a suspended state.
+This was previously leading to deadlock when DCOP calls where executed on the secondary
+thread/eventloop, for example when changing desktop while the lock process was restarting.
diff --git a/kdesktop/KScreensaverIface.h b/kdesktop/KScreensaverIface.h
index de5c19f2b..b6434738e 100644
--- a/kdesktop/KScreensaverIface.h
+++ b/kdesktop/KScreensaverIface.h
@@ -12,11 +12,10 @@ public:
   KScreensaverIface() : DCOPObject("KScreensaverIface") {}
 
 k_dcop:
-  /** Lock the screen now even if the screensaver does not lock by default. */
+  /** Lock the screen now even if the screensaver does not lock by default */
   virtual void lock() = 0;
 
-  /** Save the screen now.  If the user has locking enabled, the screen is
-   * locked also. */
+  /** Start the screensaver now. If the user has locking enabled, the screen is locked also */
   virtual void save() = 0;
 
   /** Quit the screensaver if it is running */
@@ -29,22 +28,23 @@ k_dcop:
    * Enable/disable the screensaver
    * returns true if the action succeeded
    */
-  virtual bool enable( bool e ) = 0;
+  virtual bool enable(bool e) = 0;
 
   /** Is the screen currently blanked? */
   virtual bool isBlanked() = 0;
 
-  /** Reload the screensaver configuration. */
+  /** Reload the screensaver configuration */
   virtual void configure() = 0;
 
-  /** Only blank the screen (and possibly lock).  Do not use a custom
-   * screen saver in the interest of saving battery.
+  /**
+   * Set the screensaver to blank (and possibly lock).
+   * This method does not actually start the screensaver.
    */
-  virtual void setBlankOnly( bool blankOnly ) = 0;
+  virtual void setBlankOnly(bool blankOnly) = 0;
 
   /***
    * @internal
-  */
+   */
   virtual void saverLockReady() = 0;
 };
 
diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp
index 7e90e8fca..49cff2c16 100644
--- a/kdesktop/bgmanager.cpp
+++ b/kdesktop/bgmanager.cpp
@@ -78,7 +78,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
 
     m_pDesktop = desktop;
     if (desktop == 0L)
-        desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());
+        desktop = TDEApplication::desktop()->screen();
 
     m_Renderer.resize( 1 );
     m_Cache.resize( 1 );
@@ -97,40 +97,40 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
         m_Cache[i]->hash = 0;
         m_Cache[i]->exp_from = -1;
         m_Renderer.insert (i, new KVirtualBGRenderer(i,m_pConfig));
-        connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
+        connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int)));
         m_Renderer[i]->enableTiling( true ); // optimize
     }
 
 #ifdef COMPOSITE
-    m_tPixmap = new KPixmap(kapp->desktop()->size());
+    m_tPixmap = new KPixmap(tdeApp->desktop()->size());
     m_tPixmap->fill(TQColor(0, 0x0));
-    connect(myApp, TQT_SIGNAL(cmBackgroundChanged( bool )),
-            TQT_SLOT(slotCmBackgroundChanged( bool )));
+    connect(myApp, TQ_SIGNAL(cmBackgroundChanged( bool )),
+            TQ_SLOT(slotCmBackgroundChanged( bool )));
 #endif
 
     configure();
 
     m_pTimer = new TQTimer(this);
-    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
     m_pTimer->start( 60000 );
 
     /*CrossFade's config*/
     m_crossTimer = new TQTimer(this);
-    connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout()));
+    connect(m_crossTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCrossFadeTimeout()));
     resizingDesktop = true;
     /*Ends here*/
 
 
-    connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopChanged(int)),
-	    TQT_SLOT(slotChangeDesktop(int)));
-    connect(m_pKwinmodule, TQT_SIGNAL(numberOfDesktopsChanged(int)),
-	    TQT_SLOT(slotChangeNumberOfDesktops(int)));
-    connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)),
-            TQT_SLOT(slotChangeViewport(int, const TQPoint&)));
+    connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopChanged(int)),
+	    TQ_SLOT(slotChangeDesktop(int)));
+    connect(m_pKwinmodule, TQ_SIGNAL(numberOfDesktopsChanged(int)),
+	    TQ_SLOT(slotChangeNumberOfDesktops(int)));
+    connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)),
+            TQ_SLOT(slotChangeViewport(int, const TQPoint&)));
 
 
 #if (TQT_VERSION-0 >= 0x030200)
-    connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+    connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
 #endif
 
     TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
@@ -338,7 +338,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num)
 	    m_Cache[i]->hash = 0;
 	    m_Cache[i]->exp_from = -1;
             m_Renderer.insert(i, new KVirtualBGRenderer(i,m_pConfig));
-	    connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
+	    connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int)));
             m_Renderer[i]->enableTiling( true ); // optimize
 	}
     }
@@ -542,16 +542,16 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
        if( !root_cleared )
        { // clear the root window pixmap set by tdm
           root_cleared = true;
-	  TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
+	  TQTimer::singleShot( 0, this, TQ_SLOT( clearRoot()));
           // but make the pixmap visible until m_pDesktop is visible
-          TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
-          TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+          TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+          TDEApplication::desktop()->screen()->erase();
        }
     }
     else
     {
-        TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
-        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+        TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+        TDEApplication::desktop()->screen()->erase();
     }
 
      // and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -571,8 +571,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
 
 void KBackgroundManager::clearRoot()
 {
-    TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
-    TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+    TDEApplication::desktop()->screen()->setErasePixmap( TQPixmap());
+    TDEApplication::desktop()->screen()->erase();
 }
 
 /*
@@ -681,7 +681,7 @@ void KBackgroundManager::slotImageDone(int desk)
         {
             m_bBgInitDone = true;
             emit initDone();
-            TQTimer::singleShot( 30000, this, TQT_SLOT( saveImages()));
+            TQTimer::singleShot( 30000, this, TQ_SLOT( saveImages()));
             do_cleanup = false;
         }
     }
@@ -1004,7 +1004,7 @@ void KBackgroundManager::repaintBackground()
     if (m_pDesktop)
        m_pDesktop->repaint();
     else
-        TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+        TDEApplication::desktop()->screen()->erase();
 }
 
 void KBackgroundManager::desktopResized()
@@ -1026,13 +1026,13 @@ void KBackgroundManager::desktopResized()
 #ifdef COMPOSITE
     if (m_tPixmap)
 	delete m_tPixmap;
-    m_tPixmap = new KPixmap(kapp->desktop()->size());
+    m_tPixmap = new KPixmap(tdeApp->desktop()->size());
     m_tPixmap->fill(TQColor(0, 0x0));
 #endif
     
     m_Hash = 0;
     if( m_pDesktop ) {
-        m_pDesktop->resize( kapp->desktop()->geometry().size());
+        m_pDesktop->resize( tdeApp->desktop()->geometry().size());
         if (m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){
             m_Renderer[effectiveDesktop()]->renderer(0)->changeWallpaper();
         }
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 99d30a7bd..d78ebebc3 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -16,7 +16,7 @@
 #include <tqdatetime.h>
 #include <KBackgroundIface.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp
index 989d07d73..3ef0e33e7 100644
--- a/kdesktop/desktop.cpp
+++ b/kdesktop/desktop.cpp
@@ -44,17 +44,17 @@
 #include <dcopclient.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kimageio.h>
 #include <kinputdialog.h>
 #include <kipc.h>
 #include <tdelocale.h>
 #include <tdeio/netaccess.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdesycoca.h>
 #include <tdetempfile.h>
 #include <tdemessagebox.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <twinmodule.h>
 #include <krun.h>
 #include <twin.h>
@@ -71,8 +71,8 @@ extern TQCString kdesktop_name, kicker_name, twin_name;
 
 KRootWidget::KRootWidget() : TQObject()
 {
-     kapp->desktop()->installEventFilter(this);
-     kapp->desktop()->setAcceptDrops( true );
+     tdeApp->desktop()->installEventFilter(this);
+     tdeApp->desktop()->setAcceptDrops( true );
 }
 
 bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
@@ -113,7 +113,7 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
      else if ( e->type() == TQEvent::Drop )
      {
        TQDropEvent* de = static_cast<TQDropEvent*>( e );
-       if ( KColorDrag::canDecode( de ) ) 
+       if ( KColorDrag::canDecode( de ) )
          emit colorDropEvent( de );
        else if ( TQImageDrag::canDecode( de ) )
          emit imageDropEvent( de );
@@ -155,10 +155,10 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   setCaption( "KDE Desktop");
 
   setAcceptDrops(true); // WStyle_Customize seems to disable that
-  m_pKwinmodule = new KWinModule( TQT_TQOBJECT(this) );
+  m_pKwinmodule = new KWinModule( this );
 
-  kapp->dcopClient()->setNotifications(true);
-  kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
+  tdeApp->dcopClient()->setNotifications(true);
+  tdeApp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
                                         "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
 
   // Dont repaint on configuration changes during construction
@@ -184,28 +184,28 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   setGeometry( TQApplication::desktop()->geometry() );
   lower();
 
-  connect( kapp, TQT_SIGNAL( shutDown() ),
-           this, TQT_SLOT( slotShutdown() ) );
+  connect( tdeApp, TQ_SIGNAL( shutDown() ),
+           this, TQ_SLOT( slotShutdown() ) );
 
-  connect(kapp, TQT_SIGNAL(settingsChanged(int)),
-          this, TQT_SLOT(slotSettingsChanged(int)));
-  kapp->addKipcEventMask(KIPC::SettingsChanged);
+  connect(tdeApp, TQ_SIGNAL(settingsChanged(int)),
+          this, TQ_SLOT(slotSettingsChanged(int)));
+  tdeApp->addKipcEventMask(KIPC::SettingsChanged);
 
-  kapp->addKipcEventMask(KIPC::IconChanged);
-  connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int)));
+  tdeApp->addKipcEventMask(KIPC::IconChanged);
+  connect(tdeApp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
 
-  connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
-          this, TQT_SLOT(slotDatabaseChanged()));
+  connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
+          this, TQ_SLOT(slotDatabaseChanged()));
 
   m_pIconView = 0;
   m_pRootWidget = 0;
   bgMgr = 0;
   initRoot();
 
-  TQTimer::singleShot(0, this, TQT_SLOT( slotStart() ));
+  TQTimer::singleShot(0, this, TQ_SLOT( slotStart() ));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-  connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
+  connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 }
 
@@ -215,7 +215,7 @@ KDesktop::initRoot()
   Display *dpy = tqt_xdisplay();
   Window root = RootWindow(dpy, kdesktop_screen_number);
   XDefineCursor(dpy, root, cursor().handle());
-  
+
   m_bDesktopEnabled = KDesktopSettings::desktopEnabled();
   if ( !m_bDesktopEnabled && !m_pRootWidget )
   {
@@ -238,21 +238,21 @@ KDesktop::initRoot()
      XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask);
 
      m_pRootWidget = new KRootWidget;
-     connect(m_pRootWidget, TQT_SIGNAL(wheelRolled(int)), this, TQT_SLOT(slotSwitchDesktops(int)));
-     connect(m_pRootWidget, TQT_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQT_SLOT(handleColorDropEvent(TQDropEvent*)) );
-     connect(m_pRootWidget, TQT_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQT_SLOT(handleImageDropEvent(TQDropEvent*)) );
-     connect(m_pRootWidget, TQT_SIGNAL(newWallpaper(const KURL&)), this, TQT_SLOT(slotNewWallpaper(const KURL&)) );
+     connect(m_pRootWidget, TQ_SIGNAL(wheelRolled(int)), this, TQ_SLOT(slotSwitchDesktops(int)));
+     connect(m_pRootWidget, TQ_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQ_SLOT(handleColorDropEvent(TQDropEvent*)) );
+     connect(m_pRootWidget, TQ_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQ_SLOT(handleImageDropEvent(TQDropEvent*)) );
+     connect(m_pRootWidget, TQ_SIGNAL(newWallpaper(const KURL&)), this, TQ_SLOT(slotNewWallpaper(const KURL&)) );
 
      // Geert Jansen: backgroundmanager belongs here
      // TODO tell KBackgroundManager if we change widget()
      bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
      bgMgr->setExport(1);
-     connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
+     connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone()));
      if (!m_bInit)
      {
         delete KRootWm::self();
         KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click)
-        keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
+        keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock()));
         keys->updateConnections();
      }
   }
@@ -263,14 +263,14 @@ KDesktop::initRoot()
      delete m_pRootWidget;
      m_pRootWidget = 0;
      m_pIconView = new KDIconView( this, 0 );
-     connect( m_pIconView, TQT_SIGNAL( imageDropEvent( TQDropEvent * ) ),
-              this, TQT_SLOT( handleImageDropEvent( TQDropEvent * ) ) );
-     connect( m_pIconView, TQT_SIGNAL( colorDropEvent( TQDropEvent * ) ),
-              this, TQT_SLOT( handleColorDropEvent( TQDropEvent * ) ) );
-     connect( m_pIconView, TQT_SIGNAL( newWallpaper( const KURL & ) ),
-              this, TQT_SLOT( slotNewWallpaper( const KURL & ) ) );
-     connect( m_pIconView, TQT_SIGNAL( wheelRolled( int ) ),
-              this, TQT_SLOT( slotSwitchDesktops( int ) ) );
+     connect( m_pIconView, TQ_SIGNAL( imageDropEvent( TQDropEvent * ) ),
+              this, TQ_SLOT( handleImageDropEvent( TQDropEvent * ) ) );
+     connect( m_pIconView, TQ_SIGNAL( colorDropEvent( TQDropEvent * ) ),
+              this, TQ_SLOT( handleColorDropEvent( TQDropEvent * ) ) );
+     connect( m_pIconView, TQ_SIGNAL( newWallpaper( const KURL & ) ),
+              this, TQ_SLOT( slotNewWallpaper( const KURL & ) ) );
+     connect( m_pIconView, TQ_SIGNAL( wheelRolled( int ) ),
+              this, TQ_SLOT( slotSwitchDesktops( int ) ) );
 
      // All the QScrollView/TQWidget-specific stuff should go here, so that we can use
      // another qscrollview/widget instead of the iconview and use the same code
@@ -288,7 +288,7 @@ KDesktop::initRoot()
      // TODO tell KBackgroundManager if we change widget()
      bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
      bgMgr->setExport(1);
-     connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
+     connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone()));
 
      // make sure it is initialized before we first call updateWorkArea()
      m_pIconView->initConfig( m_bInit );
@@ -301,7 +301,7 @@ KDesktop::initRoot()
         TQCString replyType;
         TQRect area;
 
-        if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
+        if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
                                        data, replyType, result, false, 2000) )
         {
           TQDataStream res(result, IO_ReadOnly);
@@ -315,7 +315,7 @@ KDesktop::initRoot()
             // if we failed to get the information from kicker wait a little - probably
             // this is the KDE startup and kicker is simply not running yet
             m_waitForKicker = new TQTimer(this);
-            connect(m_waitForKicker, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoKicker()));
+            connect(m_waitForKicker, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNoKicker()));
             m_waitForKicker->start(15000, true);
           }
           else  // we are not called from the ctor, so kicker should already run
@@ -330,7 +330,7 @@ KDesktop::initRoot()
         m_pIconView->start();
         delete KRootWm::self();
         KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click)
-        keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
+        keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock()));
         keys->updateConnections();
      }
    } else {
@@ -359,12 +359,12 @@ KDesktop::backgroundInitDone()
     // avoid flicker
     if (m_bDesktopEnabled)
     {
-       const TQPixmap *bg = TQT_TQWIDGET(TQApplication::desktop()->screen())->backgroundPixmap();
+       const TQPixmap *bg = TQApplication::desktop()->screen()->backgroundPixmap();
        if ( bg )
           m_pIconView->setErasePixmap( *bg );
 
        show();
-       kapp->sendPostedEvents();
+       tdeApp->sendPostedEvents();
     }
 
     DCOPRef r( "ksmserver", "ksmserver" );
@@ -396,7 +396,7 @@ KDesktop::slotStart()
      m_pIconView->start();
 
   // Global keys
-  keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+  keys = new TDEGlobalAccel( this );
   (void) new KRootWm( m_pSaver, this );
 
 #include "kdesktopbindings.cpp"
@@ -404,9 +404,9 @@ KDesktop::slotStart()
   keys->readSettings();
   keys->updateConnections();
 
-  connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotConfigure()));
+  connect(tdeApp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
 
-  TQTimer::singleShot(300, this, TQT_SLOT( slotUpAndRunning() ));
+  TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() ));
 }
 
 void
@@ -504,7 +504,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
   if (m_bInit)
       return;
 
-  if (!kapp->authorize("run_command"))
+  if (!tdeApp->authorize("run_command"))
       return;
 
   // Created on demand
@@ -648,21 +648,21 @@ void KDesktop::setShowDesktop( bool b )
         }
 
         // on desktop changes or when a window is deiconified, we abort the show desktop mode
-        connect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                TQT_SLOT(slotCurrentDesktopChanged(int)));
-        connect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        connect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                TQT_SLOT(slotWindowAdded(WId)));
+        connect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                TQ_SLOT(slotCurrentDesktopChanged(int)));
+        connect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        connect(twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                TQ_SLOT(slotWindowAdded(WId)));
     }
     else
     {
-        disconnect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                   this, TQT_SLOT(slotCurrentDesktopChanged(int)));
-        disconnect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                   this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        disconnect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                   this, TQT_SLOT(slotWindowAdded(WId)));
+        disconnect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                   this, TQ_SLOT(slotCurrentDesktopChanged(int)));
+        disconnect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                   this, TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        disconnect(twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                   this, TQ_SLOT(slotWindowAdded(WId)));
 
         for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
              it != m_iconifiedList.end();
@@ -839,7 +839,7 @@ void KDesktop::refresh()
   m_bNeedRepaint |= 1;
   updateWorkArea();
 #endif
-  kapp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
+  tdeApp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
   refreshIcons();
 }
 
@@ -851,7 +851,7 @@ void KDesktop::slotSetVRoot()
         return;
 
     if (KWin::windowInfo(winId()).mappingState() == NET::Withdrawn) {
-        TQTimer::singleShot(100, this, TQT_SLOT(slotSetVRoot()));
+        TQTimer::singleShot(100, this, TQ_SLOT(slotSetVRoot()));
         return;
     }
 
@@ -907,7 +907,7 @@ void KDesktop::desktopIconsAreaChanged(const TQRect &area, int screen)
     if (screen <= -2)
        screen = kdesktop_screen_number;
     else if (screen == -1)
-       screen = kapp->desktop()->primaryScreen();
+       screen = tdeApp->desktop()->primaryScreen();
 
     // This is pretty broken, mixes Xinerama and non-Xinerama multihead
     // and generally doesn't seem to be required anyway => ignore screen.
@@ -1032,7 +1032,7 @@ void KDesktop::logout()
 void KDesktop::logout( TDEApplication::ShutdownConfirm confirm,
                        TDEApplication::ShutdownType sdtype )
 {
-    if( !kapp->requestShutDown( confirm, sdtype ) )
+    if( !tdeApp->requestShutDown( confirm, sdtype ) )
         // this i18n string is also in kicker/applets/run/runapplet
         KMessageBox::error( this, i18n("Could not log out properly.\nThe session manager cannot "
                                         "be contacted. You can try to force a shutdown by pressing "
@@ -1064,6 +1064,30 @@ void KDesktop::slotRebootNoCnf()
             TDEApplication::ShutdownTypeReboot );
 }
 
+void KDesktop::slotFreeze()
+{
+    DCOPRef r("ksmserver", "ksmserver");
+    r.send("suspend", 1);
+}
+
+void KDesktop::slotSuspend()
+{
+    DCOPRef r("ksmserver", "ksmserver");
+    r.send("suspend", 3);
+}
+
+void KDesktop::slotHibernate()
+{
+    DCOPRef r("ksmserver", "ksmserver");
+    r.send("suspend", 4);
+}
+
+void KDesktop::slotHybridSuspend()
+{
+    DCOPRef r("ksmserver", "ksmserver");
+    r.send("suspend", 5);
+}
+
 void KDesktop::setVRoot( bool enable )
 {
     if ( enable == set_vroot )
@@ -1100,7 +1124,7 @@ void KDesktop::setIconsEnabled( bool enable )
 
 void KDesktop::desktopResized()
 {
-    resize(kapp->desktop()->size());
+    resize(tdeApp->desktop()->size());
 
     if ( m_pIconView )
     {
@@ -1108,7 +1132,7 @@ void KDesktop::desktopResized()
         // remove all icons, resize desktop, tell kdiconview new iconsArea size
         // tell kdiconview to reget all icons
         m_pIconView->slotClear();
-        m_pIconView->resize(kapp->desktop()->size());
+        m_pIconView->resize(tdeApp->desktop()->size());
 
         // get new desktopIconsArea from kicker
         TQByteArray data, result;
@@ -1117,7 +1141,7 @@ void KDesktop::desktopResized()
         TQCString replyType;
         TQRect area;
 
-        if ( kapp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
+        if ( tdeApp->dcopClient()->call(kicker_name, kicker_name, "desktopIconsArea(int)",
                                        data, replyType, result, false, 2000) )
         {
             TQDataStream res(result, IO_ReadOnly);
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index c85e8b577..ca1eefc61 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -135,6 +135,10 @@ private slots:
   void slotLogoutNoCnf();
   void slotHaltNoCnf();
   void slotRebootNoCnf();
+  void slotFreeze();
+  void slotSuspend();
+  void slotHibernate();
+  void slotHybridSuspend();
 
   /** Connected to KSycoca */
   void slotDatabaseChanged();
diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp
index 6bf87f333..25e3dd717 100644
--- a/kdesktop/init.cpp
+++ b/kdesktop/init.cpp
@@ -19,11 +19,11 @@
 
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 #include <tdeglobalsettings.h>
 #include <tdeapplication.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -40,7 +40,7 @@
 #include <dirent.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 // for multihead
 extern int kdesktop_screen_number;
@@ -134,7 +134,7 @@ static TQString realDesktopPath()
  */
 static void copyDesktopLinks()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("General");
     if (!config->readBoolEntry("CopyDesktopLinks", true))
        return;
@@ -145,7 +145,7 @@ static void copyDesktopLinks()
     TQString desktopPath = realDesktopPath();
 
     for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++) {
-        KDesktopFile desk( *it );
+        TDEDesktopFile desk( *it );
         if (desk.readBoolEntry("Hidden"))
            continue;
         copyFile( *it, desktopPath );
@@ -213,13 +213,13 @@ void testLocalInstallation()
     if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) {
         TQString oldIcon, oldEmptyIcon;
         if ( trashDesktopExists ) {
-            KDesktopFile trashDesktop( trashDesktopPath, true );
+            TDEDesktopFile trashDesktop( trashDesktopPath, true );
             oldIcon = trashDesktop.readIcon();
             oldEmptyIcon = trashDesktop.readEntry( "EmptyIcon" );
         }
         copyFile( locate( "data", "kdesktop/directory.trash" ), trashDesktopPath );
         if ( trashDesktopExists ) {
-            KDesktopFile trashDesktop( trashDesktopPath );
+            TDEDesktopFile trashDesktop( trashDesktopPath );
             trashDesktop.writeEntry( "Icon", oldIcon );
             trashDesktop.writeEntry( "EmptyIcon", oldEmptyIcon );
             trashDesktop.sync();
@@ -234,7 +234,7 @@ void testLocalInstallation()
         (void)TDEIO::NetAccess::synchronousRun( job, 0 );
 
         // OK the only thing missing is to convert the icon position...
-        KSimpleConfig cfg( locateLocal("appdata", "IconPositions") );
+        TDESimpleConfig cfg( locateLocal("appdata", "IconPositions") );
         if ( cfg.hasGroup( "IconPosition::Trash" ) && !cfg.hasGroup( "IconPosition::trash.desktop" ) ) {
             const TQMap<TQString, TQString> entries = cfg.entryMap( "IconPosition::Trash" );
             cfg.setGroup( "IconPosition::trash.desktop" );
diff --git a/kdesktop/kcustommenu.cpp b/kdesktop/kcustommenu.cpp
index 2e825c0d9..f3d3cf817 100644
--- a/kdesktop/kcustommenu.cpp
+++ b/kdesktop/kcustommenu.cpp
@@ -57,7 +57,7 @@ KCustomMenu::KCustomMenu(const TQString &configfile, TQWidget *parent)
  
      insertMenuItem( menuItem, -1 );
   }
-  connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+  connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 }
 
 KCustomMenu::~KCustomMenu()
@@ -71,7 +71,7 @@ KCustomMenu::slotActivated(int id)
   KService::Ptr s = d->entryMap[id];
   if (!s)
      return;
-  kapp->startServiceByDesktopPath(s->desktopEntryPath());
+  tdeApp->startServiceByDesktopPath(s->desktopEntryPath());
 }
 
 // The following is copied from kicker's PanelServiceMenu
diff --git a/kdesktop/kdesktopapp.cpp b/kdesktop/kdesktopapp.cpp
index 35f763f9c..b19817bbd 100644
--- a/kdesktop/kdesktopapp.cpp
+++ b/kdesktop/kdesktopapp.cpp
@@ -20,7 +20,7 @@
 #include <kdesktopapp.h>
 
 KDesktopApp::KDesktopApp():
-KUniqueApplication()
+TDEUniqueApplication()
 {
 #ifdef COMPOSITE
     initCmBackground();
@@ -28,7 +28,7 @@ KUniqueApplication()
 }
 
 KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap):
-KUniqueApplication(dpy, visual, colormap)
+TDEUniqueApplication(dpy, visual, colormap)
 {
 #ifdef COMPOSITE
     initCmBackground();
@@ -87,7 +87,7 @@ bool KDesktopApp::x11EventFilter (XEvent * xevent)
             emit cmBackgroundChanged(supported);
         }
     }
-    return KUniqueApplication::x11EventFilter (xevent);
+    return TDEUniqueApplication::x11EventFilter (xevent);
 }
 
 #endif
diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h
index 465598a3d..4ce52c3a2 100644
--- a/kdesktop/kdesktopapp.h
+++ b/kdesktop/kdesktopapp.h
@@ -21,9 +21,9 @@
 #define __kdesktopapp_h__
 
 #include <config.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
@@ -33,7 +33,7 @@
 # include <fixx11h.h>
 #endif
 
-class KDesktopApp : public KUniqueApplication
+class KDesktopApp : public TDEUniqueApplication
 {
     TQ_OBJECT
     public:
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index fe751db4f..a4f46e717 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -1,6 +1,6 @@
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 # define DEF2( name, key3, key4, receiver, slot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4, receiver, slot );
 #else
@@ -14,7 +14,7 @@
 	keys->insert( "Program:kdesktop", i18n("Desktop") );
 
 #ifndef NOSLOTS
-	if (kapp->authorize("run_command"))
+	if (tdeApp->authorize("run_command"))
 	{
 #endif
 		DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
@@ -25,20 +25,20 @@
 	DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() );
 	DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() );
 #ifndef NOSLOTS
-	if (kapp->authorize("lock_screen"))
+	if (tdeApp->authorize("lock_screen"))
 	{
 #endif
-		DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) );
-		DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQT_SLOT(slotLock()) );
+		DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQ_SLOT(slotLock()) );
+		DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQ_SLOT(slotLock()) );
 #ifndef NOSLOTS
 	}
-	if (kapp->authorize("start_screensaver"))
+	if (tdeApp->authorize("start_screensaver"))
 	{
 #endif
-		DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) );
+		DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQ_SLOT(slotSave()) );
 #ifndef NOSLOTS
 	}
-	if (kapp->authorize("logout"))
+	if (tdeApp->authorize("logout"))
 	{
 #endif
 		DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );
@@ -49,6 +49,27 @@
 	}
 #endif
 
+    // Only add these options if supported by ksmserver
+    DCOPRef ksmref("ksmserver", "ksmserver");
+    DCOPReply reply = ksmref.call("suspendOptions");
+
+    TQStringList suspendOptions;
+    if (reply.isValid()) {
+        reply.get(suspendOptions);
+    }
+
+    if (suspendOptions.contains("freeze"))
+        DEF( I18N_NOOP("Freeze"), TDEShortcut(), TDEShortcut(), slotFreeze() );
+
+    if (suspendOptions.contains("suspend"))
+        DEF( I18N_NOOP("Suspend"), TDEShortcut(TQString("XF86Sleep")), TDEShortcut(TQString("XF86Sleep")), slotSuspend() );
+
+    if (suspendOptions.contains("hibernate"))
+        DEF( I18N_NOOP("Hibernate"), TDEShortcut(), TDEShortcut(), slotHibernate() );
+
+    if (suspendOptions.contains("hybridSuspend"))
+        DEF( I18N_NOOP("Hybrid Suspend"), TDEShortcut(), TDEShortcut(), slotHybridSuspend() );
+
 #undef DEF
 #undef DEF2
 #undef WIN
diff --git a/kdesktop/kdesktopshadowsettings.h b/kdesktop/kdesktopshadowsettings.h
index c7e73db71..3c08cd574 100644
--- a/kdesktop/kdesktopshadowsettings.h
+++ b/kdesktop/kdesktopshadowsettings.h
@@ -24,7 +24,7 @@
 #define __FX_DATA_DESKTOP
 
 #include <tqcolor.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 
 #include <kshadowsettings.h>
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 00fa59bf8..70f1010b7 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kcolordrag.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdirlister.h>
 #include <tdeglobalsettings.h>
 #include <kpropertiesdialog.h>
@@ -42,7 +42,7 @@
 #include <kivfreespaceoverlay.h>
 #include <kprotocolinfo.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 #include <twin.h>
 #include <twinmodule.h>
@@ -74,7 +74,7 @@ TQRect KDIconView::desktopRect()
 
 // -----------------------------------------------------------------------------
 
-void KDIconView::saveIconPosition(KSimpleConfig *config, int x, int y)
+void KDIconView::saveIconPosition(TDESimpleConfig *config, int x, int y)
 {
   // save the icon position in absolute coordinates
   config->writeEntry("Xabs", x);
@@ -90,7 +90,7 @@ void KDIconView::saveIconPosition(KSimpleConfig *config, int x, int y)
 
 // -----------------------------------------------------------------------------
 
-void KDIconView::readIconPosition(KSimpleConfig *config, int &x, int &y)
+void KDIconView::readIconPosition(TDESimpleConfig *config, int &x, int &y)
 {
   // check if we have the position for the current desktop size
   TQRect desk = desktopRect();
@@ -138,7 +138,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
       m_bNeedSave( false ),
       m_autoAlign( false ),
       m_hasExistingPos( false ),
-      m_bEditableDesktopIcons( kapp->authorize("editable_desktop_icons") ),
+      m_bEditableDesktopIcons( tdeApp->authorize("editable_desktop_icons") ),
       m_bShowDot( false ),
       m_bVertAlign( true ),
       m_dirLister( 0L ),
@@ -162,32 +162,32 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
     // Initialize media handler
     mMediaListView = new TQListView();
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+    connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
 
     setURL( desktopURL() ); // sets m_url
 
     m_desktopDirs = TDEGlobal::dirs()->findDirs( "appdata", "Desktop" );
     initDotDirectories();
 
-    connect( this, TQT_SIGNAL( executed( TQIconViewItem * ) ),
-             TQT_SLOT( slotExecuted( TQIconViewItem * ) ) );
-    connect( this, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ),
-             TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
-    connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
-             TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
-    connect( this, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
-             TQT_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) );
-    connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
-             TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
+    connect( this, TQ_SIGNAL( executed( TQIconViewItem * ) ),
+             TQ_SLOT( slotExecuted( TQIconViewItem * ) ) );
+    connect( this, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ),
+             TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+    connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
+             TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
+    connect( this, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
+             TQ_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) );
+    connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
+             TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
 
-    connect( this, TQT_SIGNAL( enableAction( const char * , bool ) ),
-             TQT_SLOT( slotEnableAction( const char * , bool ) ) );
+    connect( this, TQ_SIGNAL( enableAction( const char * , bool ) ),
+             TQ_SLOT( slotEnableAction( const char * , bool ) ) );
 
     // Hack: KonqIconViewWidget::slotItemRenamed is not virtual :-(
-    disconnect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
-             this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
-    connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
-             this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+    disconnect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+             this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+    connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+             this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
 
     if (!m_bEditableDesktopIcons)
     {
@@ -226,7 +226,7 @@ void KDIconView::initDotDirectories()
 
     delete m_dotDirectory;
 
-    m_dotDirectory = new KSimpleConfig( dotFileName );
+    m_dotDirectory = new TDESimpleConfig( dotFileName );
     // If we don't allow editable desktop icons, empty m_dotDirectory
     if (!m_bEditableDesktopIcons)
     {
@@ -248,7 +248,7 @@ void KDIconView::initDotDirectories()
 
         if (TQFile::exists(localDotFileName))
         {
-           KSimpleConfig dotDir(localDotFileName, true); // Read only
+           TDESimpleConfig dotDir(localDotFileName, true); // Read only
 
            TQStringList groups = dotDir.groupList();
            TQStringList::ConstIterator gIt = groups.begin();
@@ -370,16 +370,16 @@ void KDIconView::start()
 
     m_bNeedSave = false;
 
-    connect( m_dirLister, TQT_SIGNAL( clear() ),                               this, TQT_SLOT( slotClear() ) );
-    connect( m_dirLister, TQT_SIGNAL( started(const KURL&) ),                  this, TQT_SLOT( slotStarted(const KURL&) ) );
-    connect( m_dirLister, TQT_SIGNAL( completed() ),                           this, TQT_SLOT( slotCompleted() ) );
-    connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),     this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-    connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),             this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-    connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+    connect( m_dirLister, TQ_SIGNAL( clear() ),                               this, TQ_SLOT( slotClear() ) );
+    connect( m_dirLister, TQ_SIGNAL( started(const KURL&) ),                  this, TQ_SLOT( slotStarted(const KURL&) ) );
+    connect( m_dirLister, TQ_SIGNAL( completed() ),                           this, TQ_SLOT( slotCompleted() ) );
+    connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ),     this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+    connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),             this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+    connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
 
     // Start the directory lister !
     m_dirLister->setShowingDotFiles( m_bShowDot );
-    kapp->allowURLAction("list", KURL(), url());
+    tdeApp->allowURLAction("list", KURL(), url());
     startDirLister();
     createActions();
 }
@@ -420,35 +420,35 @@ void KDIconView::createActions()
 {
     if (m_bEditableDesktopIcons)
     {
-        TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" );
-        connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
-             undo, TQT_SLOT( setEnabled( bool ) ) );
-        connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
-             undo, TQT_SLOT( setText( const TQString & ) ) );
+        TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), &m_actionCollection, "undo" );
+        connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ),
+             undo, TQ_SLOT( setEnabled( bool ) ) );
+        connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ),
+             undo, TQ_SLOT( setText( const TQString & ) ) );
         undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
 
-        TDEAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
+        TDEAction* paCut = KStdAction::cut( this, TQ_SLOT( slotCut() ), &m_actionCollection, "cut" );
         TDEShortcut cutShortCut = paCut->shortcut();
         cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files
         paCut->setShortcut( cutShortCut );
 
-        KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
-        KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
-        TDEAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
+        KStdAction::copy( this, TQ_SLOT( slotCopy() ), &m_actionCollection, "copy" );
+        KStdAction::paste( this, TQ_SLOT( slotPaste() ), &m_actionCollection, "paste" );
+        TDEAction *pasteTo = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
         pasteTo->setEnabled( false ); // only enabled during popupMenu()
 
         TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
-        new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
+        new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
 
-        (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
-        (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
+        (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQ_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
+        (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, this, TQ_SLOT( slotProperties() ), &m_actionCollection, "properties" );
         TDEAction* trash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
-        connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-                 this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+        connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+                 this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
         TDEConfig config("kdeglobals", true, false);
         config.setGroup( "KDE" );
-        (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+        (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, this, TQ_SLOT( slotDelete() ), &m_actionCollection, "del" );
 
         // Initial state of the actions (cut/copy/paste/...)
         slotSelectionChanged();
@@ -526,8 +526,8 @@ void KDIconView::setAutoAlign( bool b )
         else {
             KRootWm::self()->startup = false;
         }
-        connect( this, TQT_SIGNAL( iconMoved() ),
-                 this, TQT_SLOT( lineupIcons() ) );
+        connect( this, TQ_SIGNAL( iconMoved() ),
+                 this, TQ_SLOT( lineupIcons() ) );
     }
     else {
         // change maxItemWidth, because when grid-align was active, it changed this for the grid
@@ -535,8 +535,8 @@ void KDIconView::setAutoAlign( bool b )
         setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
         setFont( font() );  // Force calcRect()
 
-        disconnect( this, TQT_SIGNAL( iconMoved() ),
-                    this, TQT_SLOT( lineupIcons() ) );
+        disconnect( this, TQ_SIGNAL( iconMoved() ),
+                    this, TQ_SLOT( lineupIcons() ) );
     }
 }
 
@@ -566,7 +566,7 @@ void KDIconView::startDirLister()
         u.setPath( *it );
         m_mergeDirs.append( u );
         // And start listing this dir right now
-        kapp->allowURLAction("list", KURL(), u);
+        tdeApp->allowURLAction("list", KURL(), u);
         m_dirLister->openURL( u, true );
     }
     configureMedia();
@@ -749,7 +749,7 @@ void KDIconView::slotReturnPressed( TQIconViewItem *item )
 
 void KDIconView::slotExecuted( TQIconViewItem *item )
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     m_lastDeletedIconPos = TQPoint(); // user action -> not renaming an icon
     if (item) {
         visualActivate(item);
@@ -839,7 +839,7 @@ void KDIconView::saveMediaListView()
         appname = "kdesktop";
     else
         appname.sprintf("kdesktop-screen-%d", konq_screen_number);
-    kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface", "configure()", data );
     delete g_pConfig;
 }
 
@@ -906,7 +906,7 @@ bool KDIconView::deleteGlobalDesktopFiles()
         // Web Browser		kfmclient openBrowser %u		Application	TDE;
 
         if ( isDesktopFile(fItem) ) {
-            KSimpleConfig cfg( fItem->url().path(), true );
+            TDESimpleConfig cfg( fItem->url().path(), true );
             cfg.setDesktopGroup();
             if ( cfg.readEntry( "X-Trinity-BuiltIn" ) == "true" ) {
                 removeBuiltinIcon(cfg.readEntry( "Name" ));
@@ -914,7 +914,7 @@ bool KDIconView::deleteGlobalDesktopFiles()
             }
         }
 
-        KDesktopFile df(desktopPath + fItem->url().fileName());
+        TDEDesktopFile df(desktopPath + fItem->url().fileName());
         df.writeEntry("Hidden", true);
         df.sync();
 
@@ -947,7 +947,7 @@ void KDIconView::slotDelete()
 // Not to be confused with the global popup-menu, KRootWm, when doing RMB on the desktop
 void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items )
 {
-    if (!kapp->authorize("action/kdesktop_rmb")) return;
+    if (!tdeApp->authorize("action/kdesktop_rmb")) return;
     if (!m_dirLister) return;
     if ( _items.count() == 1 )
         m_popupURL = _items.getFirst()->url();
@@ -1062,7 +1062,7 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
 
     if ( !desktopFile.isEmpty() )
     {
-        KSimpleConfig cfg( desktopFile, true );
+        TDESimpleConfig cfg( desktopFile, true );
         cfg.setDesktopGroup();
         if (cfg.readBoolEntry("Hidden")) {
             return false;
@@ -1145,7 +1145,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
   if (m_nextItemPos.isNull() && !m_dotDirectory)  {
       // Not found, we'll need to save the new pos
       kdDebug(1214)<<"Neither a  drop position stored nor m_dotDirectory set"<<endl;
-      m_dotDirectory = new KSimpleConfig( dotDirectoryPath(), true );
+      m_dotDirectory = new TDESimpleConfig( dotDirectoryPath(), true );
       // recursion
       slotNewItems( entries );
       delete m_dotDirectory;
@@ -1406,7 +1406,7 @@ void KDIconView::refreshTrashIcon()
         KFileIVI * fileIVI = static_cast<KFileIVI *>(it);
         KFileItem* item = fileIVI->item();
         if ( isDesktopFile( item ) ) {
-            KSimpleConfig cfg( item->url().path(), true );
+            TDESimpleConfig cfg( item->url().path(), true );
             cfg.setDesktopGroup();
             if ( cfg.readEntry( "Type" ) == "Link" &&
                  cfg.readEntry( "URL" ) == "trash:/" ) {
@@ -1446,7 +1446,7 @@ void KDIconView::showFreeSpaceOverlay(KFileIVI* item)
            if (!m_paOutstandingFreeSpaceOverlaysTimer)
            {
               m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this);
-              connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFreeSpaceOverlayStart()));
+              connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFreeSpaceOverlayStart()));
            }
            m_paOutstandingFreeSpaceOverlaysTimer->start(20, true);
         }
@@ -1466,7 +1466,7 @@ void KDIconView::slotFreeSpaceOverlayStart()
 
        if (overlay)
        {
-          connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) );
+          connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) );
           overlay->start(); // Watch out, may emit finished() immediately!!
           return; // Let it run....
        }
@@ -1578,7 +1578,7 @@ void KDIconView::slotClipboardDataChanged()
 
 void KDIconView::renameDesktopFile(const TQString &path, const TQString &name)
 {
-    KDesktopFile cfg( path, false );
+    TDEDesktopFile cfg( path, false );
 
     // if we don't have the desktop entry group, then we assume that
     // it's not a config file (and we don't nuke it!)
@@ -1832,8 +1832,8 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 		}
 	}
 	if ( needRepaint ) {
-		viewport()->repaint( FALSE );
-		repaint( FALSE );
+		viewport()->repaint( false );
+		repaint( false );
 		saveIconPositions();
 	}
 
@@ -1905,7 +1905,7 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect &curre
 	if (area.isNull()) area = iconArea();
 
 	// If the proposed item rect is not contained by the desktop, by definition the item position is not free!
-	if (!area.contains(r, FALSE)) {
+	if (!area.contains(r, false)) {
 		return false;
 	}
 
@@ -1929,7 +1929,7 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect& rect,
 	if (area.isNull()) area = iconArea();
 
 	// If the proposed item rect is not contained by the desktop, by definition the item position is not free!
-	if (!area.contains(rect, FALSE)) {
+	if (!area.contains(rect, false)) {
 		return false;
 	}
 
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 61d35560a..7ef8d4889 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -33,7 +33,7 @@
 
 class KDirLister;
 class KonqSettings;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TDEAccel;
 class KShadowEngine;
 class KDesktopShadowSettings;
@@ -205,8 +205,8 @@ private:
     void refreshTrashIcon();
 
     static TQRect desktopRect();
-    static void saveIconPosition(KSimpleConfig *config, int x, int y);
-    static void readIconPosition(KSimpleConfig *config, int &x, int &y);
+    static void saveIconPosition(TDESimpleConfig *config, int x, int y);
+    static void readIconPosition(TDESimpleConfig *config, int &x, int &y);
 
     void showFreeSpaceOverlay(KFileIVI*  item);
 
@@ -243,7 +243,7 @@ private:
     TQStringList m_desktopDirs;
 
     /** The desktop's .directory, used for storing icon positions */
-    KSimpleConfig *m_dotDirectory;
+    TDESimpleConfig *m_dotDirectory;
 
     /** Position of last deleted icon - used when renaming a file */
     TQPoint m_lastDeletedIconPos;
diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp
index f3c6170e7..9e751d573 100644
--- a/kdesktop/krootwm.cpp
+++ b/kdesktop/krootwm.cpp
@@ -32,8 +32,8 @@
 #include <dirent.h>
 #include <errno.h>
 
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <tdepopupmenu.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
@@ -52,7 +52,7 @@
 #include <tdemessagebox.h>
 #include <kuser.h>
 #include <tqfile.h>
-#include <ntqthread.h>
+#include <tqthread.h>
 #include <tqeventloop.h>
 
 #include "krootwm.h"
@@ -72,7 +72,7 @@ KRootWm * KRootWm::s_rootWm = 0;
 
 extern TQCString kdesktop_name, kicker_name, twin_name;
 
-KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
+KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), startup(false)
 {
   s_rootWm = this;
   m_actionCollection = new TDEActionCollection(_desktop, this, "KRootWm::m_actionCollection");
@@ -86,16 +86,16 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   // Creates the new menu
   menuBar = 0; // no menubar yet
   menuNew = 0;
-  if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
+  if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
   {
      menuNew = new KNewMenu( m_actionCollection, "new_menu" );
-     connect(menuNew->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( slotFileNewAboutToShow() ) );
-     connect( menuNew, TQT_SIGNAL( activated() ),
-              m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) );
+     connect(menuNew->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( slotFileNewAboutToShow() ) );
+     connect( menuNew, TQ_SIGNAL( activated() ),
+              m_pDesktop->iconView(), TQ_SLOT( slotNewMenuActivated() ) );
   }
 
-  if (kapp->authorizeTDEAction("bookmarks"))
+  if (tdeApp->authorizeTDEAction("bookmarks"))
   {
      bookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
      // The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar.
@@ -114,8 +114,8 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   // so we create them here
   desktopMenu = new TQPopupMenu;
   windowListMenu = new KWindowListMenu;
-  connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotWindowListAboutToShow() ) );
+  connect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotWindowListAboutToShow() ) );
 
   // Create the actions
 #if 0
@@ -132,82 +132,82 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   }
 #endif
 
-  if (kapp->authorize("run_command"))
+  if (tdeApp->authorize("run_command"))
   {
-     new TDEAction(i18n("Run Command..."), "system-run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
-     new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
+     new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQ_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+     new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQ_SLOT( slotOpenTerminal() ),
 	m_actionCollection, "open_terminal" );
   }
 
   if (!TDEGlobal::config()->isImmutable())
   {
-     new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
+     new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQ_SLOT( slotConfigureDesktop() ),
                  m_actionCollection, "configdesktop" );
-     new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
+     new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQ_SLOT( slotToggleDesktopMenu() ),
                  m_actionCollection, "togglemenubar" );
   }
 
-  new TDEAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
+  new TDEAction(i18n("Unclutter Windows"), 0, this, TQ_SLOT( slotUnclutterWindows() ),
               m_actionCollection, "unclutter" );
-  new TDEAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
+  new TDEAction(i18n("Cascade Windows"), 0, this, TQ_SLOT( slotCascadeWindows() ),
               m_actionCollection, "cascade" );
 
   // arrange menu actions
-  if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
+  if (m_bDesktopEnabled && tdeApp->authorize("editable_desktop_icons"))
   {
-     new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
+     new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCS() ),
                  m_actionCollection, "sort_ncs");
-     new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
+     new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCI() ),
                  m_actionCollection, "sort_nci");
-     new TDEAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
+     new TDEAction(i18n("By Size"), 0, this, TQ_SLOT( slotArrangeBySize() ),
                  m_actionCollection, "sort_size");
-     new TDEAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
+     new TDEAction(i18n("By Type"), 0, this, TQ_SLOT( slotArrangeByType() ),
                  m_actionCollection, "sort_type");
-     new TDEAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
+     new TDEAction(i18n("By Date"), 0, this, TQ_SLOT( slotArrangeByDate() ),
                  m_actionCollection, "sort_date");
 
      TDEToggleAction *aSortDirsFirst = new TDEToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
-     connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ),
-              this, TQT_SLOT( slotToggleDirFirst( bool ) ) );
+     connect( aSortDirsFirst, TQ_SIGNAL( toggled( bool ) ),
+              this, TQ_SLOT( slotToggleDirFirst( bool ) ) );
      new TDEAction(i18n("Line Up Horizontally"), 0,
-                 this, TQT_SLOT( slotLineupIconsHoriz() ),
+                 this, TQ_SLOT( slotLineupIconsHoriz() ),
                  m_actionCollection, "lineupHoriz" );
      new TDEAction(i18n("Line Up Vertically"), 0,
-                 this, TQT_SLOT( slotLineupIconsVert() ),
+                 this, TQ_SLOT( slotLineupIconsVert() ),
                  m_actionCollection, "lineupVert" );
      TDEToggleAction *aAutoAlign = new TDEToggleAction(i18n("Align to Grid"), 0,
                  m_actionCollection, "realign" );
-     connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ),
-              this, TQT_SLOT( slotToggleAutoAlign( bool ) ) );
+     connect( aAutoAlign, TQ_SIGNAL( toggled( bool ) ),
+              this, TQ_SLOT( slotToggleAutoAlign( bool ) ) );
      TDEToggleAction *aLockIcons = new TDEToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
-     connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ),
-              this, TQT_SLOT( slotToggleLockIcons( bool ) ) );
+     connect( aLockIcons, TQ_SIGNAL( toggled( bool ) ),
+              this, TQ_SLOT( slotToggleLockIcons( bool ) ) );
   }
   if (m_bDesktopEnabled)
   {
-     new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
+     new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQ_SLOT( slotRefreshDesktop() ),
                  m_actionCollection, "refresh" );
   }
   // Icons in sync with kicker
-  if (kapp->authorize("lock_screen"))
+  if (tdeApp->authorize("lock_screen"))
   {
-      new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQT_SLOT( slotLock() ),
+      new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQ_SLOT( slotLock() ),
                   m_actionCollection, "lock" );
   }
-  if (kapp->authorize("logout"))
+  if (tdeApp->authorize("logout"))
   {
       new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
-                  this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
+                  this, TQ_SLOT( slotLogout() ), m_actionCollection, "logout" );
   }
 
-  if (kapp->authorize("start_new_session") && DM().isSwitchable())
+  if (tdeApp->authorize("start_new_session") && DM().isSwitchable())
   {
       new TDEAction(i18n("Start New Session"), "fork", 0, this,
-                  TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
-      if (kapp->authorize("lock_screen"))
+                  TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
+      if (tdeApp->authorize("lock_screen"))
       {
           new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
-                      TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
+                      TQ_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
       }
   }
 
@@ -249,7 +249,7 @@ void KRootWm::initConfig()
   // Read configuration for icons alignment
   if ( m_bDesktopEnabled ) {
     m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
-    if ( kapp->authorize( "editable_desktop_icons" ) ) {
+    if ( tdeApp->authorize( "editable_desktop_icons" ) ) {
         m_pDesktop->iconView()->setIconsLocked( KDesktopSettings::lockIcons() );
         TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
         if (aLockIcons)
@@ -314,8 +314,8 @@ void KRootWm::buildMenus()
     if (m_actionCollection->action("newsession"))
     {
         sessionsMenu = new TQPopupMenu;
-        connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) );
-        connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) );
+        connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) );
+        connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) );
     }
 
     if (menuBar) {
@@ -464,7 +464,7 @@ void KRootWm::buildMenus()
     }
     int lastSep = desktopMenu->insertSeparator();
 
-    if (sessionsMenu && kapp->authorize("switch_user"))
+    if (sessionsMenu && tdeApp->authorize("switch_user"))
     {
         desktopMenu->insertItem(SmallIconSet("switchuser" ), i18n("Switch User"), sessionsMenu);
         needSeparator = true;
@@ -489,7 +489,7 @@ void KRootWm::buildMenus()
         desktopMenu->removeItem(lastSep);
     }
 
-    connect( desktopMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotFileNewAboutToShow() ) );
+    connect( desktopMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotFileNewAboutToShow() ) );
 
     if (menuBar) {
         menuBar->insertItem(i18n("File"), file);
@@ -618,7 +618,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
         activateMenu( middleButtonChoice, _global );
         break;
     case TQt::RightButton:
-        if (!kapp->authorize("action/kdesktop_rmb")) return;
+        if (!tdeApp->authorize("action/kdesktop_rmb")) return;
         activateMenu( rightButtonChoice, _global );
         break;
     default:
@@ -637,13 +637,13 @@ void KRootWm::slotWindowList() {
   else
       r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
   windowListMenu->init();
-  disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
+  disconnect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
   // windowListMenu->rect() is not valid before showing, use sizeHint()
   windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center());
   windowListMenu->selectActiveWindow(); // make the popup more useful
-  connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotWindowListAboutToShow() ) );
+  connect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotWindowListAboutToShow() ) );
 }
 
 void KRootWm::slotSwitchUser() {
@@ -657,11 +657,11 @@ void KRootWm::slotSwitchUser() {
   else
       r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
   slotPopulateSessions();
-  disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
+  disconnect( sessionsMenu, TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
   sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
-  connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
-           TQT_SLOT( slotPopulateSessions() ) );
+  connect( sessionsMenu, TQ_SIGNAL( aboutToShow() ),
+           TQ_SLOT( slotPopulateSessions() ) );
 }
 
 void KRootWm::slotArrangeByNameCS()
@@ -786,12 +786,12 @@ void KRootWm::slotConfigureDesktop() {
   if (!m_configDialog)
   {
     m_configDialog = new KCMultiDialog( (TQWidget*)0, "configureDialog" );
-    connect(m_configDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigClosed()));
+    connect(m_configDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigClosed()));
 
     TQStringList modules = configModules();
     for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
     {
-      if (kapp->authorizeControlModule(*it))
+      if (tdeApp->authorizeControlModule(*it))
       {
           m_configDialog->addModule(*it);
       }
@@ -815,22 +815,22 @@ void KRootWm::slotToggleDesktopMenu()
     KDesktopSettings::writeConfig();
 
     TQByteArray data;
-    kapp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
+    tdeApp->dcopClient()->send( kdesktop_name, "KDesktopIface", "configure()", data);
     // for the standalone menubar setting
-    kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
-    kapp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
-    kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
+    tdeApp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
+    tdeApp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data );
+    tdeApp->dcopClient()->send( "twin*", "", "reconfigure()", data );
 }
 
 
 void KRootWm::slotUnclutterWindows()
 {
-    kapp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
+    tdeApp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
 }
 
 
 void KRootWm::slotCascadeWindows() {
-    kapp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
+    tdeApp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
 }
 
 
@@ -840,7 +840,7 @@ void KRootWm::slotLock() {
 
 
 void KRootWm::slotSave() {
-    kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
+    tdeApp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "save()", TQString(""));
 }
 
 
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 1e2499ea2..37358f758 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -52,10 +52,10 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url )
 {
     kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl;
     TDEIO::Job * job = TDEIO::get(m_url, false, false);
-    connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
-             this, TQT_SLOT( slotFinished(TDEIO::Job *)));
-    connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
-             this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
+    connect( job, TQ_SIGNAL( result( TDEIO::Job *)),
+             this, TQ_SLOT( slotFinished(TDEIO::Job *)));
+    connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+             this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
 }
 
 void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type )
@@ -79,7 +79,7 @@ void KWebDesktopRun::slotFinished( TDEIO::Job * job )
     if (job->error())
     {
         kdDebug() << job->errorString() << endl;
-        kapp->exit(1);
+        tdeApp->exit(1);
     }
 }
 
@@ -141,7 +141,7 @@ void KWebDesktop::slotCompleted()
     TQPixmap snapshot = TQPixmap::grabWidget( m_part->widget() );
     snapshot.save( m_imageFile, "PNG" );
     // And terminate the app.
-    kapp->quit();
+    tdeApp->quit();
 }
 
 KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
@@ -166,7 +166,7 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
         ((TQScrollView *)htmlPart->widget())->setHScrollBarMode( TQScrollView::AlwaysOff );
         ((TQScrollView *)htmlPart->widget())->setVScrollBarMode( TQScrollView::AlwaysOff );
 
-        connect( htmlPart, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
+        connect( htmlPart, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) );
         m_part = htmlPart;
     } else {
         // Try to find an appropriate viewer component
@@ -176,13 +176,13 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
             kdWarning() << "No handler found for " << mimeType << endl;
         else {
             kdDebug() << "Loaded " << m_part->className() << endl;
-            connect( m_part, TQT_SIGNAL( completed() ),
-                     this, TQT_SLOT( slotCompleted() ) );
+            connect( m_part, TQ_SIGNAL( completed() ),
+                     this, TQ_SLOT( slotCompleted() ) );
         }
     }
     if ( m_part ) {
-        connect( m_part, TQT_SIGNAL( canceled(const TQString &) ),
-                 this, TQT_SLOT( slotCompleted() ) );
+        connect( m_part, TQ_SIGNAL( canceled(const TQString &) ),
+                 this, TQ_SLOT( slotCompleted() ) );
     }
     return m_part;
 }
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 8f3e49e16..abeebb3d2 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -41,7 +41,7 @@ set( ${target}_SRCS
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK kdesktopsettings-static dmctl-static tdeio-shared Xext ${TDEHW_LIBRARIES}
-    pthread ${GL_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT} ${GL_LIBRARIES}
     "${LINKER_IMMEDIATE_BINDING_FLAGS}"
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdesktop/lock/autologout.cpp b/kdesktop/lock/autologout.cpp
index 1b63160f6..ee1d8e1db 100644
--- a/kdesktop/lock/autologout.cpp
+++ b/kdesktop/lock/autologout.cpp
@@ -83,7 +83,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
 	
 	mCountdownTimerId = startTimer(1000/25);
 	
-	connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
+	connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()));
 	
 	setFixedSize( sizeHint() );
 }
@@ -119,7 +119,7 @@ void AutoLogout::slotActivity()
 
 void AutoLogout::logout()
 {
-	TQT_TQOBJECT(this)->killTimers();
+	this->killTimers();
 	DCOPRef("ksmserver","ksmserver").send("logout", 0, 0, 0);
 }
 
diff --git a/kdesktop/lock/infodlg.cpp b/kdesktop/lock/infodlg.cpp
index 6fc604b43..a37c92b8e 100644
--- a/kdesktop/lock/infodlg.cpp
+++ b/kdesktop/lock/infodlg.cpp
@@ -14,7 +14,7 @@
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index 969dcb77a..c5d3d1aea 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -20,8 +20,8 @@
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -237,14 +237,14 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 	}
 	setTabOrder( mNewSessButton, mLayoutButton );
 
-	connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
+	connect(mLayoutButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(layoutClicked()));
 	if (show_cancel_button) {
-		connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+		connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 	}
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
-	connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
+	connect(mNewSessButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSwitchUser()));
 
-	if (!DM().isSwitchable() || !kapp->authorize("switch_user")) {
+	if (!DM().isSwitchable() || !tdeApp->authorize("switch_user")) {
 		mNewSessButton->hide();
 	}
 
@@ -253,7 +253,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 
 	mFailedTimerId = 0;
 	mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
-	connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+	connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
 
 	greet->setInfoMessageDisplay(showInfoMessages);
 	greet->start();
@@ -568,7 +568,7 @@ void PasswordDlg::handleVerify()
 						TQString autoPIN = cdevice->autoPIN();
 						if (autoPIN != TQString::null) {
 							greet->setPassword(autoPIN);
-							TQTimer::singleShot(0, this, SLOT(slotOK()));
+							TQTimer::singleShot(0, this, TQ_SLOT(slotOK()));
 						}
 					}
 					mCardLoginInProgress = false;
@@ -712,7 +712,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
 	button->setDefault( true );
 	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-	connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
+	connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( accept() ) );
 
 	TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
 	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
@@ -783,9 +783,9 @@ void PasswordDlg::slotStartNewSession()
 	TQLabel *label2 = new TQLabel( qt_text, winFrame );
 	KPushButton *okbutton = new KPushButton( KGuiItem(i18n("&Start New Session"), "fork"), winFrame );
 	okbutton->setDefault( true );
-	connect( okbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( accept() ) );
 	KPushButton *cbutton = new KPushButton( KStdGuiItem::cancel(), winFrame );
-	connect( cbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( reject() ) );
+	connect( cbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( reject() ) );
 
 	TQBoxLayout *mbox = new TQVBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() );
 
@@ -901,8 +901,8 @@ void PasswordDlg::slotSwitchUser()
 	SessList sess;
 	if (dm.localSessions( sess )) {
 		lv = new TQListView( winFrame );
-		connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(slotSessionActivated()) );
-		connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQT_SLOT(accept()) );
+		connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(slotSessionActivated()) );
+		connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQ_SLOT(accept()) );
 		lv->setAllColumnsShowFocus( true );
 		lv->addColumn( i18n("Session") );
 		lv->addColumn( i18n("Location") );
@@ -933,16 +933,16 @@ void PasswordDlg::slotSwitchUser()
 		vbox1->addWidget( lv );
 
 		btn = new KPushButton( KGuiItem(i18n("session", "&Activate"), "fork"), winFrame );
-		connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSessionActivated()) );
-		connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
+		connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSessionActivated()) );
+		connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
 		vbox2->addWidget( btn );
 		vbox2->addStretch( 2 );
 	}
 
-	if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
+	if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
 		btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
-		connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartNewSession()) );
-		connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
+		connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartNewSession()) );
+		connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
 		if (!p)
 		btn->setEnabled( false );
 		vbox2->addWidget( btn );
@@ -950,7 +950,7 @@ void PasswordDlg::slotSwitchUser()
 	}
 
 	btn = new KPushButton( KStdGuiItem::cancel(), winFrame );
-	connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
+	connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(reject()) );
 	vbox2->addWidget( btn );
 
 	dialog.setFixedSize( dialog.sizeHint() );
@@ -987,7 +987,7 @@ void PasswordDlg::attemptCardLogin() {
 #endif
 
 	// Make sure card logins are enabled before attempting one
-	KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	TDESimpleConfig *systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	systemconfig->setGroup(NULL);
 	bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
 	delete systemconfig;
@@ -1015,7 +1015,7 @@ void PasswordDlg::attemptCardLogin() {
 	// Bypass initial password prompt
 	greet->start();
 	greet->setPassword("");
-	TQTimer::singleShot(0, this, SLOT(slotOK()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotOK()));
 #endif
 }
 
diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp
index d9fae24f1..2ad89f5ab 100644
--- a/kdesktop/lock/lockprocess.cpp
+++ b/kdesktop/lock/lockprocess.cpp
@@ -38,7 +38,7 @@
 #include <dmctl.h>
 #include <dcopref.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
@@ -85,7 +85,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include <kcrash.h>
+#include <tdecrash.h>
 
 #include <pthread.h>
 
@@ -151,14 +151,6 @@ Atom kde_wm_system_modal_notification = 0;
 Atom kde_wm_transparent_to_desktop = 0;
 Atom kde_wm_transparent_to_black = 0;
 
-static void segv_handler(int)
-{
-	kdError(KDESKTOP_DEBUG_ID) << "A fatal exception was encountered."
-		<< " Trapping and ignoring it so as not to compromise desktop security..."
-		<< kdBacktrace() << endl;
-	sleep(1);
-}
-
 extern Atom tqt_wm_state;
 extern bool trinity_desktop_lock_use_system_modal_dialogs;
 extern bool trinity_desktop_lock_delay_screensaver_start;
@@ -166,24 +158,32 @@ extern bool trinity_desktop_lock_use_sak;
 extern bool trinity_desktop_lock_hide_active_windows;
 extern bool trinity_desktop_lock_hide_cancel_button;
 extern bool trinity_desktop_lock_forced;
-
-extern LockProcess* trinity_desktop_lock_process;
+extern bool trinity_desktop_lock_failed_grab;
 
 extern bool argb_visual;
 extern pid_t kdesktop_pid;
 
 extern TQXLibWindowList trinity_desktop_lock_hidden_window_list;
 
-bool trinity_desktop_lock_autohide_lockdlg = TRUE;
+bool trinity_desktop_lock_autohide_lockdlg = true;
+
+static void segv_handler(int)
+{
+	kdError(KDESKTOP_DEBUG_ID) << "A fatal exception was encountered."
+		<< " Trapping and ignoring it so as not to compromise desktop security..."
+		<< kdBacktrace() << endl;
+
+	sleep(1);
+}
 
 #define ENABLE_CONTINUOUS_LOCKDLG_DISPLAY \
-if (!mForceContinualLockDisplayTimer->isActive()) mForceContinualLockDisplayTimer->start(100, FALSE); \
-trinity_desktop_lock_autohide_lockdlg = FALSE; \
+if (!mForceContinualLockDisplayTimer->isActive()) mForceContinualLockDisplayTimer->start(100, false); \
+trinity_desktop_lock_autohide_lockdlg = false; \
 mHackDelayStartupTimer->stop();
 
 #define DISABLE_CONTINUOUS_LOCKDLG_DISPLAY \
 mForceContinualLockDisplayTimer->stop(); \
-trinity_desktop_lock_autohide_lockdlg = TRUE; \
+trinity_desktop_lock_autohide_lockdlg = true; \
 mHackDelayStartupTimer->stop();
 
 //===========================================================================
@@ -234,7 +234,9 @@ LockProcess::LockProcess()
 	m_notifyReadyRequested(false),
 	m_loginCardDevice(NULL),
 	m_maskWidget(NULL),
-	m_saverRootWindow(0)
+	m_saverRootWindow(0),
+	mControlPipeHandler(nullptr),
+	mControlPipeHandlerThread(nullptr)
 {
 #ifdef KEEP_MOUSE_UNGRABBED
 	setNFlags(WX11DisableMove|WX11DisableClose|WX11DisableShade|WX11DisableMinimize|WX11DisableMaximize);
@@ -247,7 +249,7 @@ LockProcess::LockProcess()
 	kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
 	kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_BLACK", False);
 
-	kapp->installX11EventFilter(this);
+	tdeApp->installX11EventFilter(this);
 
 	mForceContinualLockDisplayTimer = new TQTimer( this );
 	mHackDelayStartupTimer = new TQTimer( this );
@@ -256,7 +258,7 @@ LockProcess::LockProcess()
 	if (!argb_visual) {
 		// Try to get the root pixmap
 		if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
-		connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &)));
+		connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotPaintBackground(const TQPixmap &)));
 		m_rootPixmap->setCustomPainting(true);
 		m_rootPixmap->start();
 	}
@@ -305,9 +307,9 @@ LockProcess::LockProcess()
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		// connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		// connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 		// cdevice->enablePINEntryCallbacks(true);
 	}
@@ -331,8 +333,6 @@ LockProcess::~LockProcess()
 	mControlPipeHandler->terminateThread();
 	mControlPipeHandlerThread->wait();
 	delete mControlPipeHandler;
-// 	delete mControlPipeHandlerThread;
-
 	if (resizeTimer != NULL) {
 		resizeTimer->stop();
 		delete resizeTimer;
@@ -388,12 +388,12 @@ void LockProcess::init(bool child, bool useBlankOnly)
 	generateBackingImages();
 
 	// Connect all signals
-	connect( mForceContinualLockDisplayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(displayLockDialogIfNeeded()) );
-	connect( mHackDelayStartupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(closeDialogAndStartHack()) );
-	connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
-	connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
-	connect(&mHackProc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(hackExited(TDEProcess *)));
-	connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend()));
+	connect( mForceContinualLockDisplayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(displayLockDialogIfNeeded()) );
+	connect( mHackDelayStartupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(closeDialogAndStartHack()) );
+	connect( mEnsureVRootWindowSecurityTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repaintRootWindowIfNeeded()) );
+	connect(tqApp, TQ_SIGNAL(mouseInteraction(XEvent *)), TQ_SLOT(slotMouseActivity(XEvent *)));
+	connect(&mHackProc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(hackExited(TDEProcess *)));
+	connect(&mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(suspend()));
 
 #ifdef HAVE_DPMS
 	//if the user decided that the screensaver should run independent from
@@ -403,7 +403,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
 		CARD16 state;
 		if (DPMSInfo(tqt_xdisplay(), &state, &on)) {
 			if (on) {
-				connect(&mCheckDPMS, TQT_SIGNAL(timeout()), TQT_SLOT(checkDPMSActive()));
+				connect(&mCheckDPMS, TQ_SIGNAL(timeout()), TQ_SLOT(checkDPMSActive()));
 				// we can save CPU if we stop it as quickly as possible
 				// but we waste CPU if we check too often -> so take 10s
 				mCheckDPMS.start(10000);
@@ -412,9 +412,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
 	}
 #endif
 
-#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-	connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
-#endif
+	connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 
 	if (!trinity_desktop_lock_use_system_modal_dialogs) {
 		setWFlags((WFlags)WX11BypassWM);
@@ -435,21 +433,25 @@ void LockProcess::init(bool child, bool useBlankOnly)
 	mControlPipeHandler = new ControlPipeHandlerObject();
 	mControlPipeHandler->mParent = this;
 	mControlPipeHandler->moveToThread(mControlPipeHandlerThread);
-	TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString)));
-	TQTimer::singleShot(0, mControlPipeHandler, SLOT(run()));
+	TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString)));
+	TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run()));
 	mControlPipeHandlerThread->start();
+	// If the lock process terminates before 'mControlPipeHandler::run()' has been called, the
+	// 'mControlPipeHandlerThread' thread would not terminate and the lock process would have a
+	// dirty exit, potentially leaving 'kdesktop' in a dirty state that prevents the lock from
+	// working correctly till 'kdesktop' is killed and restarted. By forcing a call to 'processEvents()'
+	// we make sure to handle pending timer events and execute the required call
+	tdeApp->processEvents();
 }
 
 static int signal_pipe[2];
 
 static void sigterm_handler(int)
 {
-	if ((!trinity_desktop_lock_process) || (!trinity_desktop_lock_process->inSecureDialog())) {
-		// Exit uncleanly
-		char tmp = 'U';
-		if (::write( signal_pipe[1], &tmp, 1) == -1) {
-			// Error handler to shut up gcc warnings
-		}
+	// Exit uncleanly
+	char tmp = 'U';
+	if (::write( signal_pipe[1], &tmp, 1) == -1) {
+		// Error handler to shut up gcc warnings
 	}
 }
 
@@ -463,7 +465,7 @@ static void sighup_handler(int)
 
 bool LockProcess::closeCurrentWindow()
 {
-	mClosingWindows = TRUE;
+	mClosingWindows = true;
 	if (currentDialog != NULL) {
 		mForceReject = true;
 		if (dynamic_cast<SAKDlg*>(currentDialog)) {
@@ -478,12 +480,12 @@ bool LockProcess::closeCurrentWindow()
 	}
 
 	if( mDialogs.isEmpty() ) {
-		mClosingWindows = FALSE;
+		mClosingWindows = false;
 		mForceReject = false;
 		return false;
 	}
 	else {
-		mClosingWindows = TRUE;
+		mClosingWindows = true;
 		return true;
 	}
 }
@@ -533,8 +535,8 @@ void LockProcess::setupSignals()
 	if (pipe(signal_pipe) == -1) {
 		// Error handler to shut up gcc warnings
 	}
-	TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-	connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal()));
+	TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, this );
+	connect( notif, TQ_SIGNAL(activated(int)), TQ_SLOT(signalPipeSignal()));
 }
 
 
@@ -552,9 +554,11 @@ void LockProcess::signalPipeSignal()
 		startLock();
 	}
 	else if( tmp == 'U' ) {
-		// Exit uncleanly
-		quitSaver();
-		exit(1);
+		if (!inSecureDialog()) {
+			// Exit uncleanly
+			quitSaver();
+			exit(1);
+		}
 	}
 }
 
@@ -566,7 +570,7 @@ bool LockProcess::lock()
 	m_startupStatusDialog->setStatusMessage(i18n("Securing desktop session").append("..."));
 	m_startupStatusDialog->show();
 	m_startupStatusDialog->setActiveWindow();
-	tqApp->processEvents();
+	tdeApp->processEvents();
 #endif
 
 	if (startSaver(true)) {
@@ -577,7 +581,7 @@ bool LockProcess::lock()
 		// selecting "lock screen", that looks really untidy.
 		mBusy = true;
 		if (startLock()) {
-			TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+			TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
 			return true;
 		}
 		stopSaver();
@@ -598,7 +602,7 @@ bool LockProcess::defaultSave()
 	mOverrideHackStartupEnabled = true;
 	if (startSaver()) {
 		if (mLockGrace >= 0) {
-			TQTimer::singleShot(mLockGrace, this, TQT_SLOT(startLock()));
+			TQTimer::singleShot(mLockGrace, this, TQ_SLOT(startLock()));
 		}
 		return true;
 	}
@@ -618,18 +622,18 @@ void LockProcess::quitSaver()
 {
 	DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(quitSaver()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(quitSaver()) );
 		return;
 	}
 	stopSaver();
-	kapp->quit();
+	tdeApp->quit();
 }
 
 //---------------------------------------------------------------------------
 void LockProcess::startSecureDialog()
 {
 	if ((backingPixmap.isNull()) && (mBackingStartupDelayTimer < 100)) {
-		TQTimer::singleShot(10, this, TQT_SLOT(startSecureDialog()));
+		TQTimer::singleShot(10, this, TQ_SLOT(startSecureDialog()));
 		mBackingStartupDelayTimer++;
 		return;
 	}
@@ -650,7 +654,7 @@ void LockProcess::startSecureDialog()
 	mInSecureDialog = false;
 	if (ret == 0) {
 		mClosingWindows = 1;
-		kapp->quit();
+		tdeApp->quit();
 	}
 	if (ret == 1) {
 		// In case of a forced lock we don't react to events during
@@ -668,11 +672,11 @@ void LockProcess::startSecureDialog()
 				mBusy = false;
 			}
 			else {
-				TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+				TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
 			}
 			if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
 				ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 			}
 			else {
 				if (mHackStartupEnabled == true) {
@@ -681,7 +685,7 @@ void LockProcess::startSecureDialog()
 				else {
 					if (trinity_desktop_lock_use_system_modal_dialogs == true) {
 						ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-						if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+						if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 					}
 					else {
 						startHack();
@@ -699,18 +703,18 @@ void LockProcess::startSecureDialog()
 		if (system("ksysguard &") == -1) {
                     // Error handler to shut up gcc warnings
                 }
-		kapp->quit();
+		tdeApp->quit();
 	}
 	if (ret == 3) {
 		mClosingWindows = 1;
 		DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive);
-		kapp->quit();
+		tdeApp->quit();
 	}
 	// FIXME
 	// Handle remaining case (switch user)
 	if (forcecontdisp) {
 		ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-		if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+		if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 	}
 	stopSaver();
 }
@@ -722,13 +726,13 @@ bool LockProcess::runSecureDialog()
 	m_startupStatusDialog->setStatusMessage(i18n("Securing desktop session").append("..."));
 	m_startupStatusDialog->show();
 	m_startupStatusDialog->setActiveWindow();
-	tqApp->processEvents();
+	tdeApp->processEvents();
 #endif
 
 	mInSecureDialog = true;
 	if (startSaver()) {
 		mBackingStartupDelayTimer = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(startSecureDialog()));
+		TQTimer::singleShot(0, this, TQ_SLOT(startSecureDialog()));
 		return true;
 	}
 	else {
@@ -798,9 +802,9 @@ void LockProcess::readSaver()
 	if (!mSaver.isEmpty()) {
 		TQString file = locate("scrsav", mSaver);
 
-		bool opengl = kapp->authorize("opengl_screensavers");
-		bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers");
-		KDesktopFile config(file, true);
+		bool opengl = tdeApp->authorize("opengl_screensavers");
+		bool manipulatescreen = tdeApp->authorize("manipulatescreen_screensavers");
+		TDEDesktopFile config(file, true);
 		if (config.readEntry("X-TDE-Type").utf8() != 0) {
 			TQString saverType = config.readEntry("X-TDE-Type").utf8();
 			TQStringList saverTypes = TQStringList::split(";", saverType);
@@ -1040,7 +1044,7 @@ void LockProcess::desktopResized()
 		}
 		else {
 			mEnsureScreenHiddenTimer = new TQTimer( this );
-			connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
+			connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) );
 		}
 		mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true);
 	}
@@ -1063,9 +1067,9 @@ void LockProcess::desktopResized()
 	// being displayed, so we finish the hack restarting/display prettying operations in a separate timed slot
 	if (resizeTimer == NULL) {
 		resizeTimer = new TQTimer( this );
-		connect( resizeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doDesktopResizeFinish()) );
+		connect( resizeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doDesktopResizeFinish()) );
 	}
-	resizeTimer->start( 100, TRUE ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started
+	resizeTimer->start( 100, true ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started
 }
 
 void LockProcess::doDesktopResizeFinish()
@@ -1075,7 +1079,7 @@ void LockProcess::doDesktopResizeFinish()
 	}
 	mDialogControlLock = true;
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(doDesktopResizeFinish()) );
 		mDialogControlLock = false;
 		return;
 	}
@@ -1084,7 +1088,7 @@ void LockProcess::doDesktopResizeFinish()
 	// Restart the hack as the window size is now different
 	if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_use_system_modal_dialogs) {
 		ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-		if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+		if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 	}
 	else {
 		if (mHackStartupEnabled == true) {
@@ -1093,7 +1097,7 @@ void LockProcess::doDesktopResizeFinish()
 		else {
 			if (trinity_desktop_lock_use_system_modal_dialogs == true) {
 				ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 			}
 			else {
 				startHack();
@@ -1343,6 +1347,7 @@ bool LockProcess::startSaver(bool notify_ready)
 	if (!child_saver && !grabInput())
 	{
 		kdWarning(KDESKTOP_DEBUG_ID) << "LockProcess::startSaver() grabInput() failed!!!!" << endl;
+		trinity_desktop_lock_failed_grab = true;
 		return false;
 	}
 	mBusy = false;
@@ -1353,8 +1358,8 @@ bool LockProcess::startSaver(bool notify_ready)
 	saveVRoot();
 
 	if (mParent) {
-		TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, TQT_TQOBJECT(this), "notifier");
-		connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver()));
+		TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier");
+		connect(notifier, TQ_SIGNAL( activated (int)), TQ_SLOT( quitSaver()));
 	}
 	createSaverWindow();
 	move(0, 0);
@@ -1370,7 +1375,8 @@ bool LockProcess::startSaver(bool notify_ready)
 		slotPaintBackground(rootWinSnapShot);
 	}
 
-	if (((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!mInSecureDialog)) && (mHackStartupEnabled || mOverrideHackStartupEnabled)) {
+	if (!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) && !mInSecureDialog &&
+	        (mHackStartupEnabled || mOverrideHackStartupEnabled)) {
 		if (argb_visual) {
 			setTransparentBackgroundARGB();
 		}
@@ -1397,10 +1403,10 @@ bool LockProcess::startSaver(bool notify_ready)
 		}
 	}
 
-	if (mInSecureDialog == FALSE) {
+	if (!mInSecureDialog) {
 		if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
 			ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-			if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+			if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 		}
 		else {
 			if (mHackStartupEnabled || mOverrideHackStartupEnabled) {
@@ -1410,7 +1416,7 @@ bool LockProcess::startSaver(bool notify_ready)
 			else {
 				if (trinity_desktop_lock_use_system_modal_dialogs == true) {
 					ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-					if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+					if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 				}
 				else {
 					startHack();
@@ -1529,7 +1535,7 @@ void LockProcess::closeDialogAndStartHack()
 				// Make sure saver will attempt to start again after DPMS wakeup
 				// This is related to Bug 1475
 				ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 				// Should not start saver here, because the DPMS check method below would turn it right back off!
 				// This is related to Bug 1475
 				return;
@@ -1542,7 +1548,7 @@ void LockProcess::closeDialogAndStartHack()
 	DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
 	mSuspended = true;
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(closeDialogAndStartHack()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(closeDialogAndStartHack()) );
 	}
 	else {
 		resume(true);
@@ -1577,10 +1583,10 @@ void LockProcess::repaintRootWindowIfNeeded()
 
 bool LockProcess::startHack()
 {
-	mHackActive = TRUE;
+	mHackActive = true;
 
 	if ((mEnsureVRootWindowSecurityTimer) && (!mEnsureVRootWindowSecurityTimer->isActive())) {
-		mEnsureVRootWindowSecurityTimer->start(250, FALSE);
+		mEnsureVRootWindowSecurityTimer->start(250, false);
 	}
 
 	if (currentDialog || (!mDialogs.isEmpty())) {
@@ -1669,7 +1675,7 @@ bool LockProcess::startHack()
 				if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
 					// Close any active dialogs
 					if (closeCurrentWindow()) {
-						TQTimer::singleShot( 0, this, SLOT(closeCurrentWindow()) );
+						TQTimer::singleShot( 0, this, TQ_SLOT(closeCurrentWindow()) );
 					}
 				}
 				if (m_startupStatusDialog) { m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; }
@@ -1709,7 +1715,7 @@ bool LockProcess::startHack()
 			}
 			if (trinity_desktop_lock_use_system_modal_dialogs) {
 				ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 			}
 			saverReadyIfNeeded();
 		}
@@ -1735,7 +1741,7 @@ void LockProcess::stopHack()
 	}
 	setCursor( TQt::arrowCursor );
 
-	mHackActive = FALSE;
+	mHackActive = false;
 }
 
 //---------------------------------------------------------------------------
@@ -1744,7 +1750,7 @@ void LockProcess::hackExited(TDEProcess *)
 {
 	// Hack exited while we're supposed to be saving the screen.
 	// Make sure the saver window is black.
-	mHackActive = FALSE;
+	mHackActive = false;
 	usleep(100);
 	TQApplication::syncX();
 	if (!trinity_desktop_lock_use_system_modal_dialogs) {
@@ -1779,7 +1785,7 @@ void LockProcess::hackExited(TDEProcess *)
 	if (!mSuspended) {
 		if (trinity_desktop_lock_use_system_modal_dialogs) {
 			ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-			if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+			if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 		}
 	}
 	saverReadyIfNeeded();
@@ -1791,19 +1797,17 @@ void LockProcess::displayLockDialogIfNeeded()
 		m_startupStatusDialog->closeSMDialog();
 		m_startupStatusDialog = NULL;
 	}
-	if (!mInSecureDialog) {
-		if (trinity_desktop_lock_use_system_modal_dialogs) {
-			if (!mBusy) {
-				mBusy = true;
-				if (mLocked) {
-					if (checkPass()) {
-						mClosingWindows = true;
-						stopSaver();
-						kapp->quit();
-					}
+	if (!mInSecureDialog && trinity_desktop_lock_use_system_modal_dialogs) {
+		if (!mBusy) {
+			mBusy = true;
+			if (mLocked) {
+				if (checkPass()) {
+					mClosingWindows = true;
+					stopSaver();
+					tdeApp->quit();
 				}
-				mBusy = false;
 			}
+			mBusy = false;
 		}
 	}
 }
@@ -1816,7 +1820,7 @@ void LockProcess::suspend()
 			stopHack();
 			ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
 			if (mHackStartupEnabled) {
-				mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+				mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 			}
 		}
 		else {
@@ -1834,7 +1838,7 @@ void LockProcess::suspend()
 				}
 				hackstat[8191] = 0;
 				hackStatus = hackstat;
-				hackStatus = hackStatus.remove(TQRegExp("(*) ", TRUE, TRUE));
+				hackStatus = hackStatus.remove(TQRegExp("(*) ", true, true));
 				TQStringList hackStatusList = TQStringList::split(" ", hackStatus);
 				hackStatus = (*(hackStatusList.at(1)));
 			}
@@ -2026,10 +2030,10 @@ int LockProcess::execDialog( TQDialog *dlg )
 			// Slight delay before screensaver resume to allow the dialog window to fully disappear
 			if (hackResumeTimer == NULL) {
 				hackResumeTimer = new TQTimer( this );
-				connect( hackResumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resumeUnforced()) );
+				connect( hackResumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resumeUnforced()) );
 			}
 			if (mResizingDesktopLock == false) {
-				hackResumeTimer->start( 10, TRUE );
+				hackResumeTimer->start( 10, true );
 			}
 		}
 		else {
@@ -2065,7 +2069,7 @@ void LockProcess::slotPaintBackground(const TQPixmap &rpm)
 	}
 	else {
 		mEnsureScreenHiddenTimer = new TQTimer( this );
-		connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
+		connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) );
 	}
 
 	// Only remove the mask widget once the resize is 100% complete!
@@ -2127,7 +2131,7 @@ void LockProcess::doFunctionKeyBroadcast() {
 	// This does NOT work with the SAK or system modal dialogs!
 	if ((!trinity_desktop_lock_use_system_modal_dialogs) && (!trinity_desktop_lock_use_sak)) {
 		mBusy=true;
-		TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+		TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
 		if (mkeyCode == XKeysymToKeycode(tqt_xdisplay(), XF86XK_Display)) {
 			while (mDialogControlLock == true) {
 				usleep(100000);
@@ -2167,7 +2171,7 @@ bool LockProcess::x11Event(XEvent *event)
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioRaiseVolume)) || \
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioLowerVolume))) {
 			mkeyCode = event->xkey.keycode;
-			TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) );
+			TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) );
 			return true;
 		}
 		// ACPI power keys
@@ -2176,7 +2180,7 @@ bool LockProcess::x11Event(XEvent *event)
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Suspend)) || \
 			(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Hibernate))) {
 			mkeyCode = event->xkey.keycode;
-			TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) );
+			TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) );
 			return true;
 		}
 	}
@@ -2192,7 +2196,7 @@ bool LockProcess::x11Event(XEvent *event)
 			// fall through
 		case KeyPress:
 			if ((mHackDelayStartupTimer) && (mHackDelayStartupTimer->isActive())) {
-				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+				if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 			}
 			if (mBusy || !mDialogs.isEmpty()) {
 				break;
@@ -2202,12 +2206,12 @@ bool LockProcess::x11Event(XEvent *event)
 				if (mLocked) {
 					ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
 					if (mHackStartupEnabled) {
-						mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+						mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 					}
 				}
-				if ((!mLocked) && (!mInSecureDialog)) {
+				if (!mLocked && !mInSecureDialog) {
 					stopSaver();
-					kapp->quit();
+					tdeApp->quit();
 				}
 				if (mAutoLogout) {
 					// we need to restart the auto logout countdown
@@ -2219,7 +2223,7 @@ bool LockProcess::x11Event(XEvent *event)
 				if (!mLocked || checkPass()) {
 					mClosingWindows = true;
 					stopSaver();
-					kapp->quit();
+					tdeApp->quit();
 				}
 				else if (mAutoLogout) {
 					// we need to restart the auto logout countdown
@@ -2251,7 +2255,7 @@ bool LockProcess::x11Event(XEvent *event)
 							else {
 								if (trinity_desktop_lock_use_system_modal_dialogs == true) {
 									ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
-									if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
+									if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, true);
 								}
 								else {
 									resume( false );
@@ -2308,7 +2312,7 @@ bool LockProcess::x11Event(XEvent *event)
 		&& event->xkey.window != mDialogs.first()->winId()) {
 		XEvent ev2 = *event;
 		ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId();
-		tqApp->x11ProcessEvent( &ev2 );
+		tdeApp->x11ProcessEvent( &ev2 );
 		return true;
 	}
 
@@ -2442,7 +2446,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
 	button->setDefault( true );
 	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-	connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
+	connect( button, TQ_SIGNAL( clicked() ), &box, TQ_SLOT( accept() ) );
 
 	TQVBoxLayout *vbox = new TQVBoxLayout( &box );
 	vbox->addWidget( winFrame );
@@ -2464,7 +2468,7 @@ void LockProcess::showVkbd()
 		mVkbdWindows.clear();
 		mVkbdLastEventWindow = None;
 		mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS );
-		connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
+		connect( mKWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId )));
 		mVkbdProcess = new TDEProcess;
 		*mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm";
 		mVkbdProcess->start();
@@ -2678,7 +2682,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
 		}
 
 		// Clicked inside dialog; set focus
-		if (inFrame == TRUE) {
+		if (inFrame) {
 			WId window = mDialogs.first()->winId();
 			XSetInputFocus(tqt_xdisplay(), window, RevertToParent, CurrentTime);
 			fakeFocusIn(window);
@@ -2688,7 +2692,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
 		}
 
 		// Clicked inside window handle (or border); drag window
-		if ((inFrame == TRUE) && (inDialog == FALSE)) {
+		if (inFrame && !inDialog) {
 			TQPoint oldPoint = mDialogs.first()->pos();
 			m_mouseDown = 1;
 			m_dialogPrevX = oldPoint.x();
@@ -2701,7 +2705,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
 
 	// Drag the window...
 	if (event->type == MotionNotify) {
-		if (m_mouseDown == TRUE) {
+		if (m_mouseDown) {
 			int deltaX = me->x_root - m_mousePrevX;
 			int deltaY = me->y_root - m_mousePrevY;
 			m_dialogPrevX = m_dialogPrevX + deltaX;
@@ -2849,11 +2853,11 @@ void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
 			m_loginCardDevice = cdevice;
 			if (dynamic_cast<SAKDlg*>(currentDialog)) {
 				dynamic_cast<SAKDlg*>(currentDialog)->closeDialogForced();
-				TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+				TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
 			}
 			else if (dynamic_cast<SecureDlg*>(currentDialog)) {
 				dynamic_cast<SecureDlg*>(currentDialog)->closeDialogForced();
-				TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+				TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
 			}
 			else if (dynamic_cast<PasswordDlg*>(currentDialog)) {
 				signalPassDlgToAttemptCardLogin();
@@ -2871,7 +2875,7 @@ void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice)
 	}
 	else {
 		m_loginCardDevice = NULL;
-		TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+		TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
 	}
 #endif
 }
@@ -2886,7 +2890,7 @@ void LockProcess::signalPassDlgToAttemptCardLogin()
 	else {
 		if (currentDialog && m_loginCardDevice) {
 			// Try again later
-			TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+			TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
 		}
 	}
 #endif
@@ -2902,7 +2906,7 @@ void LockProcess::signalPassDlgToAttemptCardAbort()
 	else {
 		if (currentDialog) {
 			// Try again later
-			TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+			TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
 		}
 	}
 #endif
@@ -2963,7 +2967,7 @@ void LockProcess::saverReady() {
 // Control pipe handler
 //
 ControlPipeHandlerObject::ControlPipeHandlerObject() : TQObject() {
-	mParent = NULL;
+	mParent = nullptr;
 	mRunning = false;
 	mTerminate = false;
 	mThreadID = 0L;
@@ -2987,7 +2991,7 @@ void ControlPipeHandlerObject::run(void) {
 	int display_number = atoi(TQString(XDisplayString(tqt_xdisplay())).replace(":","").ascii());
 
 	if (display_number < 0) {
-		printf("[kdesktop_lock] Warning: unable to create control socket.  Interactive logon modules may not function properly.\n");
+		printf("[kdesktop_lock] Warning: unable to create control socket. Interactive logon modules may not function properly.\n");
 		mRunning = false;
 		TQApplication::eventLoop()->exit(-1);
 		return;
@@ -3018,7 +3022,7 @@ void ControlPipeHandlerObject::run(void) {
 	}
 
 	if (!mParent->mPipeOpen) {
-		printf("[kdesktop_lock] Warning: unable to create control socket '%s'.  Interactive logon modules may not function properly.\n", fifo_file);
+		printf("[kdesktop_lock] Warning: unable to create control socket '%s'. Interactive logon modules may not function properly.\n", fifo_file);
 		mRunning = false;
 		TQApplication::eventLoop()->exit(-1);
 		return;
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index bfe1fe420..1afc9bb46 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -11,7 +11,7 @@
 #define __LOCKENG_H__
 
 #include <kgreeterplugin.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kpixmap.h>
 #include <krootpixmap.h>
 
@@ -106,9 +106,6 @@ class LockProcess : public TQWidget
 
 		TDECryptographicCardDevice* cryptographicCardDevice();
 
-	signals:
-		void terminateHelperThread();
-
 	public slots:
 		void quitSaver();
 		void preparePopup();
diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp
index f1407070c..9f707c35d 100644
--- a/kdesktop/lock/main.cpp
+++ b/kdesktop/lock/main.cpp
@@ -33,14 +33,14 @@
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 #include <dcopref.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include <tdmtsak.h>
 
 #include <stdlib.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
@@ -58,49 +58,49 @@
 TQXLibWindowList trinity_desktop_lock_hidden_window_list;
 
 // [FIXME] Add GUI configuration checkboxes for these three settings (see kdesktoprc [ScreenSaver] UseUnmanagedLockWindows, DelaySaverStart, and UseTDESAK)
-bool trinity_desktop_lock_use_system_modal_dialogs = FALSE;
-bool trinity_desktop_lock_delay_screensaver_start = FALSE;
-bool trinity_desktop_lock_use_sak = FALSE;
-bool trinity_desktop_lock_hide_active_windows = FALSE;
-bool trinity_desktop_lock_hide_cancel_button = FALSE;
-bool trinity_desktop_lock_forced = FALSE;
-
-LockProcess* trinity_desktop_lock_process = NULL;
+bool trinity_desktop_lock_use_system_modal_dialogs = false;
+bool trinity_desktop_lock_delay_screensaver_start = false;
+bool trinity_desktop_lock_use_sak = false;
+bool trinity_desktop_lock_hide_active_windows = false;
+bool trinity_desktop_lock_hide_cancel_button = false;
+bool trinity_desktop_lock_forced = false;
+// This is a temporary variable used till a fix for the grab issue is prepared
+bool trinity_desktop_lock_failed_grab = false;
 
 bool signalled_forcelock;
 bool signalled_dontlock;
 bool signalled_securedialog;
 bool signalled_blank;
 bool signalled_run;
-bool in_internal_mode = FALSE;
+bool in_internal_mode = false;
 
-bool argb_visual = FALSE;
+bool argb_visual = false;
 pid_t kdesktop_pid = -1;
-bool trinity_desktop_lock_settings_initialized = FALSE;
+bool trinity_desktop_lock_settings_initialized = false;
 
 static void sigusr1_handler(int)
 {
-	signalled_forcelock = TRUE;
+	signalled_forcelock = true;
 }
 
 static void sigusr2_handler(int)
 {
-	signalled_dontlock = TRUE;
+	signalled_dontlock = true;
 }
 
-static void sigusr3_handler(int)
+static void sigwinch_handler(int)
 {
-	signalled_securedialog = TRUE;
+	signalled_securedialog = true;
 }
 
-static void sigusr4_handler(int)
+static void sigttin_handler(int)
 {
-	signalled_blank = TRUE;
+	signalled_blank = true;
 }
 
-static void sigusr5_handler(int)
+static void sigttou_handler(int)
 {
-	signalled_run = TRUE;
+	signalled_run = true;
 }
 
 static int trapXErrors(Display *, XErrorEvent *)
@@ -236,9 +236,9 @@ int main( int argc, char **argv )
 
 	XSetErrorHandler(trapXErrors);
 
-	MyApp* app = NULL;
+	MyApp *app = nullptr;
 
-	while (1 == 1) {
+	while (true) {
 		sigset_t new_mask;
 		sigset_t orig_mask;
 
@@ -246,11 +246,11 @@ int main( int argc, char **argv )
 		sigfillset(&new_mask);
 		sigprocmask(SIG_BLOCK, &new_mask, NULL);
 
-		signalled_forcelock = FALSE;
-		signalled_dontlock = FALSE;
-		signalled_securedialog = FALSE;
-		signalled_blank = FALSE;
-		signalled_run = FALSE;
+		signalled_forcelock = false;
+		signalled_dontlock = false;
+		signalled_securedialog = false;
+		signalled_blank = false;
+		signalled_run = false;
 
 		int kdesktop_screen_number = 0;
 		int starting_screen = 0;
@@ -261,7 +261,7 @@ int main( int argc, char **argv )
 
 		if (TDEGlobalSettings::isMultiHead()) {
 			Display *dpy = XOpenDisplay(NULL);
-			if (! dpy) {
+			if (!dpy) {
 				fprintf(stderr,
 					"%s: FATAL ERROR: couldn't open display '%s'\n",
 					argv[0], XDisplayName(NULL));
@@ -303,14 +303,11 @@ int main( int argc, char **argv )
 					}
 				}
 
-				env.sprintf("DISPLAY=%s.%d", display_name.data(),
-					kdesktop_screen_number);
+				env.sprintf("DISPLAY=%s.%d", display_name.data(), kdesktop_screen_number);
 				kdDebug() << "env " << env << endl;
 
 				if (putenv(strdup(env.data()))) {
-					fprintf(stderr,
-						"%s: WARNING: unable to set DISPLAY environment variable\n",
-						argv[0]);
+					fprintf(stderr, "%s: WARNING: unable to set DISPLAY environment variable\n", argv[0]);
 					perror("putenv()");
 				}
 			}
@@ -374,17 +371,17 @@ int main( int argc, char **argv )
 		TDEGlobal::locale()->insertCatalogue("libdmctl");
 
 		struct stat st;
-		KSimpleConfig* tdmconfig;
+		TDESimpleConfig* tdmconfig;
 		if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {
-			tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+			tdmconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
 		}
 		else {
-			tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+			tdmconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
 		}
 		tdmconfig->setGroup("X-:*-Greeter");
 
 		// Create new LockProcess, which also spawns threads inheriting the blocked signal mask
-		trinity_desktop_lock_process = new LockProcess;
+		LockProcess lock_process;
 
 		// Unblock reception of all signals in this thread
 		sigprocmask(SIG_UNBLOCK, &new_mask, NULL);
@@ -396,7 +393,7 @@ int main( int argc, char **argv )
 			kdesktop_pid = atoi(args->getOption( "internal" ));
 			struct sigaction act;
 
-			in_internal_mode = TRUE;
+			in_internal_mode = true;
 
 			// handle SIGUSR1
 			act.sa_handler= sigusr1_handler;
@@ -410,20 +407,20 @@ int main( int argc, char **argv )
 			sigaddset(&(act.sa_mask), SIGUSR2);
 			act.sa_flags = 0;
 			sigaction(SIGUSR2, &act, 0L);
-			// handle SIGWINCH (an ersatz SIGUSR3)
-			act.sa_handler= sigusr3_handler;
+			// handle SIGWINCH (as custom user signal rather than its inherent meaning)
+			act.sa_handler= sigwinch_handler;
 			sigemptyset(&(act.sa_mask));
 			sigaddset(&(act.sa_mask), SIGWINCH);
 			act.sa_flags = 0;
 			sigaction(SIGWINCH, &act, 0L);
-			// handle SIGTTIN (an ersatz SIGUSR4)
-			act.sa_handler= sigusr4_handler;
+			// handle SIGTTIN (as custom user signal rather than its inherent meaning)
+			act.sa_handler= sigttin_handler;
 			sigemptyset(&(act.sa_mask));
 			sigaddset(&(act.sa_mask), SIGTTIN);
 			act.sa_flags = 0;
 			sigaction(SIGTTIN, &act, 0L);
-			// handle SIGTTOU (an ersatz SIGUSR5)
-			act.sa_handler= sigusr5_handler;
+			// handle SIGTTOU (as custom user signal rather than its inherent meaning)
+			act.sa_handler= sigttou_handler;
 			sigemptyset(&(act.sa_mask));
 			sigaddset(&(act.sa_mask), SIGTTOU);
 			act.sa_flags = 0;
@@ -437,7 +434,7 @@ int main( int argc, char **argv )
 			sigaddset(&new_mask,SIGTTIN);
 			sigaddset(&new_mask,SIGTTOU);
 
-			while (signalled_run == FALSE) {
+			while (!signalled_run) {
 				// let kdesktop know the saver process is ready
 				if (kill(kdesktop_pid, SIGTTIN) < 0) {
 					// The controlling kdesktop process probably died.  Commit suicide...
@@ -454,7 +451,7 @@ int main( int argc, char **argv )
 
 				// wait for SIGUSR1, SIGUSR2, SIGWINCH, SIGTTIN, or SIGTTOU
 				sigprocmask(SIG_BLOCK, &new_mask, &orig_mask);
-				if (signalled_run != TRUE) {
+				if (!signalled_run) {
 					sigsuspend(&orig_mask);
 				}
 				sigprocmask(SIG_UNBLOCK, &new_mask, NULL);
@@ -494,42 +491,54 @@ int main( int argc, char **argv )
 
 		delete tdmconfig;
 
-		if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)) {
-			trinity_desktop_lock_forced = TRUE;
+		if (args->isSet( "forcelock" ) || signalled_forcelock) {
+			trinity_desktop_lock_forced = true;
 		}
 
-		trinity_desktop_lock_process->init(child, (args->isSet( "blank" ) || (signalled_blank == TRUE)));
+		lock_process.init(child, (args->isSet( "blank" ) || signalled_blank));
 		if (!child) {
-			trinity_desktop_lock_process->setChildren(child_sockets);
+			lock_process.setChildren(child_sockets);
 		}
 		else {
-			trinity_desktop_lock_process->setParent(parent_connection);
+			lock_process.setParent(parent_connection);
 		}
 
+		trinity_desktop_lock_failed_grab = false;
 		bool rt;
-		if( (((!child) && (args->isSet( "forcelock" ))) || (signalled_forcelock == TRUE))) {
-			rt = trinity_desktop_lock_process->lock();
+		if( (!child && args->isSet( "forcelock" )) || signalled_forcelock) {
+			rt = lock_process.lock();
 		}
-		else if( child || (args->isSet( "dontlock" ) || (signalled_dontlock == TRUE))) {
-			rt = trinity_desktop_lock_process->dontLock();
+		else if( child || (args->isSet( "dontlock" ) || signalled_dontlock)) {
+			rt = lock_process.dontLock();
 		}
-		else if( child || (args->isSet( "securedialog" ) || (signalled_securedialog == TRUE))) {
+		else if( child || (args->isSet( "securedialog" ) || signalled_securedialog)) {
 			int retcode = tde_sak_verify_calling_process();
 			if (retcode == 0) {
-				rt = trinity_desktop_lock_process->runSecureDialog();
+				rt = lock_process.runSecureDialog();
 			}
 			else {
 				return 1;
 			}
 		}
 		else {
-			rt = trinity_desktop_lock_process->defaultSave();
+			rt = lock_process.defaultSave();
 		}
+
+		// Make sure to handle all pending responses from the X server.
+		// If we don't do this, in case of failed activation of the saver/lock screen,
+		// we will end up in a dirty state and the screen lock will no longer hide the windows
+		// on the screen due to 'm_rootPixmap' failing to load the background image.
+		// This is caused by a 'XConvertSelection' request in 'TDESharedPixmap::loadFromShared'
+		// not being handled and causing the corresponding property to become unusuable in X for
+		// subsequent lock requests.
+		XSync(tqt_xdisplay(), False);
+		app->processEvents();
+
 		if (!rt) {
-			return 0;
+			return (trinity_desktop_lock_failed_grab ? 0 : 12);
 		}
 
-		if (in_internal_mode == FALSE) {
+		if (!in_internal_mode) {
 			trinity_desktop_lock_hidden_window_list.clear();
 			int ret = app->exec();
 			restore_hidden_override_redirect_windows();
@@ -548,9 +557,6 @@ int main( int argc, char **argv )
 				return 12;
 			}
 
-			delete trinity_desktop_lock_process;
-			trinity_desktop_lock_process = NULL;
-
 			// FIXME
 			// We should not have to return (restart) at all,
 			// but it seems that some X11 connections are left active,
diff --git a/kdesktop/lock/querydlg.cpp b/kdesktop/lock/querydlg.cpp
index 9d594ecba..5b1fea0f3 100644
--- a/kdesktop/lock/querydlg.cpp
+++ b/kdesktop/lock/querydlg.cpp
@@ -14,7 +14,7 @@
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -117,7 +117,7 @@ QueryDlg::QueryDlg(LockProcess *parent)
 	frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
 	frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
 
-	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
+	connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
 
 	installEventFilter(this);
 	setFixedSize( sizeHint() );
diff --git a/kdesktop/lock/sakdlg.cpp b/kdesktop/lock/sakdlg.cpp
index 274826e69..5b23a9c5a 100644
--- a/kdesktop/lock/sakdlg.cpp
+++ b/kdesktop/lock/sakdlg.cpp
@@ -14,7 +14,7 @@
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -108,7 +108,7 @@ SAKDlg::SAKDlg(LockProcess *parent)
 
 	mSAKProcess = new TDEProcess;
 	*mSAKProcess << "tdmtsak";
-	connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+	connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
 	mSAKProcess->start();
 }
 
diff --git a/kdesktop/lock/securedlg.cpp b/kdesktop/lock/securedlg.cpp
index fca79a707..ba2b08af0 100644
--- a/kdesktop/lock/securedlg.cpp
+++ b/kdesktop/lock/securedlg.cpp
@@ -14,7 +14,7 @@
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -137,11 +137,11 @@ SecureDlg::SecureDlg(LockProcess *parent)
 	frameLayout->addMultiCellWidget( sep, 2, 2, 0, 1 );
 	frameLayout->addMultiCellLayout( layPBGrid, 3, 3, 0, 1, AlignLeft | AlignVCenter);
 
-	connect(mCancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnCancel()));
-	connect(mLockButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnLock()));
-	connect(mTaskButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnTask()));
-	connect(mShutdownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnShutdown()));
-	connect(mSwitchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnSwitchUser()));
+	connect(mCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnCancel()));
+	connect(mLockButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnLock()));
+	connect(mTaskButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnTask()));
+	connect(mShutdownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnShutdown()));
+	connect(mSwitchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnSwitchUser()));
 
 	TQSize dlgSz = sizeHint();
 	int btnSize = dlgSz.width();
diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp
index 5e32fd0f6..fc3c9db6e 100644
--- a/kdesktop/lockeng.cpp
+++ b/kdesktop/lockeng.cpp
@@ -6,7 +6,6 @@
 // Copyright (c) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
 //
 
-
 #include <config.h>
 
 #include <stdlib.h>
@@ -20,10 +19,10 @@
 #include <tdecryptographiccarddevice.h>
 #endif
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <kservicegroup.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tqfile.h>
@@ -45,52 +44,49 @@
 #include "lockeng.moc"
 #include "kdesktopsettings.h"
 
-#define SYSTEMD_LOGIN1_SERVICE		"org.freedesktop.login1"
-#define SYSTEMD_LOGIN1_PATH		"/org/freedesktop/login1"
-#define SYSTEMD_LOGIN1_MANAGER_IFACE	"org.freedesktop.login1.Manager"
-#define SYSTEMD_LOGIN1_SESSION_IFACE	"org.freedesktop.login1.Session"
-#define SYSTEMD_LOGIN1_SEAT_IFACE	"org.freedesktop.login1.Seat"
+#include "xautolock_c.h"
+
+#define SYSTEMD_LOGIN1_SERVICE       "org.freedesktop.login1"
+#define SYSTEMD_LOGIN1_MANAGER_IFACE "org.freedesktop.login1.Manager"
+#define SYSTEMD_LOGIN1_SESSION_IFACE "org.freedesktop.login1.Session"
+#define SYSTEMD_LOGIN1_SEAT_IFACE    "org.freedesktop.login1.Seat"
+#define SYSTEMD_LOGIN1_PATH          "/org/freedesktop/login1"
 
 #define DBUS_CONN_NAME			"kdesktop_lock"
 
-#include "xautolock_c.h"
 extern xautolock_corner_t xautolock_corners[ 4 ];
+bool trinity_lockeng_sak_available = true;
 
-bool trinity_lockeng_sak_available = TRUE;
+SaverEngineEventHandler *gbl_saverEngineEventHandler = nullptr;
 
-SaverEngine* m_masterSaverEngine = NULL;
 static void sigusr1_handler(int)
 {
-	if (m_masterSaverEngine) {
-		m_masterSaverEngine->m_threadHelperObject->slotLockProcessWaiting();
+	if (gbl_saverEngineEventHandler)
+	{
+		gbl_saverEngineEventHandler->lockCompleted();
 	}
 }
+
 static void sigusr2_handler(int)
 {
-	if (m_masterSaverEngine) {
-		m_masterSaverEngine->m_threadHelperObject->slotLockProcessFullyActivated();
+	if (gbl_saverEngineEventHandler)
+	{
+		gbl_saverEngineEventHandler->lockFullyActivated();
 	}
 }
+
 static void sigttin_handler(int)
 {
-	if (m_masterSaverEngine) {
-		m_masterSaverEngine->slotLockProcessReady();
+	if (gbl_saverEngineEventHandler)
+	{
+		gbl_saverEngineEventHandler->lockReady();
 	}
 }
 
-//===========================================================================
-//
-// Screen saver engine. Doesn't handle the actual screensaver window,
-// starting screensaver hacks, or password entry. That's done by
-// a newly started process.
-//
 SaverEngine::SaverEngine()
-	: TQWidget(),
+	: TQObject(),
 	  KScreensaverIface(),
 	  mBlankOnly(false),
-	  mSAKProcess(NULL),
-	  mTerminationRequested(false),
-	  mSaverProcessReady(false),
 	  mNewVTAfterLockEngage(false),
 	  mValidCryptoCardInserted(false),
 	  mSwitchVTAfterLockEngage(-1),
@@ -99,7 +95,6 @@ SaverEngine::SaverEngine()
 	  systemdSession(0)
 {
 	// handle SIGUSR1
-	m_masterSaverEngine = this;
 	mSignalAction.sa_handler= sigusr1_handler;
 	sigemptyset(&(mSignalAction.sa_mask));
 	sigaddset(&(mSignalAction.sa_mask), SIGUSR1);
@@ -107,15 +102,13 @@ SaverEngine::SaverEngine()
 	sigaction(SIGUSR1, &mSignalAction, 0L);
 
 	// handle SIGUSR2
-	m_masterSaverEngine = this;
 	mSignalAction.sa_handler= sigusr2_handler;
 	sigemptyset(&(mSignalAction.sa_mask));
 	sigaddset(&(mSignalAction.sa_mask), SIGUSR2);
 	mSignalAction.sa_flags = 0;
 	sigaction(SIGUSR2, &mSignalAction, 0L);
 
-	// handle SIGTTIN
-	m_masterSaverEngine = this;
+	// handle SIGTTIN (as custom user signal rather than its inherent meaning)
 	mSignalAction.sa_handler= sigttin_handler;
 	sigemptyset(&(mSignalAction.sa_mask));
 	sigaddset(&(mSignalAction.sa_mask), SIGTTIN);
@@ -123,92 +116,52 @@ SaverEngine::SaverEngine()
 	sigaction(SIGTTIN, &mSignalAction, 0L);
 
 	// Save X screensaver parameters
-	XGetScreenSaver(tqt_xdisplay(), &mXTimeout, &mXInterval,
-					&mXBlanking, &mXExposures);
-
-	mState = Waiting;
-	mXAutoLock = 0;
+	XGetScreenSaver(tqt_xdisplay(), &mXTimeout, &mXInterval, &mXBlanking, &mXExposures);
+
+	// Create event handler thread, event loop and object
+	m_eventHandlerThread = new TQEventLoopThread;
+	m_eventHandlerThread->start();
+	m_saverEngineEventHandler = new SaverEngineEventHandler(this);
+	gbl_saverEngineEventHandler = m_saverEngineEventHandler;
+	m_saverEngineEventHandler->moveToThread(m_eventHandlerThread);
+	connect(this, TQ_SIGNAL(terminateEventHandlerThread()), m_saverEngineEventHandler, TQ_SLOT(terminateThread()));
+	connect(this, TQ_SIGNAL(lockScreenSignal(bool)), m_saverEngineEventHandler, TQ_SLOT(lockScreen(bool)));
+	connect(this, TQ_SIGNAL(activateSaverOrLockSignal(LockType)),
+	        m_saverEngineEventHandler, TQ_SLOT(activateSaverOrLock(LockType)));
+
+	mXAutoLock = nullptr;
 	mEnabled = false;
 
-	m_helperThread = new TQEventLoopThread;
-	m_helperThread->start();
-	m_threadHelperObject = new SaverEngineThreadHelperObject;
-	m_threadHelperObject->moveToThread(m_helperThread);
-	connect(this, TQT_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQT_SLOT(terminateThread()));
-	connect(m_threadHelperObject, TQT_SIGNAL(lockProcessWaiting()), this, TQT_SLOT(lockProcessWaiting()));
-	connect(m_threadHelperObject, TQT_SIGNAL(lockProcessFullyActivated()), this, TQT_SLOT(lockProcessFullyActivated()));
-
-	connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
-						TQT_SLOT(lockProcessExited()));
-
 	configure();
 
-	// Create SAK process only if SAK is enabled
-	KSimpleConfig *config;
-  struct stat st;
-  if (stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st) == 0) {
-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
-  }
-  else {
-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
-  }
-	config->setGroup("X-:*-Greeter");
-	bool useSAKProcess = false;
-#ifdef BUILD_TSAK
-	useSAKProcess = config->readBoolEntry("UseSAK", false) && KDesktopSettings::useTDESAK();
-#endif
-	if (useSAKProcess) {
-		mSAKProcess = new TDEProcess;
-		*mSAKProcess << "tdmtsak";
-		connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
-		TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
-	}
-
-	mLockProcess.clearArguments();
-	TQString path = TDEStandardDirs::findExe( "kdesktop_lock" );
-	if( path.isEmpty())
-	{
-		kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-	}
-	mLockProcess << path;
-	mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-	if (mLockProcess.start() == false )
-	{
-		kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-	}
-
-	// Prevent kdesktop_lock signals from being handled by the wrong (GUI) thread
-	sigemptyset(&mThreadBlockSet);
-	sigaddset(&mThreadBlockSet, SIGUSR1);
-	sigaddset(&mThreadBlockSet, SIGUSR2);
-	sigaddset(&mThreadBlockSet, SIGTTIN);
-	pthread_sigmask(SIG_BLOCK, &mThreadBlockSet, NULL);
-
-	// Wait for the saver process to signal ready...
-	if (!waitForLockProcessStart()) {
-		kdDebug( 1204 ) << "Failed to initialize kdesktop_lock (unexpected termination)!" << endl;
-	}
-
-	// lock the desktop if required
-  config->setGroup("X-:0-Core");
-  bool autoLoginEnable = config->readBoolEntry("AutoLoginEnable", false);
-  bool autoLoginLocked = config->readBoolEntry("AutoLoginLocked", false);
-  if (autoLoginEnable && autoLoginLocked) {
-		mLockProcess.kill(SIGTTOU);
-		mLockProcess.kill(SIGUSR1);
-	}
-	delete config;
-	config = NULL;
+	// Prevent kdesktop_lock signals from being handled by the main GUI thread.
+	// Those signals will be handled by m_eventHandlerThread instead
+	//
+	// Make sure to keep this code after the constructor of `m_eventHandlerThread`, so that
+	// the new thread starts with the signals unblocked.
+	sigset_t sigBlockMask;
+	sigemptyset(&sigBlockMask);
+	sigaddset(&sigBlockMask, SIGUSR1);
+	sigaddset(&sigBlockMask, SIGUSR2);
+	sigaddset(&sigBlockMask, SIGTTIN);
+	sigaddset(&sigBlockMask, SIGCHLD);
+	pthread_sigmask(SIG_BLOCK, &sigBlockMask, NULL);
+
+	// Start SAK and lock processes
+	TQTimer::singleShot(0, m_saverEngineEventHandler, TQ_SLOT(restartLockProcess()));
 
 #ifdef WITH_TDEHWLIB
 	// Initialize SmartCard readers
 	TDEGenericDevice *hwdevice;
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
-	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
-		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next())
+	{
+		TDECryptographicCardDevice *cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)),
+		        this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)),
+		        this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 
@@ -216,11 +169,13 @@ SaverEngine::SaverEngine()
 	KUser userinfo;
 	TQString fileName = userinfo.homeDir() + "/.tde_card_login_state";
 	TQFile flagFile(fileName);
-	if (flagFile.open(IO_ReadOnly)) {
+	if (flagFile.open(IO_ReadOnly))
+	{
 		TQTextStream stream(&flagFile);
-		if (stream.readLine().startsWith("1")) {
+		if (stream.readLine().startsWith("1"))
+		{
 			// Card was likely used to log in
-			TQTimer::singleShot(5000, this, SLOT(cardStartupTimeout()));
+			TQTimer::singleShot(5000, this, TQ_SLOT(cardStartupTimeout()));
 		}
 		flagFile.close();
 	}
@@ -229,70 +184,66 @@ SaverEngine::SaverEngine()
 	dBusConnect();
 }
 
-//---------------------------------------------------------------------------
-//
-// Destructor - usual cleanups.
-//
 SaverEngine::~SaverEngine()
 {
-	if (mState == Waiting) {
-		kill(mLockProcess.pid(), SIGKILL);
-	}
-
-	mLockProcess.detach(); // don't kill it if we crash
+	m_saverEngineEventHandler->terminateLockProcess();
 	delete mXAutoLock;
-
 	dBusClose();
 
 	// Restore X screensaver parameters
-	XSetScreenSaver(tqt_xdisplay(), mXTimeout, mXInterval, mXBlanking,
-					mXExposures);
-
-	terminateHelperThread();
-	m_helperThread->wait();
-	delete m_threadHelperObject;
-	delete m_helperThread;
+	XSetScreenSaver(tqt_xdisplay(), mXTimeout, mXInterval, mXBlanking, mXExposures);
+	emit terminateEventHandlerThread();
+	m_eventHandlerThread->wait();
+	delete m_saverEngineEventHandler;
+	delete m_eventHandlerThread;
 }
 
-void SaverEngine::cardStartupTimeout() {
-	if (!mValidCryptoCardInserted) {
-		// Restore saver timeout
-		configure();
-
-		// Force lock
-		lockScreen();
+void SaverEngine::cardStartupTimeout()
+{
+	if (!mValidCryptoCardInserted)
+	{
+		configure();  // Restore saver timeout
+		lockScreen(); // Force lock
 	}
 }
 
-void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
+void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
+{
 #ifdef WITH_TDEHWLIB
 	TQString login_name = TQString::null;
 	X509CertificatePtrList certList = cdevice->cardX509Certificates();
-	if (certList.count() > 0) {
+	if (certList.count() > 0)
+	{
 		KSSLCertificate* card_cert = NULL;
 		card_cert = KSSLCertificate::fromX509(certList[0]);
 		TQStringList cert_subject_parts = TQStringList::split("/", card_cert->getSubject(), false);
-		for (TQStringList::Iterator it = cert_subject_parts.begin(); it != cert_subject_parts.end(); ++it ) {
+		for (TQStringList::Iterator it = cert_subject_parts.begin(); it != cert_subject_parts.end(); ++it)
+		{
 			TQString lcpart = (*it).lower();
-			if (lcpart.startsWith("cn=")) {
+			if (lcpart.startsWith("cn="))
+			{
 				login_name = lcpart.right(lcpart.length() - strlen("cn="));
 			}
 		}
 		delete card_cert;
 	}
 
-	if (login_name != "") {
+	if (login_name != "")
+	{
 		KUser user;
-		if (login_name == user.loginName()) {
+		if (login_name == user.loginName())
+		{
 			mValidCryptoCardInserted = true;
 		}
 	}
 #endif
 }
 
-void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
+void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice)
+{
 #ifdef WITH_TDEHWLIB
-	if (mValidCryptoCardInserted) {
+	if (mValidCryptoCardInserted)
+	{
 		mValidCryptoCardInserted = false;
 
 		// Restore saver timeout
@@ -304,226 +255,166 @@ void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice)
 #endif
 }
 
-//---------------------------------------------------------------------------
-//
-// This should be called only using DCOP.
-//
+// DCOP interface method
 void SaverEngine::lock()
 {
 	lockScreen(true);
 }
 
-//---------------------------------------------------------------------------
-//
-// Lock the screen
-//
-void SaverEngine::lockScreen(bool DCOP)
+void SaverEngine::lockScreen(bool dcop)
 {
-	if (mValidCryptoCardInserted) {
+	if (mValidCryptoCardInserted)
+	{
+		kdDebug(1204) << "SaverEngine: crypto card inserted, ignore lock request" << endl;
 		return;
 	}
+	emit lockScreenSignal(dcop);
+}
 
-	bool ok = true;
-	if (mState == Waiting)
-	{
-		ok = startLockProcess( ForceLock );
-		// It takes a while for kdesktop_lock to start and lock the screen.
-		// Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
-		// This is done only for --forcelock .
-		if( ok && mState != Saving )
-		{
-			if (DCOP) {
-				DCOPClientTransaction* trans = kapp->dcopClient()->beginTransaction();
-				if (trans) {
-					mLockTransactions.append( trans );
-				}
-			}
-		}
-	}
-	else
+void SaverEngine::lockScreenGUI()
+{
+	DCOPClientTransaction *trans = tdeApp->dcopClient()->beginTransaction();
+	if (trans)
 	{
-		mLockProcess.kill( SIGHUP );
+		mLockTransactions.append(trans);
 	}
 }
 
 void SaverEngine::processLockTransactions()
 {
-	for( TQValueVector< DCOPClientTransaction* >::ConstIterator it = mLockTransactions.begin();
-		 it != mLockTransactions.end();
-		 ++it )
+	TQValueVector<DCOPClientTransaction*>::ConstIterator it = mLockTransactions.begin();
+	for (; it != mLockTransactions.end(); ++it)
 	{
 		TQCString replyType = "void";
 		TQByteArray arr;
-		kapp->dcopClient()->endTransaction( *it, replyType, arr );
+		tdeApp->dcopClient()->endTransaction(*it, replyType, arr);
 	}
 	mLockTransactions.clear();
 }
 
 void SaverEngine::saverLockReady()
 {
-	if( mState != Engaging )
+	if (m_saverEngineEventHandler->getState() != SaverState::Engaging)
 	{
-		kdDebug( 1204 ) << "Got unexpected saverReady()" << endl;
+		kdDebug(1204) << "Got unexpected saverLockReady()" << endl;
 	}
-	kdDebug( 1204 ) << "Saver Lock Ready" << endl;
+
+	kdDebug(1204) << "Saver Lock Ready" << endl;
 	processLockTransactions();
 }
 
-//---------------------------------------------------------------------------
+// DCOP interface method
 void SaverEngine::save()
 {
-	if (!mValidCryptoCardInserted) {
-		if (mState == Waiting) {
-			startLockProcess( DefaultLock );
-		}
+	if (mValidCryptoCardInserted)
+	{
+		kdDebug(1204) << "SaverEngine: crypto card inserted, ignore save request" << endl;
+		return;
 	}
+	TQTimer::singleShot(0, m_saverEngineEventHandler, TQ_SLOT(saveScreen()));
 }
 
-//---------------------------------------------------------------------------
+// DCOP interface method
 void SaverEngine::quit()
 {
-	if (mState == Saving || mState == Engaging)
-	{
-		stopLockProcess();
-	}
+	TQTimer::singleShot(0, m_saverEngineEventHandler, TQ_SLOT(stopLockProcess()));
 }
 
-//---------------------------------------------------------------------------
+// DCOP interface method
 bool SaverEngine::isEnabled()
 {
 	return mEnabled;
 }
 
-//---------------------------------------------------------------------------
-bool SaverEngine::enable( bool e )
+// DCOP interface method
+bool SaverEngine::enable(bool e)
 {
-	if ( e == mEnabled )
-	return true;
+	if (e == mEnabled)
+		return true;
 
 	// If we aren't in a suitable state, we will not reconfigure.
-	if (mState != Waiting)
+	if (m_saverEngineEventHandler->getState() != SaverState::Waiting)
 		return false;
 
 	mEnabled = e;
 
-	if (mEnabled) {
-		if ( !mXAutoLock ) {
+	if (mEnabled)
+	{
+		if (!mXAutoLock)
+		{
 			mXAutoLock = new XAutoLock();
-			connect(mXAutoLock, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
+			connect(mXAutoLock, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout()));
 		}
 		mXAutoLock->setTimeout(mTimeout);
 		mXAutoLock->setDPMS(true);
-		//mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
 	
 		// We'll handle blanking
 		XSetScreenSaver(tqt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures);
-		kdDebug() << "XSetScreenSaver " << mTimeout + 10 << endl;
-
 		mXAutoLock->start();
-
-		kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl;
+		kdDebug(1204) << "Saver engine started, timeout: " << mTimeout << endl;
 	}
-	else {
-		if (mXAutoLock) {
+	else
+	{
+		if (mXAutoLock)
+		{
 			delete mXAutoLock;
-			mXAutoLock = 0;
+			mXAutoLock = nullptr;
 		}
 	
-		XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
+		XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset);
 		XSetScreenSaver(tqt_xdisplay(), 0, mXInterval,  PreferBlanking, DontAllowExposures);
-		kdDebug(1204) << "Saver Engine disabled" << endl;
+		kdDebug(1204) << "Saver engine disabled" << endl;
 	}
 
 	return true;
 }
 
-//---------------------------------------------------------------------------
+// DCOP interface method
 bool SaverEngine::isBlanked()
 {
-	return (mState != Waiting);
+	return (m_saverEngineEventHandler->getState() != SaverState::Waiting);
 }
 
 void SaverEngine::enableExports()
 {
-#ifdef Q_WS_X11
-	kdDebug(270) << k_lineinfo << "activating background exports.\n";
-	DCOPClient *client = kapp->dcopClient();
-	if (!client->isAttached()) {
+#ifdef TQ_WS_X11
+	kdDebug(270) << k_lineinfo << "activating background exports" << endl;
+	DCOPClient *client = tdeApp->dcopClient();
+	if (!client->isAttached())
+	{
 		client->attach();
 	}
 	TQByteArray data;
-	TQDataStream args( data, IO_WriteOnly );
+	TQDataStream args(data, IO_WriteOnly);
 	args << 1;
 	
-	TQCString appname( "kdesktop" );
+	TQCString appname("kdesktop");
 	int screen_number = DefaultScreen(tqt_xdisplay());
-	if ( screen_number ) {
-		appname.sprintf("kdesktop-screen-%d", screen_number );
+	if (screen_number)
+	{
+		appname.sprintf("kdesktop-screen-%d", screen_number);
 	}
 	
-	client->send( appname, "KBackgroundIface", "setExport(int)", data );
+	client->send(appname, "KBackgroundIface", "setExport(int)", data);
 #endif
 }
 
-//---------------------------------------------------------------------------
-void SaverEngine::handleSecureDialog()
-{
-	// Wait for SAK press
-	if (mSAKProcess && !mSAKProcess->isRunning()) {
-		mSAKProcess->start();
-	}
-}
-
-void SaverEngine::slotSAKProcessExited()
-{
-	if (!mSAKProcess) {
-		printf("[kdesktop] SAK process does not exist. Something went wrong. Ignoring...\n"); fflush(stdout);
-		return;
-	}
-	int retcode = mSAKProcess->exitStatus();
-	if ((retcode != 0) && (mSAKProcess->normalExit())) {
-		trinity_lockeng_sak_available = FALSE;
-		printf("[kdesktop] SAK driven secure dialog is not available for use (retcode %d).  Check tdmtsak for proper functionality.\n", retcode); fflush(stdout);
-	}
-
-	if (mState == Preparing) {
-		return;
-	}
-
-	if ((mSAKProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
-		bool ok = true;
-		if (mState == Waiting)
-		{
-			ok = startLockProcess( SecureDialog );
-			if( ok && mState != Saving )
-			{
-			}
-		}
-		else
-		{
-			mLockProcess.kill( SIGHUP );
-		}
-	}
-}
-
-//---------------------------------------------------------------------------
-//
 // Read and apply configuration.
-//
 void SaverEngine::configure()
 {
 	// If we aren't in a suitable state, we will not reconfigure.
-	if (mState != Waiting) {
+	if (m_saverEngineEventHandler->getState() != SaverState::Waiting)
+	{
 		return;
 	}
 
 	// create a new config obj to ensure we read the latest options
 	KDesktopSettings::self()->readConfig();
 
-	bool e = KDesktopSettings::screenSaverEnabled();
 	mTimeout = KDesktopSettings::timeout();
-
-	mEnabled = !e;   // force the enable()
+	bool e = KDesktopSettings::screenSaverEnabled();
+	mEnabled = !e;   // enable the screensaver by forcibly toggling it
+	enable(e);
 
 	int action;
 	action = KDesktopSettings::actionTopLeft();
@@ -534,409 +425,257 @@ void SaverEngine::configure()
 	xautolock_corners[2] = applyManualSettings(action);
 	action = KDesktopSettings::actionBottomRight();
 	xautolock_corners[3] = applyManualSettings(action);
-
-	enable( e );
 }
 
-//---------------------------------------------------------------------------
-//
-//  Set a variable to indicate only using the blanker and not the saver.
-//
-void SaverEngine::setBlankOnly( bool blankOnly )
+// DCOP interface method
+// Set a variable to indicate only to blank the screen and not use the saver
+void SaverEngine::setBlankOnly(bool blankOnly)
 {
 	mBlankOnly = blankOnly;
-	// FIXME: if running, stop and restart?  What about security
-	// implications of this?
 }
 
-bool SaverEngine::restartDesktopLockProcess()
+void SaverEngine::activateSaverOrLockGUI()
 {
-	if (!mLockProcess.isRunning()) {
-		mSaverProcessReady = false;
-		mLockProcess.clearArguments();
-		TQString path = TDEStandardDirs::findExe( "kdesktop_lock" );
-		if (path.isEmpty()) {
-			kdDebug( 1204 ) << "Can't find kdesktop_lock!" << endl;
-			return false;
-		}
-		mLockProcess << path;
-		mLockProcess << TQString( "--internal" ) << TQString( "%1" ).arg(getpid());
-		if (mLockProcess.start() == false) {
-			kdDebug( 1204 ) << "Failed to start kdesktop_lock!" << endl;
-			return false;
-		}
-		// Wait for the saver process to signal ready...
-		if (!waitForLockProcessStart()) {
-			kdDebug( 1204 ) << "Failed to initialize kdesktop_lock (unexpected termination)!" << endl;
-			return false;
-		}
-	}
-	return true;
-}
-
-//---------------------------------------------------------------------------
-//
-// Start the screen saver.
-//
-bool SaverEngine::startLockProcess( LockType lock_type )
-{
-	int ret;
-
-	if (mState == Saving) {
-		return true;
-	}
-
-	mState = Preparing;
-	if (mSAKProcess) {
-		mSAKProcess->kill(SIGTERM);
-	}
-
-	enableExports();
-
-	kdDebug(1204) << "SaverEngine: starting saver" << endl;
-	emitDCOPSignal("KDE_start_screensaver()", TQByteArray());
-
-	if (!restartDesktopLockProcess()) {
-		mState = Waiting;
-		return false;
-	}
-
-	switch( lock_type )
-	{
-		case ForceLock:
-			mLockProcess.kill(SIGUSR1);		// Request forcelock
-			break;
-		case DontLock:
-			mLockProcess.kill(SIGUSR2);		// Request dontlock
-			break;
-		case SecureDialog:
-			mLockProcess.kill(SIGWINCH);	// Request secure dialog
-			break;
-		default:
-			break;
-	}
-	if (mBlankOnly) {
-		mLockProcess.kill(SIGTTIN);		// Request blanking
-	}
-
-	ret = mLockProcess.kill(SIGTTOU);			// Start lock
-	if (!ret) {
-		mState = Waiting;
-		return false;
-	}
 	XSetScreenSaver(tqt_xdisplay(), 0, mXInterval,  PreferBlanking, mXExposures);
-
-	mState = Engaging;
-	if (mXAutoLock) {
+	if (mXAutoLock)
+	{
 		mXAutoLock->stop();
 	}
-	return true;
+	emitDCOPSignal("KDE_start_screensaver()", TQByteArray());
 }
 
-//---------------------------------------------------------------------------
-//
-// Stop the screen saver.
-//
-void SaverEngine::stopLockProcess()
+void SaverEngine::stopLockProcessGUI()
 {
-	if (mState == Waiting) {
-		kdWarning(1204) << "SaverEngine::stopSaver() saver not active" << endl;
-		return;
-	}
-	kdDebug(1204) << "SaverEngine: stopping lock" << endl;
 	emitDCOPSignal("KDE_stop_screensaver()", TQByteArray());
 
-	mTerminationRequested = true;
-	mLockProcess.kill();
-
-	if (mEnabled) {
-		if (mXAutoLock) {
+	if (mEnabled)
+	{
+		if (mXAutoLock)
+		{
 			mXAutoLock->start();
 		}
-		XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
+		XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset);
 		XSetScreenSaver(tqt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures);
 	}
 	processLockTransactions();
-	mState = Waiting;
 
-	if( systemdSession && systemdSession->canSend() ) {
+	if (systemdSession && systemdSession->canSend())
+	{
 		TQValueList<TQT_DBusData> params;
 		params << TQT_DBusData::fromBool(false);
 		TQT_DBusMessage reply = systemdSession->sendWithReply("SetIdleHint", params);
 	}
 }
 
-void SaverEngine::recoverFromHackingAttempt()
-{
-	// Try to relaunch saver with forcelock
-	if (!startLockProcess(ForceLock)) {
-		// Terminate the TDE session ASAP!
-		// Values are explained at http://lists.kde.org/?l=kde-linux&m=115770988603387
-		TQByteArray data;
-		TQDataStream arg(data, IO_WriteOnly);
-		arg << (int)0 << (int)0 << (int)2;
-		if (!kapp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data)) {
-			// Someone got to DCOP before we did
-			// Try an emergency system logout
-			system("logout");
-		}
-	}
-}
-
-void SaverEngine::lockProcessExited()
+void SaverEngine::terminateTDESession()
 {
-	bool abnormalExit = false;
-	if (mLockProcess.normalExit() == false) {
-		abnormalExit = true;
-	}
-	else {
-		if (mLockProcess.exitStatus() != 0) {
-			abnormalExit = true;
-		}
-	}
-	if (mTerminationRequested == true) {
-		abnormalExit = false;
-		mTerminationRequested = false;
-	}
-	if (abnormalExit == true) {
-		// PROBABLE HACKING ATTEMPT DETECTED
-		restartDesktopLockProcess();
-		mState = Waiting;
-		TQTimer::singleShot( 100, this, SLOT(recoverFromHackingAttempt()) );
-	}
-	else {
-		// Restart the lock process
-		restartDesktopLockProcess();
+	// Terminate the TDE session ASAP!
+	// Values are explained at http://lists.kde.org/?l=kde-linux&m=115770988603387
+	TQByteArray data;
+	TQDataStream arg(data, IO_WriteOnly);
+	arg << (int)0 << (int)0 << (int)2;
+	if (!tdeApp->dcopClient()->send("ksmserver", "default", "logout(int,int,int)", data))
+	{
+		// Someone got to DCOP before we did. Try an emergency system logout
+		system("logout");
 	}
 }
 
-void SaverEngineThreadHelperObject::slotLockProcessWaiting()
-{
-	// lockProcessWaiting cannot be called directly from a signal handler, as it will hang in certain obscure circumstances
-	// Instead we use a single-shot timer to immediately call lockProcessWaiting once control has returned to the Qt main loop
-	lockProcessWaiting();
-}
-
-void SaverEngineThreadHelperObject::slotLockProcessFullyActivated()
-{
-	lockProcessFullyActivated();
-}
-
-void SaverEngine::lockProcessFullyActivated()
+void SaverEngine::lockProcessFullyActivatedGUI()
 {
-	mState = Saving;
-
-	if( systemdSession && systemdSession->canSend() ) {
+	if (systemdSession && systemdSession->canSend())
+	{
 		TQValueList<TQT_DBusData> params;
 		params << TQT_DBusData::fromBool(true);
 		TQT_DBusMessage reply = systemdSession->sendWithReply("SetIdleHint", params);
 	}
 
-	if (mNewVTAfterLockEngage) {
+	if (mNewVTAfterLockEngage)
+	{
 		DM().startReserve();
 		mNewVTAfterLockEngage = false;
 	}
-	else if (mSwitchVTAfterLockEngage != -1) {
+	else if (mSwitchVTAfterLockEngage != -1)
+	{
 		DM().switchVT(mSwitchVTAfterLockEngage);
 		mSwitchVTAfterLockEngage = -1;
 	}
 }
 
-void SaverEngine::slotLockProcessReady()
-{
-	mSaverProcessReady = true;
-}
-
-void SaverEngine::lockProcessWaiting()
-{
-	kdDebug(1204) << "SaverEngine: lock exited" << endl;
-	if (trinity_lockeng_sak_available == TRUE) {
-		handleSecureDialog();
-	}
-	if( mState == Waiting ) {
-		return;
-	}
-	emitDCOPSignal("KDE_stop_screensaver()", TQByteArray());
-	if (mEnabled) {
-		if (mXAutoLock) {
-			mXAutoLock->start();
-		}
-		XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
-		XSetScreenSaver(tqt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures);
-	}
-	processLockTransactions();
-	mState = Waiting;
-
-	if( systemdSession && systemdSession->canSend() ) {
-		TQValueList<TQT_DBusData> params;
-		params << TQT_DBusData::fromBool(false);
-		TQT_DBusMessage reply = systemdSession->sendWithReply("SetIdleHint", params);
-	}
-}
-
-//---------------------------------------------------------------------------
-//
 // XAutoLock has detected the required idle time.
-//
 void SaverEngine::idleTimeout()
 {
-	if (!mValidCryptoCardInserted) {
+	if (!mValidCryptoCardInserted)
+	{
 		// disable X screensaver
-		XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
+		XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset);
 		XSetScreenSaver(tqt_xdisplay(), 0, mXInterval, PreferBlanking, DontAllowExposures);
-		startLockProcess( DefaultLock );
+		emit activateSaverOrLockSignal(DefaultLock);
 	}
 }
 
 xautolock_corner_t SaverEngine::applyManualSettings(int action)
 {
-	if (action == 0) {
+	if (action == 0)
+	{
 		kdDebug() << "no lock" << endl;
 		return ca_nothing;
 	}
-	else if (action == 1) {
+	else if (action == 1)
+	{
 		kdDebug() << "lock screen" << endl;
 		return ca_forceLock;
 	}
-	else if (action == 2) {
+	else if (action == 2)
+	{
 		kdDebug() << "prevent lock" << endl;
 		return ca_dontLock;
 	}
-	else{
+	else
+	{
 		kdDebug() << "no lock nothing" << endl;
 		return ca_nothing;
 	}
 }
 
-/*!
- * This function try a reconnect to D-Bus.
+/*
+ * This function try to reconnect to D-Bus.
  * \return boolean with the result of the operation
  * \retval true if successful reconnected to D-Bus
  * \retval false if unsuccessful
  */
-bool SaverEngine::dBusReconnect() {
-	// close D-Bus connection
-	dBusClose();
-	// init D-Bus conntection
-	return (dBusConnect());
-}
+bool SaverEngine::dBusReconnect()
+{
+	dBusClose();            // close D-Bus connection
+	return (dBusConnect()); // init D-Bus conntection
+} 
 
-/*!
- * This function is used to close D-Bus connection.
- */
-void SaverEngine::dBusClose() {
-	if( dBusConn.isConnected() ) {
-		if( dBusLocal ) {
+// This function is used to close D-Bus connection.
+void SaverEngine::dBusClose()
+{
+	if (dBusConn.isConnected())
+	{
+		if (dBusLocal)
+		{
 			delete dBusLocal;
-			dBusLocal = 0;
+			dBusLocal = nullptr;
 		}
-		if( dBusWatch ) {
+		if (dBusWatch)
+		{
 			delete dBusWatch;
-			dBusWatch = 0;
+			dBusWatch = nullptr;
 		}
-		if( systemdSession ) {
+		if (systemdSession)
+		{
 			delete systemdSession;
-			systemdSession = 0;
+			systemdSession = nullptr;
 		}
 	}
 	dBusConn.closeConnection(DBUS_CONN_NAME);
 }
 
-/*!
- * This function is used to connect to D-Bus.
- */
-bool SaverEngine::dBusConnect() {
+// This function is used to connect to D-Bus.
+bool SaverEngine::dBusConnect()
+{
 	dBusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus, DBUS_CONN_NAME);
-	if( !dBusConn.isConnected() ) {
+	if (!dBusConn.isConnected())
+	{
 		kdError() << "Failed to open connection to system message bus: " << dBusConn.lastError().message() << endl;
-		TQTimer::singleShot(4000, this, TQT_SLOT(dBusReconnect()));
+		TQTimer::singleShot(4000, this, TQ_SLOT(dBusReconnect()));
 		return false;
 	}
 
 	// watcher for Disconnect signal
 	dBusLocal = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, dBusConn);
-	TQObject::connect(dBusLocal, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
-			  this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+	TQObject::connect(dBusLocal, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+	        this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
 
 	// watcher for NameOwnerChanged signals
 	dBusWatch = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn);
-	TQObject::connect(dBusWatch, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
-			  this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+	TQObject::connect(dBusWatch, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+	        this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
 
 	// find already running SystemD
 	TQT_DBusProxy checkSystemD(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn);
-	if( checkSystemD.canSend() ) {
+	if (checkSystemD.canSend())
+	{
 		TQValueList<TQT_DBusData> params;
 		params << TQT_DBusData::fromString(SYSTEMD_LOGIN1_SERVICE);
 		TQT_DBusMessage reply = checkSystemD.sendWithReply("NameHasOwner", params);
-		if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1 && reply[0].toBool() ) {
+		if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1 && reply[0].toBool())
+		{
 			onDBusServiceRegistered(SYSTEMD_LOGIN1_SERVICE);
 		}
 	}
 	return true;
 }
 
-/*!
- * This function handles D-Bus service registering
- */
-void SaverEngine::onDBusServiceRegistered(const TQString& service) {
-	if( service == SYSTEMD_LOGIN1_SERVICE ) {
+// This function handles D-Bus service registering
+void SaverEngine::onDBusServiceRegistered(const TQString& service)
+{
+	if (service == SYSTEMD_LOGIN1_SERVICE)
+	{
 		// get current systemd session
 		TQT_DBusProxy managerIface(SYSTEMD_LOGIN1_SERVICE, SYSTEMD_LOGIN1_PATH, SYSTEMD_LOGIN1_MANAGER_IFACE, dBusConn);
 		TQT_DBusObjectPath systemdSessionPath = TQT_DBusObjectPath();
-		if( managerIface.canSend() ) {
+		if (managerIface.canSend())
+		{
 			TQValueList<TQT_DBusData> params;
-			params << TQT_DBusData::fromUInt32( getpid() );
+			params << TQT_DBusData::fromUInt32(getpid());
 			TQT_DBusMessage reply = managerIface.sendWithReply("GetSessionByPID", params);
-			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1 ) {
+			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1)
+			{
 				systemdSessionPath = reply[0].toObjectPath();
 			}
 		}
 		// wather for systemd session signals
-		if( systemdSessionPath.isValid() ) {
+		if (systemdSessionPath.isValid())
+		{
 			systemdSession = new TQT_DBusProxy(SYSTEMD_LOGIN1_SERVICE, systemdSessionPath, SYSTEMD_LOGIN1_SESSION_IFACE, dBusConn);
-			TQObject::connect(systemdSession, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
-					  this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+			TQObject::connect(systemdSession, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+					  this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
 		}
 		return;
 	}
 }
 
-/*!
- * This function handles D-Bus service unregistering
- */
-void SaverEngine::onDBusServiceUnregistered(const TQString& service) {
-	if( service == SYSTEMD_LOGIN1_SERVICE ) {
-		if( systemdSession ) {
+// This function handles D-Bus service unregistering
+void SaverEngine::onDBusServiceUnregistered(const TQString& service)
+{
+	if (service == SYSTEMD_LOGIN1_SERVICE)
+	{
+		if (systemdSession)
+		{
 			delete systemdSession;
-			systemdSession = 0;
+			systemdSession = nullptr;
 		}
 		return;
 	}
 }
 
-/*!
- * This function handles signals from the D-Bus daemon.
- */
-void SaverEngine::handleDBusSignal(const TQT_DBusMessage& msg) {
+// This function handles signals from the D-Bus daemon.
+void SaverEngine::handleDBusSignal(const TQT_DBusMessage& msg)
+{
 	// dbus terminated
-	if( msg.path() == DBUS_PATH_LOCAL
-	 && msg.interface() == DBUS_INTERFACE_LOCAL
-	 && msg.member() == "Disconnected" ) {
+	if (msg.path() == DBUS_PATH_LOCAL && msg.interface() == DBUS_INTERFACE_LOCAL &&
+	        msg.member() == "Disconnected")
+	{
 		dBusClose();
-		TQTimer::singleShot(1000, this, TQT_SLOT(dBusReconnect()));
+		TQTimer::singleShot(1000, this, TQ_SLOT(dBusReconnect()));
 		return;
 	}
 
 	// service registered / unregistered
-	if( msg.path() == DBUS_PATH_DBUS
-	 && msg.interface() == DBUS_INTERFACE_DBUS
-	 && msg.member() == "NameOwnerChanged" ) {
-		if( msg[1].toString().isEmpty() ) {
+	if (msg.path() == DBUS_PATH_DBUS && msg.interface() == DBUS_INTERFACE_DBUS &&
+	        msg.member() == "NameOwnerChanged")
+	{
+		if (msg[1].toString().isEmpty())
+		{
 			// old-owner is empty
 			onDBusServiceRegistered(msg[0].toString());
 		}
-		if( msg[2].toString().isEmpty() ) {
+		if (msg[2].toString().isEmpty())
+		{
 			// new-owner is empty
 			onDBusServiceUnregistered(msg[0].toString());
 		}
@@ -944,69 +683,367 @@ void SaverEngine::handleDBusSignal(const TQT_DBusMessage& msg) {
 	}
 
 	// systemd signal Lock()
-	if( systemdSession && systemdSession->canSend()
-	 && msg.path() == systemdSession->path()
-	 && msg.interface() == SYSTEMD_LOGIN1_SESSION_IFACE
-	 && msg.member() == "Lock") {
+	if (systemdSession && systemdSession->canSend() && msg.path() == systemdSession->path() &&
+	        msg.interface() == SYSTEMD_LOGIN1_SESSION_IFACE && msg.member() == "Lock")
+	{
 		lockScreen();
 		return;
 	}
 
 	// systemd signal Unlock()
-	if( systemdSession && systemdSession->canSend()
-	 && msg.path() == systemdSession->path()
-	 && msg.interface() == SYSTEMD_LOGIN1_SESSION_IFACE
-	 && msg.member() == "Unlock") {
+	if (systemdSession && systemdSession->canSend() && msg.path() == systemdSession->path() &&
+	        msg.interface() == SYSTEMD_LOGIN1_SESSION_IFACE && msg.member() == "Unlock")
+	{
 		// unlock?
 		return;
 	}
 }
 
-bool SaverEngine::waitForLockProcessStart() {
-	sigset_t new_mask;
-	sigset_t empty_mask;
-	sigemptyset(&empty_mask);
+void SaverEngine::lockScreenAndDoNewSession()
+{
+	mNewVTAfterLockEngage = true;
+	lockScreen();
+}
 
-	// ensure that SIGCHLD is not subject to a race condition
-	sigemptyset(&new_mask);
-	sigaddset(&new_mask, SIGCHLD);
+void SaverEngine::lockScreenAndSwitchSession(int vt)
+{
+	mSwitchVTAfterLockEngage = vt;
+	lockScreen();
+}
 
-	pthread_sigmask(SIG_BLOCK, &new_mask, NULL);
-	while ((mLockProcess.isRunning()) && (!mSaverProcessReady)) {
-		// wait for any signal(s) to arrive
-		sigsuspend(&empty_mask);
+SaverEngineEventHandler::SaverEngineEventHandler(SaverEngine *engine) :
+        m_state(Waiting), m_saverProcessReady(false), m_lockProcessRestarting(false),
+        m_terminationRequest(false), m_saverEngine(engine), m_SAKProcess(nullptr)
+{
+	connect(&m_lockProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+	        this, TQ_SLOT(slotLockProcessExited()));
+}
+
+void SaverEngineEventHandler::terminateLockProcess()
+{
+	if (m_state == Waiting)
+	{
+		kill(m_lockProcess.pid(), SIGKILL);
 	}
-	pthread_sigmask(SIG_UNBLOCK, &new_mask, NULL);
+	m_lockProcess.detach(); // don't kill it if we crash
+}
+											
+void SaverEngineEventHandler::lockCompleted()
+{
+	kdDebug(1204) << "SaverEngineEventHandler: lock completed" << endl;
 
-	return mLockProcess.isRunning();
+	if (m_state == Waiting)
+	{
+		return;
+	}
+
+	m_state = Waiting;
+	if (trinity_lockeng_sak_available)
+	{
+		startSAKProcess();
+	}
+	TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(stopLockProcessGUI()));
 }
 
-bool SaverEngine::waitForLockEngage() {
-	sigset_t empty_mask;
-	sigemptyset(&empty_mask);
+void SaverEngineEventHandler::lockFullyActivated()
+{
+	m_state = Saving;
+	TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(lockProcessFullyActivatedGUI()));
+}
+
+void SaverEngineEventHandler::lockReady()
+{
+	m_saverProcessReady = true;
+}
 
-	// wait for SIGUSR1, SIGUSR2, SIGTTIN
-	while ((mLockProcess.isRunning()) && (mState != Waiting) && (mState != Saving)) {
-		// wait for any signal(s) to arrive
-		sigsuspend(&empty_mask);
+void SaverEngineEventHandler::lockScreen(bool dcop)
+{
+	if (m_lockProcessRestarting)
+	{
+		kdDebug(1204) << "SaverEngineEventHandler: lock process is restarting, can't handle lock request" << endl;
+		return;
 	}
 
-	return mLockProcess.isRunning();
+	bool ok = true;
+	if (m_state == Waiting)
+	{
+		ok = activateSaverOrLock(ForceLock);
+		// It takes a while for kdesktop_lock to start and lock the screen.
+		// Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
+		// This is done only for --forcelock .
+		if (ok && m_state != Saving)
+		{
+			if (dcop)
+			{
+				TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(lockScreenGUI()));
+			}
+		}
+	}
 }
 
-void SaverEngine::lockScreenAndDoNewSession() {
-	mNewVTAfterLockEngage = true;
-	lockScreen();
+void SaverEngineEventHandler::saveScreen()
+{
+	if (m_lockProcessRestarting)
+	{
+		kdDebug(1204) << "SaverEngineEventHandler: lock process is restarting, can't handle save request" << endl;
+		return;
+	}
+
+	if (m_state == Waiting)
+	{
+		activateSaverOrLock(DefaultLock);
+	}
 }
 
-void SaverEngine::lockScreenAndSwitchSession(int vt) {
-	mSwitchVTAfterLockEngage = vt;
-	lockScreen();
+void SaverEngineEventHandler::slotLockProcessExited()
+{
+	// Clean up status after the lock process has exited
+	lockCompleted();
+
+	m_lockProcessRestarting = true;
+
+	bool abnormalExit = false;
+	if (!m_lockProcess.normalExit())
+	{
+		abnormalExit = true;
+	}
+	else if (m_lockProcess.exitStatus() != 0)
+	{
+		abnormalExit = true;
+	}
+	if (m_terminationRequest)
+	{
+		abnormalExit = false;
+		m_terminationRequest = false;
+	}
+
+	// Restart the lock process. This call blocks till
+	// the lock process has restarted.
+	restartLockProcess();
+
+	if (abnormalExit)
+	{
+		// Possible hacking attempt detected, try to relaunch the saver with force lock
+		m_state = Waiting;
+		if (!activateSaverOrLock(ForceLock))
+		{
+			TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(terminateTDESession()));
+		}
+	}
+	m_lockProcessRestarting = false;
 }
 
-void SaverEngineThreadHelperObject::terminateThread() {
-	TQEventLoop* eventLoop = TQApplication::eventLoop();
-	if (eventLoop) {
+/*
+ * Start or restart the lock process.
+ * On the very first invocation, launch the SAK process if required and
+ * auto lock the screen if the option has been enabled in the configuration.
+ */
+bool SaverEngineEventHandler::restartLockProcess()
+{
+	static bool firstStart = true;
+
+	bool autoLoginEnable = false;
+	bool autoLoginLocked = false;
+	if (firstStart)
+	{
+		firstStart = false;
+
+		// Create SAK process only if SAK is enabled
+		struct stat st;
+		TDESimpleConfig *config;
+		if (stat(KDE_CONFDIR "/tdm/tdmdistrc" , &st) == 0)
+		{
+			config = new TDESimpleConfig(TQString::fromLatin1(KDE_CONFDIR "/tdm/tdmdistrc"));
+		}
+		else
+		{
+			config = new TDESimpleConfig(TQString::fromLatin1(KDE_CONFDIR "/tdm/tdmrc"));
+		}
+		config->setGroup("X-:*-Greeter");
+		bool useSAKProcess = false;
+#ifdef BUILD_TSAK
+		useSAKProcess = config->readBoolEntry("UseSAK", false) && KDesktopSettings::useTDESAK();
+#endif
+		if (useSAKProcess)
+		{
+			startSAKProcess();
+		}
+
+		// autolock the desktop if required
+		config->setGroup("X-:0-Core");
+		autoLoginEnable = config->readBoolEntry("AutoLoginEnable", false);
+		autoLoginLocked = config->readBoolEntry("AutoLoginLocked", false);
+		delete config;
+	}
+
+	// (Re)start the lock process
+	if (!m_lockProcess.isRunning())
+	{
+		m_lockProcess.clearArguments();
+		TQString path = TDEStandardDirs::findExe("kdesktop_lock");
+		if (path.isEmpty())
+		{
+			kdDebug(1204) << "Can't find kdesktop_lock!" << endl;
+			return false;
+		}
+		m_lockProcess << path;
+		m_lockProcess << TQString("--internal") << TQString("%1").arg(getpid());
+
+		m_saverProcessReady = false;
+		if (!m_lockProcess.start())
+		{
+			kdDebug(1204) << "Failed to start kdesktop_lock!" << endl;
+			return false;
+		}
+		// Wait for the lock process to signal that it is ready
+		sigset_t empty_mask;
+		sigemptyset(&empty_mask);
+		while (!m_saverProcessReady)
+		{
+			sigsuspend(&empty_mask);
+		}
+		if (!m_lockProcess.isRunning())
+		{
+			kdDebug(1204) << "Failed to initialize kdesktop_lock (unexpected termination)!" << endl;
+			return false;
+		}
+	}
+
+	if (autoLoginEnable && autoLoginLocked)
+	{
+		m_lockProcess.kill(SIGTTOU);
+		m_lockProcess.kill(SIGUSR1);
+	}
+	return true;
+}
+
+// Start the screen saver or lock screen
+bool SaverEngineEventHandler::activateSaverOrLock(LockType lock_type)
+{
+	if (m_state == Saving)
+	{
+		return true;
+	}
+
+	kdDebug(1204) << "SaverEngineEventHandler: starting saver" << endl;
+	m_state = Preparing;
+	if (m_SAKProcess)
+	{
+		m_SAKProcess->kill(SIGTERM);
+	}
+
+	m_saverEngine->enableExports();
+	if (!restartLockProcess())
+	{
+		m_state = Waiting;
+		return false;
+	}
+
+	switch (lock_type)
+	{
+		case ForceLock:
+			m_lockProcess.kill(SIGUSR1);        // Request forcelock
+			break;
+		case DontLock:
+			m_lockProcess.kill(SIGUSR2);        // Request dontlock
+			break;
+		case SecureDialog:
+			m_lockProcess.kill(SIGWINCH);       // Request secure dialog
+			break;
+		default:
+			break;
+	}
+
+	if (m_saverEngine->mBlankOnly)
+	{
+		m_lockProcess.kill(SIGTTIN);          // Request blanking
+	}
+
+	int ret = m_lockProcess.kill(SIGTTOU);  // Start lock
+	if (!ret)
+	{
+		m_state = Waiting;
+		return false;
+	}
+	m_state = Engaging;
+
+	// Ask to the GUI thread to activate X11 saver
+	TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(activateSaverOrLockGUI()));
+
+	return true;
+}
+
+// Stop the screen saver.
+void SaverEngineEventHandler::stopLockProcess()
+{
+	if (m_state == Waiting)
+	{
+		return;
+	}
+
+	kdDebug(1204) << "SaverEngineEventHandler: stopping lock process" << endl;
+
+	m_terminationRequest = true;
+	m_lockProcess.kill();
+	m_state = Waiting;
+
+	// Ask to the GUI thread to stop the X11 saver
+	TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(stopLockProcessGUI()));
+}
+
+void SaverEngineEventHandler::startSAKProcess()
+{
+	if (!m_SAKProcess)
+	{
+		m_SAKProcess = new TDEProcess;
+		*m_SAKProcess << "tdmtsak";
+		connect(m_SAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
+	}
+	if (!m_SAKProcess->isRunning())
+	{
+		m_SAKProcess->start();
+	}
+}
+
+void SaverEngineEventHandler::slotSAKProcessExited()
+{
+	if (!m_SAKProcess)
+	{
+		tqWarning("[kdesktop] SAK process does not exist. Something went wrong. Ignoring.");
+		return;
+	}
+
+	int retcode = m_SAKProcess->exitStatus();
+	if (retcode && m_SAKProcess->normalExit())
+	{
+		trinity_lockeng_sak_available = false;
+		tqWarning("[kdesktop] SAK driven secure dialog is not available for use (retcode %d). "
+		          "Check tdmtsak for proper functionality.", retcode);
+	}
+
+	if (m_state == Preparing)
+	{
+		return;
+	}
+
+	if (m_SAKProcess->normalExit() && trinity_lockeng_sak_available)
+	{
+		if (m_state == Waiting)
+		{
+			activateSaverOrLock(SecureDialog);
+		}
+		else
+		{
+			m_lockProcess.kill(SIGHUP);
+		}
+	}
+}
+
+void SaverEngineEventHandler::terminateThread()
+{
+	TQEventLoop *eventLoop = TQApplication::eventLoop();
+	if (eventLoop)
+	{
 		eventLoop->exit(0);
 	}
 }
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index c50361bc0..11806e73c 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -1,6 +1,5 @@
-//===========================================================================
 //
-// This file is part of the KDE project
+// This file is part of the TDE project
 //
 // Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
 //
@@ -8,9 +7,8 @@
 #ifndef __LOCKENG_H__
 #define __LOCKENG_H__
 
-#include <tqwidget.h>
 #include <tqthread.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tqvaluevector.h>
 #include "KScreensaverIface.h"
 #include "xautolock.h"
@@ -23,31 +21,48 @@ class TDECryptographicCardDevice;
 #else
 #define TDECryptographicCardDevice void
 #endif
+
+/**
+ * Screen saver engine. Handles communication with the lock process.
+ * The engine is split into two parts, the 'SaverEngine' running in the GUI thread and
+ * the 'SaverEngineEventHandler' running in a separate thread and eventloop.
+ * The 'SaverEngine' handles communication with X11, DCOP and DBUS while the
+ * 'SaverEngineEventHandler' handles communication with the actual lock process.
+ * Several actions require cooperation of the two parts, so in various methods
+ * there will be inter-thread calls (using timers or by emitting signals) to
+ * trigger the other side remaining logic.
+ * This complex design is necessary to avoid blocking the main GUI application event loop,
+ * which has several tasks to manage and therefore can't affort to wait in a suspended state.
+ * This was previously leading to deadlock when DCOP calls where executed on the secondary
+ * thread/eventloop, for example when changing desktop while the lock process was restarting.
+ */
+
 class DCOPClientTransaction;
 class TQT_DBusMessage;
 class TQT_DBusProxy;
+class SaverEngineEventHandler;
 
-class SaverEngineThreadHelperObject : public TQObject
+// Type of lock screen
+enum LockType : int
 {
-	TQ_OBJECT
-	
-public slots:
-	void terminateThread();
-	void slotLockProcessWaiting();
-	void slotLockProcessFullyActivated();
+	DontLock = 0,
+	DefaultLock,
+	ForceLock,
+	SecureDialog
+};
 
-signals:
-	void lockProcessWaiting();
-	void lockProcessFullyActivated();
+enum SaverState
+{
+	Waiting,
+	Preparing,
+	Engaging,
+	Saving
 };
 
-//===========================================================================
-/**
- * Screen saver engine.  Handles screensaver window, starting screensaver
- * hacks, and password entry.
- */
-class SaverEngine : public TQWidget, public KScreensaverIface
+class SaverEngine : public TQObject, public KScreensaverIface
 {
+	friend class SaverEngineEventHandler;
+
 	TQ_OBJECT
 public:
 	SaverEngine();
@@ -100,80 +115,52 @@ public:
 	 */
 	virtual void saverLockReady();
 
-	/**
-	 * @internal
-	 */
 	void lockScreen(bool DCOP = false);
 
-	/**
-	 * Called by KDesktop to wait for saver engage
-	 * @internal
-	 */
-	bool waitForLockEngage();
-
-	/**
-	 * @internal
-	 */
 	void lockScreenAndDoNewSession();
-
-	/**
-	 * @internal
-	 */
 	void lockScreenAndSwitchSession(int vt);
 
+	void enableExports(); // Enable wallpaper exports
+
 signals:
-	void terminateHelperThread();
-	void asyncLock();
+	void activateSaverOrLockSignal(LockType lock_type);
+	void lockScreenSignal(bool);
+	void terminateEventHandlerThread();
 
 public slots:
-	void slotLockProcessReady();
-	void lockProcessWaiting();
-	void lockProcessFullyActivated();
 	void handleDBusSignal(const TQT_DBusMessage&);
+	void terminateTDESession();
 
 protected slots:
 	void idleTimeout();
-	void lockProcessExited();
 
 private slots:
-	void handleSecureDialog();
-	void slotSAKProcessExited();
-
 	void cryptographicCardInserted(TDECryptographicCardDevice*);
 	void cryptographicCardRemoved(TDECryptographicCardDevice*);
-
-	/**
-	 * Enable wallpaper exports
-	 */
-	void enableExports();
-	void recoverFromHackingAttempt();
 	void cardStartupTimeout();
-
 	bool dBusReconnect();
 
+	// The following slots are invoked by corresponding methods named without the 'GUI' suffix
+	// in 'SaverEngineEventHandler' to complete the remaining X11 part of the actions
+	void activateSaverOrLockGUI();
+	void lockProcessFullyActivatedGUI();
+	void lockScreenGUI();
+	void stopLockProcessGUI();
+
 private:
-	bool restartDesktopLockProcess();
 	void dBusClose();
 	bool dBusConnect();
 	void onDBusServiceRegistered(const TQString&);
 	void onDBusServiceUnregistered(const TQString&);
 
 protected:
-	enum SaverState { Waiting, Preparing, Engaging, Saving };
-	enum LockType { DontLock, DefaultLock, ForceLock, SecureDialog };
-	bool startLockProcess( LockType lock_type );
-	bool waitForLockProcessStart();
-	void stopLockProcess();
-	bool handleKeyPress(XKeyEvent *xke);
 	void processLockTransactions();
 	xautolock_corner_t applyManualSettings(int);
 
 protected:
 	bool mEnabled;
 
-	SaverState mState;
 	XAutoLock *mXAutoLock;
-	TDEProcess mLockProcess;
 	int mTimeout;
 
 	// the original X screensaver parameters
@@ -182,26 +169,60 @@ protected:
 	int mXBlanking;
 	int mXExposures;
 
-	bool mBlankOnly;  // only use the blanker, not the defined saver
 	TQValueVector< DCOPClientTransaction* > mLockTransactions;
 
 public:
-	SaverEngineThreadHelperObject* m_threadHelperObject;
+	bool mBlankOnly;  // only use the blanker, not the defined saver // protected
+	SaverEngineEventHandler *m_saverEngineEventHandler;
 
 private:
-	TQEventLoopThread* m_helperThread;
-	sigset_t mThreadBlockSet;
-	TDEProcess* mSAKProcess;
-	bool mTerminationRequested;
-	bool mSaverProcessReady;
+	TQEventLoopThread* m_eventHandlerThread;
 	bool mNewVTAfterLockEngage;
 	bool mValidCryptoCardInserted;
 	int mSwitchVTAfterLockEngage;
 	struct sigaction mSignalAction;
 	TQT_DBusConnection dBusConn;
-	TQT_DBusProxy* dBusLocal;
-	TQT_DBusProxy* dBusWatch;
-	TQT_DBusProxy* systemdSession;
+	TQT_DBusProxy *dBusLocal;
+	TQT_DBusProxy *dBusWatch;
+	TQT_DBusProxy *systemdSession;
+};
+
+class SaverEngineEventHandler : public TQObject
+{
+	TQ_OBJECT
+	
+public:
+	SaverEngineEventHandler(SaverEngine *engine);
+
+	SaverState getState() const { return m_state; }
+
+	void lockCompleted();
+	void lockFullyActivated();
+	void lockReady();
+	void terminateLockProcess();
+
+public slots:
+	bool activateSaverOrLock(LockType lock_type);
+	void lockScreen(bool DCOP = false);
+	bool restartLockProcess();
+	void saveScreen();
+	void stopLockProcess();
+	void terminateThread();
+
+protected slots:
+	void slotLockProcessExited();
+	void slotSAKProcessExited();
+
+protected:
+	void startSAKProcess();
+
+	bool m_saverProcessReady;
+	bool m_lockProcessRestarting;
+	bool m_terminationRequest;
+	SaverState m_state;
+	SaverEngine *m_saverEngine;
+	TDEProcess *m_SAKProcess;
+	TDEProcess m_lockProcess;
 };
 
 #endif
diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp
index 8892778da..0465068b6 100644
--- a/kdesktop/main.cpp
+++ b/kdesktop/main.cpp
@@ -18,13 +18,13 @@
 */
 
 #include <config.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kopenwith.h>
-#include <kcrash.h>
+#include <tdecrash.h>
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 #include <tdeglobal.h>
@@ -43,7 +43,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
@@ -71,7 +71,7 @@ static TDECmdLineOptions options[] =
 };
 
 bool argb_visual = false;
-KDesktopApp *myApp = NULL;
+KDesktopApp *myApp = nullptr;
 
 // -----------------------------------------------------------------------------
 
@@ -94,8 +94,8 @@ static void signalHandler(int sigId)
     // try to cleanup all windows
     signal(SIGTERM, SIG_DFL); // next one kills
     signal(SIGHUP,  SIG_DFL); // next one kills
-    if (kapp)
-        kapp->quit(); // turn catchable signals into clean shutdown
+    if (tdeApp)
+        tdeApp->quit(); // turn catchable signals into clean shutdown
 }
 
 void KDesktop::slotUpAndRunning()
@@ -105,7 +105,7 @@ void KDesktop::slotUpAndRunning()
         TDECrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
 }
 
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
 {
     //setup signal handling
     signal(SIGTERM, signalHandler);
@@ -184,7 +184,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    if (!KUniqueApplication::start()) {
+    if (!TDEUniqueApplication::start()) {
         fprintf(stderr, "kdesktop is already running!\n");
         exit(0);
     }
@@ -251,7 +251,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
         else
             XCloseDisplay( dpy );
     }
-    if( myApp == NULL )
+    if (!myApp)
         myApp = new KDesktopApp;
 #else
     myApp = new KDesktopApp;
@@ -260,9 +260,6 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 
     KDesktopSettings::instance(kdesktop_name + "rc");
 
-    bool x_root_hack = args->isSet("x-root");
-    bool wait_for_kded = args->isSet("waitforkded");
-
     // This MUST be created before any widgets are created
     SaverEngine saver;
 
@@ -273,22 +270,21 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 
     // Mark kdeskop as immutable if all of its config modules have been disabled
     if (!myApp->config()->isImmutable() &&
-        kapp->authorizeControlModules(KRootWm::configModules()).isEmpty())
+        tdeApp->authorizeControlModules(KRootWm::configModules()).isEmpty())
     {
        myApp->config()->setReadOnly(true);
        myApp->config()->reparseConfiguration();
     }
 
-    // for the KDE-already-running check in starttde
-    TDESelectionOwner kde_running( "_KDE_RUNNING", 0 );
-    kde_running.claim( false );
+    // for the TDE-already-running check in starttde
+    TDESelectionOwner tde_running( "_KDE_RUNNING", 0 );
+    tde_running.claim( false );
 
+    bool x_root_hack = args->isSet("x-root");
+    bool wait_for_kded = args->isSet("waitforkded");
     KDesktop desktop( &saver, x_root_hack, wait_for_kded );
 
     args->clear();
-
     myApp->dcopClient()->setDefaultObject( "KDesktopIface" );
-
-	
     return myApp->exec();
 }
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index da4d18d30..2ac8b3ecd 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -50,7 +50,7 @@
 #include <dcopclient.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
@@ -59,7 +59,7 @@
 #include <krun.h>
 #include <twin.h>
 #include <tdesu/su.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
@@ -101,7 +101,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
   // Cancel button...
   m_dlg->pbCancel->setGuiItem ( KStdGuiItem::cancel() );
 
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
     m_dlg->pbOptions->hide();
 
   m_dlg->pbRun->setEnabled(!m_dlg->cbCommand->currentText().isEmpty());
@@ -131,34 +131,34 @@ Minicli::Minicli( TQWidget *parent, const char *name)
   m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion);
   m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion);
   //m_pURLCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
-  connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) ));
-  connect( m_pEXECompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotEXEMatch(const TQString&) ));
+  connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotMatch(const TQString&) ));
+  connect( m_pEXECompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotEXEMatch(const TQString&) ));
 
   // Main widget buttons...
-  connect( m_dlg->pbRun, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
-  connect( m_dlg->pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-  connect( m_dlg->pbOptions, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdvanced()) );
-  connect( m_parseTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotParseTimer()) );
+  connect( m_dlg->pbRun, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) );
+  connect( m_dlg->pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) );
+  connect( m_dlg->pbOptions, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdvanced()) );
+  connect( m_parseTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotParseTimer()) );
 
-  connect( m_dlg->cbCommand, TQT_SIGNAL( textChanged( const TQString& ) ),
-           TQT_SLOT( slotCmdChanged(const TQString&) ) );
+  connect( m_dlg->cbCommand, TQ_SIGNAL( textChanged( const TQString& ) ),
+           TQ_SLOT( slotCmdChanged(const TQString&) ) );
 
-  connect( m_dlg->cbCommand, TQT_SIGNAL( returnPressed() ),
-           m_dlg->pbRun, TQT_SLOT( animateClick() ) );
+  connect( m_dlg->cbCommand, TQ_SIGNAL( returnPressed() ),
+           m_dlg->pbRun, TQ_SLOT( animateClick() ) );
 
   m_dlg->cbCommand->setHistoryEditorEnabled( true );
-  connect( m_dlg->cbCommand, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(saveConfig()) );
+  connect( m_dlg->cbCommand, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(saveConfig()) );
 
   // Advanced group box...
-  connect(m_dlg->cbPriority, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeScheduler(bool)));
-  connect(m_dlg->slPriority, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPriority(int)));
-  connect(m_dlg->cbRealtime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRealtime(bool)));
-  connect(m_dlg->cbAppcomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAppcompleteToggled(bool)));
-  connect(m_dlg->cbAutocomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutocompleteToggled(bool)));
-  connect(m_dlg->cbAutohistory, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutohistoryToggled(bool)));
-  connect(m_dlg->cbRunAsOther, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeUid(bool)));
-  connect(m_dlg->leUsername, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateAuthLabel()));
-  connect(m_dlg->cbRunInTerminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminal(bool)));
+  connect(m_dlg->cbPriority, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeScheduler(bool)));
+  connect(m_dlg->slPriority, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotPriority(int)));
+  connect(m_dlg->cbRealtime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRealtime(bool)));
+  connect(m_dlg->cbAppcomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAppcompleteToggled(bool)));
+  connect(m_dlg->cbAutocomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutocompleteToggled(bool)));
+  connect(m_dlg->cbAutohistory, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutohistoryToggled(bool)));
+  connect(m_dlg->cbRunAsOther, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeUid(bool)));
+  connect(m_dlg->leUsername, TQ_SIGNAL(lostFocus()), TQ_SLOT(updateAuthLabel()));
+  connect(m_dlg->cbRunInTerminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminal(bool)));
 
   m_dlg->slPriority->setValue(50);
 
@@ -317,8 +317,8 @@ void Minicli::accept()
 
   if ( logout )
   {
-     kapp->propagateSessionManager();
-     kapp->requestShutDown();
+     tdeApp->propagateSessionManager();
+     tdeApp->requestShutDown();
   }
   if ( lock )
   {
@@ -326,7 +326,7 @@ void Minicli::accept()
      int kicker_screen_number = tqt_xscreen();
      if ( kicker_screen_number )
          appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-     kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+     tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
   }
 }
 
@@ -437,7 +437,7 @@ int Minicli::runCommand()
 
   kdDebug (1207) << "Use terminal ? " << useTerminal << endl;
 
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
     useTerminal = false;
 
   if( needsTDEsu() )
@@ -585,7 +585,7 @@ int Minicli::runCommand()
         // fall-through to shell case
         case KURIFilterData::SHELL:
         {
-          if (kapp->authorize("shell_access"))
+          if (tdeApp->authorize("shell_access"))
           {
             exec = cmd;
 
@@ -651,7 +651,7 @@ void Minicli::notifyServiceStarted(KService::Ptr service)
     TQDataStream stream(params, IO_WriteOnly);
     stream << "minicli" << service->storageId();
     kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
-    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 }
 
diff --git a/kdesktop/pics/ksslogo.png b/kdesktop/pics/ksslogo.png
index 466215dee..db984eedf 100644..100755
--- a/kdesktop/pics/ksslogo.png
+++ b/kdesktop/pics/ksslogo.png
diff --git a/kdesktop/pics/splash.png b/kdesktop/pics/splash.png
index 1d5738697..52d76596f 100644..100755
--- a/kdesktop/pics/splash.png
+++ b/kdesktop/pics/splash.png
diff --git a/kdesktop/pixmapserver.cpp b/kdesktop/pixmapserver.cpp
index 56224f37a..b60942277 100644
--- a/kdesktop/pixmapserver.cpp
+++ b/kdesktop/pixmapserver.cpp
@@ -39,7 +39,7 @@
 KPixmapServer::KPixmapServer()
     : TQWidget(0L, "shpixmap comm window")
 {
-    kapp->installX11EventFilter(this);
+    tdeApp->installX11EventFilter(this);
     pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false);
 }
 
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index d7b1cf75a..2aeac904a 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -54,18 +54,18 @@ StartupId::StartupId( TQWidget* parent, const char* name )
         XWindowAttributes attrs;
         XGetWindowAttributes( tqt_xdisplay(), tqt_xrootwin(), &attrs);
         XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
-        kapp->installX11EventFilter( this );
+        tdeApp->installX11EventFilter( this );
         }
-    connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( update_startupid()));
+    connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( update_startupid()));
     connect( &startup_info,
-        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( &startup_info,
-        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( &startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
+        TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
     }
 
 StartupId::~StartupId()
@@ -129,10 +129,10 @@ bool StartupId::x11Event( XEvent* e )
             if( startups.count() == 0 )
                 start_startupid( KDE_STARTUP_ICON );
             // 60(?) sec timeout - shouldn't be hopefully needed anyway, ksmserver should have it too
-            TQTimer::singleShot( 60000, this, TQT_SLOT( finishKDEStartup()));
+            TQTimer::singleShot( 60000, this, TQ_SLOT( finishKDEStartup()));
             }
         else if( strcmp( s, "session ready" ) == 0 && kde_startup_status < StartupDone )
-            TQTimer::singleShot( 2000, this, TQT_SLOT( finishKDEStartup()));
+            TQTimer::singleShot( 2000, this, TQ_SLOT( finishKDEStartup()));
         }
     return false;
     }
@@ -140,7 +140,7 @@ bool StartupId::x11Event( XEvent* e )
 void StartupId::finishKDEStartup()
     {
     kde_startup_status = StartupDone;
-    kapp->removeX11EventFilter( this );
+    tdeApp->removeX11EventFilter( this );
     if( startups.count() == 0 )
         stop_startupid();
     }
diff --git a/kdesktop/tdefileividesktop.cpp b/kdesktop/tdefileividesktop.cpp
index bf9aa074c..464b5490d 100644
--- a/kdesktop/tdefileividesktop.cpp
+++ b/kdesktop/tdefileividesktop.cpp
@@ -144,10 +144,10 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
 
   int textX;
   if (drawRoundedRect == true)
-    textX = textRect( FALSE ).x() + 4;
+    textX = textRect( false ).x() + 4;
   else
-    textX = textRect( FALSE ).x() + 2;
-  int textY = textRect( FALSE ).y();
+    textX = textRect( false ).x() + 2;
+  int textY = textRect( false ).y();
   int align = ((TDEIconView *) iconView())->itemTextPos() == TQIconView::Bottom
     ? AlignHCenter : AlignAuto;
   // FIXME
@@ -222,11 +222,11 @@ TQImage *KFileIVIDesktop::buildShadow( TQPainter *p, const int align,
   TQPainter pixPainter;
   int spread = shadowThickness();
 
-  TQPixmap textPixmap(textRect( FALSE ).width() + spread * 2 + 2,
-    textRect( FALSE ).height() + spread * 2 + 2);
+  TQPixmap textPixmap(textRect( false ).width() + spread * 2 + 2,
+    textRect( false ).height() + spread * 2 + 2);
 
   textPixmap.fill(TQColor(0,0,0));
-  textPixmap.setMask( textPixmap.createHeuristicMask(TRUE) );
+  textPixmap.setMask( textPixmap.createHeuristicMask(true) );
 
   pixPainter.begin(&textPixmap);
   pixPainter.setPen(white);    // get the pen from the root painter
diff --git a/kdesktop/xautolock.cpp b/kdesktop/xautolock.cpp
index 3c7e62670..95de8f3d6 100644
--- a/kdesktop/xautolock.cpp
+++ b/kdesktop/xautolock.cpp
@@ -71,7 +71,7 @@ XAutoLock::XAutoLock()
 #endif
     if( !xautolock_useXidle && !xautolock_useMit )
     {
-        kapp->installX11EventFilter( this );
+        tdeApp->installX11EventFilter( this );
         int (*oldHandler)(Display *, XErrorEvent *);
         oldHandler = XSetErrorHandler(catchFalseAlarms);
         XSync(tqt_xdisplay(), False );
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index fa2512077..5d2c90ae2 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -48,7 +48,7 @@
 #include <kicondialog.h>
 #include <kdirselectdialog.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <netwm.h>
 #endif
 
@@ -56,9 +56,9 @@
 
 using namespace std;
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
 extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 static TDECmdLineOptions options[] =
 {
@@ -95,6 +95,7 @@ static TDECmdLineOptions options[] =
     { "separate-output", I18N_NOOP("Return list items on separate lines (for checklist option and file open with --multiple)"), 0 },
     { "print-winid", I18N_NOOP("Outputs the winId of each dialog"), 0 },
     { "embed <winid>", I18N_NOOP("Makes the dialog transient for an X app specified by winid"), 0 },
+    { "attach <winid>", I18N_NOOP("Alias for --embed <winid>"), 0 },
     { "dontagain <file:entry>", I18N_NOOP("Config file and option name for saving the \"dont-show/ask-again\" state"), 0 },
 
     { "+[arg]", I18N_NOOP("Arguments - depending on main option"), 0 },
@@ -125,10 +126,10 @@ bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e)
     if (e->type() == TQEvent::Show && o->isWidgetType()
         && o->inherits("KDialog"))
     {
-        TQWidget *w = TQT_TQWIDGET(o);
+        TQWidget *w = static_cast<TQWidget*>(o);
         if (print)
             cout << "winId: " << w->winId() << endl;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         if (id)
             XSetTransientForHint(w->x11Display(), w->winId(), id);
 #endif
@@ -155,9 +156,9 @@ static void outputStringList(TQStringList list, bool separateOutput)
 static int directCommand(TDECmdLineArgs *args)
 {
     TQString title;
-    bool separateOutput = FALSE;
+    bool separateOutput = false;
     bool printWId = args->isSet("print-winid");
-    bool embed = args->isSet("embed");
+    bool embed = args->isSet("embed") || args->isSet("attach");
     TQString defaultEntry;
 
     // --title text
@@ -169,16 +170,27 @@ static int directCommand(TDECmdLineArgs *args)
     // --separate-output
     if (args->isSet("separate-output"))
     {
-      separateOutput = TRUE;
+      separateOutput = true;
     }
     if (printWId || embed)
     {
       WId id = 0;
       if (embed) {
           bool ok;
-          long l = args->getOption("embed").toLong(&ok);
+          long l = 0;
+          if (args->isSet("embed"))
+          {
+            l = args->getOption("embed").toLong(&ok);
+          }
+          else if (args->isSet("attach"))
+          {
+              l = args->getOption("attach").toLong(&ok);
+          }
+
           if (ok)
-              id = (WId)l;
+          {
+            id = (WId)l;
+          }
       }
       (void)new WinIdEmbedder(printWId, id);
     }
@@ -301,15 +313,15 @@ static int directCommand(TDECmdLineArgs *args)
 						       0, // name
 						       duration );
 	TQTimer *timer = new TQTimer();
-	TQObject::connect( timer, TQT_SIGNAL( timeout() ), kapp, TQT_SLOT( quit() ) );
-	TQObject::connect( popup, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
-	timer->start( duration, TRUE );
+	TQObject::connect( timer, TQ_SIGNAL( timeout() ), tdeApp, TQ_SLOT( quit() ) );
+	TQObject::connect( popup, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) );
+	timer->start( duration, true );
 
-#ifdef Q_WS_X11	
-	if ( ! kapp->geometryArgument().isEmpty()) {
+#ifdef TQ_WS_X11
+	if ( ! tdeApp->geometryArgument().isEmpty()) {
 	    int x, y;
 	    int w, h;
-	    int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
+	    int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	    if ( (m & XNegative) )
 		x = TDEApplication::desktop()->width()  + x - w;
 	    if ( (m & YNegative) )
@@ -317,7 +329,7 @@ static int directCommand(TDECmdLineArgs *args)
 	    popup->setAnchor( TQPoint(x, y) );
 	}
 #endif
-	kapp->exec();
+	tdeApp->exec();
 	return 0;
       }
 
@@ -457,10 +469,10 @@ static int directCommand(TDECmdLineArgs *args)
 	    dlg.setMode(KFile::File | KFile::LocalOnly);
 	}
 	Widgets::handleXGeometry(&dlg);
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setCaption(title.isNull() ? i18n("Open") : title);
 	dlg.exec();
-	
+
         if (args->isSet("multiple")) {
 	    TQStringList result = dlg.selectedFiles();
 	    if ( !result.isEmpty() ) {
@@ -498,7 +510,7 @@ static int directCommand(TDECmdLineArgs *args)
 	    dlg.setSelection( startDir );
 	dlg.setOperationMode( KFileDialog::Saving );
 	Widgets::handleXGeometry(&dlg);
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setCaption(title.isNull() ? i18n("Save As") : title);
 	dlg.exec();
 
@@ -525,7 +537,7 @@ static int directCommand(TDECmdLineArgs *args)
         TQString startDir;
         startDir = TQString::fromLocal8Bit(args->getOption("getexistingdirectory"));
 	TQString result;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	result = TQFileDialog::getExistingDirectory(startDir, 0, "getExistingDirectory",
 							   title, true, true);
 #else
@@ -533,7 +545,7 @@ static int directCommand(TDECmdLineArgs *args)
 	KDirSelectDialog myDialog( startDir, true, 0,
 				   "kdirselect dialog", true );
 
-	kapp->setTopWidget( &myDialog );
+	tdeApp->setTopWidget( &myDialog );
 
 	Widgets::handleXGeometry(&myDialog);
 	if ( !title.isNull() )
@@ -569,10 +581,10 @@ static int directCommand(TDECmdLineArgs *args)
 	    dlg.setMode(KFile::File);
 	}
 	Widgets::handleXGeometry(&dlg);
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setCaption(title.isNull() ? i18n("Open") : title);
 	dlg.exec();
-	
+
         if (args->isSet("multiple")) {
 	    KURL::List result = dlg.selectedURLs();
 	    if ( !result.isEmpty() ) {
@@ -637,7 +649,7 @@ static int directCommand(TDECmdLineArgs *args)
             context = TDEIcon::StatusIcon;
 
 	TDEIconDialog dlg(0, "icon dialog");
-	kapp->setTopWidget( &dlg );
+	tdeApp->setTopWidget( &dlg );
 	dlg.setup( group, context);
 	if (!title.isNull())
 	    dlg.setCaption(title);
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index f68acfe4f..8a92a5dd3 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -35,17 +35,17 @@
 #include <tqvbox.h>
 #include <tqfile.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <netwm.h>
 #endif
 
 void Widgets::handleXGeometry(TQWidget * dlg)
 {
-#ifdef Q_WS_X11
-    if ( ! kapp->geometryArgument().isEmpty()) {
+#ifdef TQ_WS_X11
+    if ( ! tdeApp->geometryArgument().isEmpty()) {
 	int x, y;
 	int w, h;
-	int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
+	int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
 	if ( (m & XNegative) )
 	    x = TDEApplication::desktop()->width()  + x - w;
 	if ( (m & YNegative) )
@@ -69,7 +69,7 @@ bool Widgets::passwordBox(TQWidget *parent, const TQString& title, const TQStrin
 {
   KPasswordDialog dlg( KPasswordDialog::Password, false, 0, parent );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   dlg.setCaption(title);
   dlg.setPrompt(text);
 
@@ -83,12 +83,12 @@ bool Widgets::passwordBox(TQWidget *parent, const TQString& title, const TQStrin
 
 int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& title, const TQString& file)
 {
-//  KTextBox dlg(parent, 0, TRUE, width, height, file);
+//  KTextBox dlg(parent, 0, true, width, height, file);
   KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   KTextEdit *edit = new KTextEdit( dlg.makeVBoxMainWidget() );
-  edit->setReadOnly(TRUE);
+  edit->setReadOnly(true);
 
   TQFile f(file);
   if (!f.open(IO_ReadOnly))
@@ -116,10 +116,10 @@ int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& ti
 
 int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQString& title, const TQStringList& args, TQCString &result)
 {
-//  KTextBox dlg(parent, 0, TRUE, width, height, file);
+//  KTextBox dlg(parent, 0, true, width, height, file);
   KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   TQVBox* vbox = dlg.makeVBoxMainWidget();
 
   if( args.count() > 0 )
@@ -129,7 +129,7 @@ int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQStrin
   }
 
   KTextEdit *edit = new KTextEdit( vbox );
-  edit->setReadOnly(FALSE);
+  edit->setReadOnly(false);
   edit->setTextFormat( TQt::PlainText );
   edit->setFocus();
 
@@ -152,7 +152,7 @@ bool Widgets::comboBox(TQWidget *parent, const TQString& title, const TQString&
   KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok|KDialogBase::Cancel,
                    KDialogBase::Ok );
 
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   dlg.setCaption(title);
   TQVBox* vbox = dlg.makeVBoxMainWidget();
 
@@ -177,7 +177,7 @@ bool Widgets::listBox(TQWidget *parent, const TQString& title, const TQString& t
 {
   TDEListBoxDialog box(text,parent);
 
-  kapp->setTopWidget( &box );
+  tdeApp->setTopWidget( &box );
   box.setCaption(title);
 
   for (unsigned int i = 0; i+1<args.count(); i += 2) {
@@ -205,7 +205,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
 
   TQListBox &table = box.getTable();
 
-  kapp->setTopWidget( &box );
+  tdeApp->setTopWidget( &box );
   box.setCaption(title);
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
@@ -214,7 +214,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
   }
 
   table.insertStringList(entries);
-  table.setMultiSelection(TRUE);
+  table.setMultiSelection(true);
   table.setCurrentItem(0); // This is to circumvent a Qt bug
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
@@ -249,7 +249,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
 
   TQListBox &table = box.getTable();
 
-  kapp->setTopWidget( &box );
+  tdeApp->setTopWidget( &box );
   box.setCaption(title);
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
@@ -274,7 +274,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
 bool Widgets::progressBar(TQWidget *parent, const TQString& title, const TQString& text, int totalSteps)
 {
   ProgressDialog dlg( parent, title, text, totalSteps );
-  kapp->setTopWidget( &dlg );
+  tdeApp->setTopWidget( &dlg );
   dlg.setCaption( title );
   handleXGeometry(&dlg);
   dlg.exec();
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 05e6148a9..c22806d75 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -16,13 +16,13 @@
 
 #include "kdatecombo.moc"
 
-KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(FALSE, parent,name)
+KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(false, parent,name)
 {
   TQDate date = TQDate::currentDate();
   initObject(date, parent, name);
 }
 
-KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name) : TQComboBox(FALSE, parent,name)
+KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name) : TQComboBox(false, parent,name)
 {
   initObject(date, parent, name);
 }
@@ -38,7 +38,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *)
   popupFrame->setMainWidget(datePicker);
   setDate(date);
 
-  connect(datePicker, TQT_SIGNAL(dateSelected(TQDate)), this, TQT_SLOT(dateEnteredEvent(TQDate)));
+  connect(datePicker, TQ_SIGNAL(dateSelected(TQDate)), this, TQ_SLOT(dateEnteredEvent(TQDate)));
 }
 
 KDateCombo::~KDateCombo()
@@ -69,9 +69,9 @@ bool KDateCombo::setDate(const TQDate & newDate)
     if (count())
       clear();
     insertItem(date2String(newDate));
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 void KDateCombo::dateEnteredEvent(TQDate newDate)
@@ -105,7 +105,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
       TQPoint p = mapFromGlobal( me->globalPos() );
       if (rect().contains( p ) )
       {
-        TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent()));
+        TQTimer::singleShot(10, this, TQ_SLOT(dateEnteredEvent()));
         return true;
       }
   }
diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp
index 1675d9d71..bcf1e3cd8 100644
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@@ -71,17 +71,17 @@ Kfind::Kfind(TQWidget *parent, const char *name)
 
   mSearch = new KPushButton( KGuiItem(i18n("&Find"), "edit-find"), mButtonBox );
   mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
-  connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) );
+  connect( mSearch, TQ_SIGNAL(clicked()), this, TQ_SLOT( startSearch() ) );
   mStop = new KPushButton( KGuiItem(i18n("Stop"), "process-stop"), mButtonBox );
-  connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );
+  connect( mStop, TQ_SIGNAL(clicked()), this, TQ_SLOT( stopSearch() ) );
   mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox );
-  connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) );
+  connect( mSave, TQ_SIGNAL(clicked()), this, TQ_SLOT( saveResults() ) );
 
   KPushButton * mClose = new KPushButton( KStdGuiItem::close(), mButtonBox );
-  connect( mClose, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( destroyMe() ) );
+  connect( mClose, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( destroyMe() ) );
 
   // react to search requests from widget
-  connect( tabWidget, TQT_SIGNAL(startSearch()), this, TQT_SLOT( startSearch() ) );
+  connect( tabWidget, TQ_SIGNAL(startSearch()), this, TQ_SLOT( startSearch() ) );
 
   mSearch->setEnabled(true); // Enable "Search"
   mStop->setEnabled(false);  // Disable "Stop"
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index ff47a2776..2e9dbf235 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -14,7 +14,7 @@
 #include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeaboutapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kftabdlg.h"
 #include "kquery.h"
@@ -62,20 +62,20 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
   vBox->addWidget(win, 1);
   vBox->addWidget(mStatusBar, 0);
 
-  connect(this, TQT_SIGNAL(applyClicked()),
-	  this, TQT_SLOT(startSearch()));
-  connect(this, TQT_SIGNAL(user1Clicked()),
-	  this, TQT_SLOT(stopSearch()));
-  connect(this, TQT_SIGNAL(user2Clicked()),
-	  win, TQT_SLOT(saveResults()));
+  connect(this, TQ_SIGNAL(applyClicked()),
+	  this, TQ_SLOT(startSearch()));
+  connect(this, TQ_SIGNAL(user1Clicked()),
+	  this, TQ_SLOT(stopSearch()));
+  connect(this, TQ_SIGNAL(user2Clicked()),
+	  win, TQ_SLOT(saveResults()));
 
-  connect(win ,TQT_SIGNAL(resultSelected(bool)),
-	  this,TQT_SIGNAL(resultSelected(bool)));
+  connect(win ,TQ_SIGNAL(resultSelected(bool)),
+	  this,TQ_SIGNAL(resultSelected(bool)));
 
-  query = new KQuery(TQT_TQOBJECT(frame));
-  connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)),
-	  TQT_SLOT(addFile(const KFileItem*,const TQString&)));
-  connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int)));
+  query = new KQuery(frame);
+  connect(query, TQ_SIGNAL(addFile(const KFileItem*,const TQString&)),
+	  TQ_SLOT(addFile(const KFileItem*,const TQString&)));
+  connect(query, TQ_SIGNAL(result(int)), TQ_SLOT(slotResult(int)));
 
   dirwatch=NULL;
 }
@@ -121,8 +121,8 @@ void KfindDlg::startSearch()
   if(dirwatch!=NULL)
     delete dirwatch;
   dirwatch=new KDirWatch();
-  connect(dirwatch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotNewItems(const TQString&)));
-  connect(dirwatch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteItem(const TQString&)));
+  connect(dirwatch, TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(slotNewItems(const TQString&)));
+  connect(dirwatch, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(slotDeleteItem(const TQString&)));
   dirwatch->addDir(query->url().path(),true);
 
 #if 0
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 54de01e9b..760c6a42f 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -26,7 +26,7 @@
 #include <tdelocale.h>
 
 #include <tqdir.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 class KonqDirPart;
 
@@ -53,18 +53,18 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName,
 
     setWidget( m_kfindWidget );
 
-    connect( m_kfindWidget, TQT_SIGNAL(started()),
-             this, TQT_SLOT(slotStarted()) );
-    connect( m_kfindWidget, TQT_SIGNAL(destroyMe()),
-             this, TQT_SLOT(slotDestroyMe()) );
-    connect(m_kfindWidget->dirlister,TQT_SIGNAL(deleteItem(KFileItem*)), this, TQT_SLOT(removeFile(KFileItem*)));
-    connect(m_kfindWidget->dirlister,TQT_SIGNAL(newItems(const KFileItemList&)), this, TQT_SLOT(newFiles(const KFileItemList&)));
+    connect( m_kfindWidget, TQ_SIGNAL(started()),
+             this, TQ_SLOT(slotStarted()) );
+    connect( m_kfindWidget, TQ_SIGNAL(destroyMe()),
+             this, TQ_SLOT(slotDestroyMe()) );
+    connect(m_kfindWidget->dirlister,TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SLOT(removeFile(KFileItem*)));
+    connect(m_kfindWidget->dirlister,TQ_SIGNAL(newItems(const KFileItemList&)), this, TQ_SLOT(newFiles(const KFileItemList&)));
     //setXMLFile( "kfind.rc" );
     query = new KQuery(this);
-    connect(query, TQT_SIGNAL(addFile(const KFileItem *, const TQString&)),
-            TQT_SLOT(addFile(const KFileItem *, const TQString&)));
-    connect(query, TQT_SIGNAL(result(int)),
-            TQT_SLOT(slotResult(int)));
+    connect(query, TQ_SIGNAL(addFile(const KFileItem *, const TQString&)),
+            TQ_SLOT(addFile(const KFileItem *, const TQString&)));
+    connect(query, TQ_SIGNAL(result(int)),
+            TQ_SLOT(slotResult(int)));
 
     m_kfindWidget->setQuery(query);
     m_bShowsResult = false;
diff --git a/kfind/kfindpart.kdevprj b/kfind/kfindpart.kdevprj
deleted file mode 100644
index d9fbfc7e2..000000000
--- a/kfind/kfindpart.kdevprj
+++ /dev/null
@@ -1,178 +0,0 @@
-[./AUTHORS]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[./ChangeLog]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[./Makefile.am]
-files=./AUTHORS,./ChangeLog,./README,./TODO,./findpart.desktop,./kfind.cpp,./kfind.h,./kfindpart.cpp,./kfindpart.desktop,./kfindpart.h,./kftabdlg.cpp,./kftabdlg.h,./kquery.cpp,./kquery.h,./version.h,./kfindpart.kdevprj,
-sub_dirs=pics,
-type=normal
-
-[./README]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[./TODO]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[./findpart.desktop]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[./kfind.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[./kfind.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[./kfindpart.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[./kfindpart.desktop]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[./kfindpart.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[./kfindpart.kdevprj]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[./kftabdlg.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[./kftabdlg.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[./kquery.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[./kquery.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[./version.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[Config for BinMakefileAm]
-addcxxflags=
-bin_program=kfindpart
-cxxflags=
-ldadd=
-ldflags=
-
-[General]
-AMChanged=false
-author=eric
-email=eric@darkstar.fr
-kdevprj_version=1.3
-lfv_open_groups=
-makefiles=./Makefile.am,pics/Makefile.am,
-project_name=kfindpart
-project_type=normal_empty
-sub_dir=
-version=
-version_control=CVS
-workspace=1
-
-[LFV Groups]
-Desktop=*.desktop,
-GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS,
-Headers=*.h,*.hxx,*.hpp,*.H,
-Others=*,
-Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l,
-Translations=*.ts,*.po,
-User Interface=*.ui,*.kdevdlg,*.rc,
-groups=Headers,Sources,GNU,Translations,User Interface,Desktop,Others
-
-[pics/Makefile.am]
-files=pics/lo22-action-archive.png,pics/lo22-action-delete.png,pics/lo22-action-idea.png,pics/lo22-action-info.png,pics/lo22-action-openfile.png,pics/lo22-action-save.png,pics/lo22-action-search.png,
-sub_dirs=
-type=normal
-
-[pics/lo22-action-archive.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[pics/lo22-action-delete.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[pics/lo22-action-idea.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[pics/lo22-action-info.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[pics/lo22-action-openfile.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[pics/lo22-action-save.png]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[pics/lo22-action-search.png]
-dist=true
-install=false
-install_location=
-type=DATA
diff --git a/kfind/kfindpart.kdevses b/kfind/kfindpart.kdevses
deleted file mode 100644
index 3a5983ecf..000000000
--- a/kfind/kfindpart.kdevses
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE KDevPrjSession>
-<KDevPrjSession>
- <Mainframe MaximizeMode="0" />
- <DocsAndViews NumberOfDocuments="4" >
-  <Doc0 CursorPosLine="44" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kfind.cpp" >
-   <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
-  </Doc0>
-  <Doc1 CursorPosLine="20" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kfind.h" >
-   <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
-  </Doc1>
-  <Doc2 CursorPosLine="31" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kftabdlg.h" >
-   <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" />
-  </Doc2>
-  <Doc3 CursorPosLine="51" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kftabdlg.cpp" >
-   <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="1" Type="KWriteView" MinMaxMode="0" />
-  </Doc3>
- </DocsAndViews>
- <LastCompileConfig>(Default)</LastCompileConfig>
-</KDevPrjSession>
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 240b223bf..919972a0a 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -25,7 +25,7 @@
 #include <tdefiledialog.h>
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kquery.h"
 #include "kftabdlg.h"
@@ -59,11 +59,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     pages[0] = new TQWidget( this, "page1" );
 
-    nameBox = new KComboBox(TRUE, pages[0], "combo1");
+    nameBox = new KComboBox(true, pages[0], "combo1");
     nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
     TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named");
     TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") );
-    dirBox  = new KComboBox(TRUE, pages[0], "combo2");
+    dirBox  = new KComboBox(true, pages[0], "combo2");
     dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
     TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named");
     subdirsCb  = new TQCheckBox(i18n("Include &subfolders"), pages[0]);
@@ -79,9 +79,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     if(TDEStandardDirs::findExe("locate")==NULL)
     	useLocateCb->setEnabled(false);
 
-    nameBox->setDuplicatesEnabled(FALSE);
+    nameBox->setDuplicatesEnabled(false);
     nameBox->setFocus();
-    dirBox->setDuplicatesEnabled(FALSE);
+    dirBox->setDuplicatesEnabled(false);
 
     nameBox->setInsertionPolicy(TQComboBox::AtTop);
     dirBox->setInsertionPolicy(TQComboBox::AtTop);
@@ -134,11 +134,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     // Signals
 
-    connect( browseB, TQT_SIGNAL(clicked()),
-             this, TQT_SLOT(getDirectory()) );
+    connect( browseB, TQ_SIGNAL(clicked()),
+             this, TQ_SLOT(getDirectory()) );
 
-    connect( nameBox, TQT_SIGNAL(activated(int)),
-             this, TQT_SIGNAL(startSearch()));
+    connect( nameBox, TQ_SIGNAL(activated(int)),
+             this, TQ_SIGNAL(startSearch()));
 
     // ************ Page Two
 
@@ -149,7 +149,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     rb[0] = new TQRadioButton(i18n("&between"), pages[1] );
     rb[1] = new TQRadioButton(i18n("&during the previous"), pages[1] );
     TQLabel * andL   = new TQLabel(i18n("and"), pages[1], "and");
-    betweenType = new KComboBox(FALSE, pages[1], "comboBetweenType");
+    betweenType = new KComboBox(false, pages[1], "comboBetweenType");
     betweenType->insertItem(i18n("minute(s)"));
     betweenType->insertItem(i18n("hour(s)"));
     betweenType->insertItem(i18n("day(s)"));
@@ -164,11 +164,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     toDate = new KDateCombo(pages[1], "toDate");
     timeBox = new TQSpinBox(1, 60, 1, pages[1], "timeBox");
 
-    sizeBox =new KComboBox(FALSE, pages[1], "sizeBox");
+    sizeBox =new KComboBox(false, pages[1], "sizeBox");
     TQLabel * sizeL   =new TQLabel(sizeBox,i18n("File &size is:"), pages[1],"size");
     sizeEdit=new TQSpinBox(0, INT_MAX, 1, pages[1], "sizeEdit" );
     sizeEdit->setValue(1);
-    sizeUnitBox =new KComboBox(FALSE, pages[1], "sizeUnitBox");
+    sizeUnitBox =new KComboBox(false, pages[1], "sizeUnitBox");
 
     m_usernameBox = new KComboBox( true, pages[1], "m_combo1");
     TQLabel *usernameLabel= new TQLabel(m_usernameBox,i18n("Files owned by &user:"),pages[1]);
@@ -189,8 +189,8 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
     sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
 
-    m_usernameBox->setDuplicatesEnabled(FALSE);
-    m_groupBox->setDuplicatesEnabled(FALSE);
+    m_usernameBox->setDuplicatesEnabled(false);
+    m_groupBox->setDuplicatesEnabled(false);
     m_usernameBox->setInsertionPolicy(TQComboBox::AtTop);
     m_groupBox->setInsertionPolicy(TQComboBox::AtTop);
 
@@ -235,22 +235,22 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     grid1->setRowStretch(6,1);
 
     // Connect
-    connect( findCreated,  TQT_SIGNAL(toggled(bool)),   TQT_SLOT(fixLayout()) );
-    connect( bg,  TQT_SIGNAL(clicked(int)), this,   TQT_SLOT(fixLayout()) );
-    connect( sizeBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSizeBoxChanged(int)));
+    connect( findCreated,  TQ_SIGNAL(toggled(bool)),   TQ_SLOT(fixLayout()) );
+    connect( bg,  TQ_SIGNAL(clicked(int)), this,   TQ_SLOT(fixLayout()) );
+    connect( sizeBox, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSizeBoxChanged(int)));
 
 
     // ************ Page Three
 
     pages[2] = new TQWidget( this, "page3" );
 
-    typeBox =new KComboBox(FALSE, pages[2], "typeBox");
+    typeBox =new KComboBox(false, pages[2], "typeBox");
     typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
     TQLabel * typeL   =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type");
     textEdit=new KLineEdit(pages[2], "textEdit" );
     TQLabel * textL   =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text");
 
-    connect( textEdit, TQT_SIGNAL(returnPressed(const TQString &)), TQT_SIGNAL( startSearch()));
+    connect( textEdit, TQ_SIGNAL(returnPressed(const TQString &)), TQ_SIGNAL( startSearch()));
 
     const TQString containingtext
       = i18n("<qt>If specified, only files that contain this text"
@@ -306,9 +306,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     if ( editRegExp ) {
       // The editor was available, so lets use it.
-      connect( regexpContentCb, TQT_SIGNAL(toggled(bool) ), editRegExp, TQT_SLOT(setEnabled(bool)) );
+      connect( regexpContentCb, TQ_SIGNAL(toggled(bool) ), editRegExp, TQ_SLOT(setEnabled(bool)) );
       editRegExp->setEnabled(false);
-      connect( editRegExp, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditRegExp() ) );
+      connect( editRegExp, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotEditRegExp() ) );
     }
     else
         regexpContentCb->hide();
@@ -496,7 +496,7 @@ void KfindTabWidget::loadHistory()
 void KfindTabWidget::slotEditRegExp()
 {
   if ( ! regExpDialog )
-    regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+    regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
 
   KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->tqt_cast( "KRegExpEditorInterface" ) );
   if ( !iface )
@@ -543,18 +543,18 @@ void KfindTabWidget::setDefaults()
 bool KfindTabWidget::isDateValid()
 {
   // All files
-  if ( !findCreated->isChecked() ) return TRUE;
+  if ( !findCreated->isChecked() ) return true;
 
   if (rb[1]->isChecked())
   {
-    if (timeBox->value() > 0 ) return TRUE;
+    if (timeBox->value() > 0 ) return true;
 
     KMessageBox::sorry(this, i18n("Unable to search within a period that is less than a minute."));
-    return FALSE;
+    return false;
   }
 
   // If we can not parse either of the dates or
-  // "from" date is bigger than "to" date return FALSE.
+  // "from" date is bigger than "to" date return false.
   TQDate hi1, hi2;
 
   TQString str;
@@ -568,9 +568,9 @@ bool KfindTabWidget::isDateValid()
 
   if (!str.isNull()) {
     KMessageBox::sorry(0, str);
-    return FALSE;
+    return false;
   }
-  return TRUE;
+  return true;
 }
 
 void KfindTabWidget::setQuery(KQuery *query)
@@ -756,12 +756,12 @@ void KfindTabWidget::beginSearch()
 ///  dirlister->openURL(KURL(dirBox->currentText().stripWhiteSpace()));
 
   saveHistory();
-  setEnabled( FALSE );
+  setEnabled( false );
 }
 
 void KfindTabWidget::endSearch()
 {
-  setEnabled( TRUE );
+  setEnabled( true );
 }
 
 /*
@@ -775,16 +775,16 @@ void KfindTabWidget::fixLayout()
   // and second radio group on page two
 
   if(! findCreated->isChecked())  {
-    fromDate->setEnabled(FALSE);
-    toDate->setEnabled(FALSE);
-    timeBox->setEnabled(FALSE);
+    fromDate->setEnabled(false);
+    toDate->setEnabled(false);
+    timeBox->setEnabled(false);
     for(i=0; i<2; i++)
-      rb[i]->setEnabled(FALSE);
-    betweenType->setEnabled(FALSE);
+      rb[i]->setEnabled(false);
+    betweenType->setEnabled(false);
   }
   else {
     for(i=0; i<2; i++)
-      rb[i]->setEnabled(TRUE);
+      rb[i]->setEnabled(true);
 
     fromDate->setEnabled(rb[0]->isChecked());
     toDate->setEnabled(rb[0]->isChecked());
@@ -807,7 +807,7 @@ bool KfindTabWidget::isSearchRecursive()
    Digit validator. Allows only digits to be typed.
 **/
 KDigitValidator::KDigitValidator( TQWidget * parent, const char *name )
-  : TQValidator( TQT_TQOBJECT(parent), name )
+  : TQValidator( parent, name )
 {
   r = new TQRegExp("^[0-9]*$");
 }
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index f068d031e..5399d3c92 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -25,9 +25,9 @@
 #include <tdelocale.h>
 #include <tdeapplication.h>
 #include <krun.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kpropertiesdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdeglobal.h>
@@ -110,7 +110,7 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name )
 ,m_menu(0)
 {
   setSelectionMode( TQListView::Extended );
-  setShowSortIndicator( TRUE );
+  setShowSortIndicator( true );
 
   addColumn(i18n("Name"));
   addColumn(i18n("In Subfolder"));
@@ -131,14 +131,14 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name )
 
   resetColumns(true);
 
-  connect( this, TQT_SIGNAL(selectionChanged()),
-	   this, TQT_SLOT( selectionHasChanged() ));
+  connect( this, TQ_SIGNAL(selectionChanged()),
+	   this, TQ_SLOT( selectionHasChanged() ));
 
-  connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)),
-	  this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
+  connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)),
+	  this, TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
 
-  connect(this, TQT_SIGNAL(executed(TQListViewItem*)),
-	  this, TQT_SLOT(slotExecute(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(executed(TQListViewItem*)),
+	  this, TQ_SLOT(slotExecute(TQListViewItem*)));
   setDragEnabled(true);
 
 }
@@ -178,7 +178,7 @@ void KfindWindow::copySelection()
 
   if (drag_obj)
   {
-    TQClipboard *cb = kapp->clipboard();
+    TQClipboard *cb = tdeApp->clipboard();
     cb->setData(drag_obj);
   }
 }
@@ -409,21 +409,21 @@ void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoi
   {
      //menu = new TDEPopupMenu(item->text(0), this);
      m_menu->insertTitle(item->text(0));
-     m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding()));
-     m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQT_SLOT(openFolder()));
+     m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQ_SLOT(openBinding()));
+     m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQ_SLOT(openFolder()));
      m_menu->insertSeparator();
-     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
-     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection()));
+     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles()));
      m_menu->insertSeparator();
-     m_menu->insertItem(i18n("Open With..."), this, TQT_SLOT(slotOpenWith()));
+     m_menu->insertItem(i18n("Open With..."), this, TQ_SLOT(slotOpenWith()));
      m_menu->insertSeparator();
-     m_menu->insertItem(i18n("Properties"), this, TQT_SLOT(fileProperties()));
+     m_menu->insertItem(i18n("Properties"), this, TQ_SLOT(fileProperties()));
   }
   else
   {
      m_menu->insertTitle(i18n("Selected Files"));
-     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection()));
-     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles()));
+     m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection()));
+     m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles()));
   }
   m_menu->popup(p, 1);
 }
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 1e3617c70..abeee3c5f 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -7,7 +7,7 @@
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kzip.h>
 
 #include "kquery.h"
@@ -21,9 +21,9 @@ KQuery::KQuery(TQObject *parent, const char * name)
   m_regexps.setAutoDelete(true);
   m_fileItems.setAutoDelete(true);
   processLocate = new TDEProcess(this);
-  connect(processLocate,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(TDEProcess*,char*,int)));
-  connect(processLocate,TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(TDEProcess*,char*,int)));
-  connect(processLocate,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(slotendProcessLocate(TDEProcess*)));
+  connect(processLocate,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdtout(TDEProcess*,char*,int)));
+  connect(processLocate,TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdterr(TDEProcess*,char*,int)));
+  connect(processLocate,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(slotendProcessLocate(TDEProcess*)));
 
   // Files with these mime types can be ignored, even if
   // findFormatByFileContent() in some cases may claim that
@@ -87,10 +87,10 @@ void KQuery::start()
   else
     job = TDEIO::listDir( m_url, false );
 
-  connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
-	  TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
-  connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
-  connect(job, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+	  TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+  connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(canceled(TDEIO::Job *)), TQ_SLOT(slotCanceled(TDEIO::Job *)));
 }
 
 void KQuery::slotResult( TDEIO::Job * _job )
@@ -384,7 +384,7 @@ void KQuery::processQuery( KFileItem* file)
                  return;
              }
           }
-          kapp->processEvents();
+          tdeApp->processEvents();
        }
        delete stream;
 
@@ -452,7 +452,7 @@ void KQuery::setRegExp(const TQString &regexp, bool caseSensitive)
   TQRegExp *regExp;
   TQRegExp sep(";");
   TQStringList strList=TQStringList::split( sep, regexp, false);
-//  TQRegExp globChars ("[\\*\\?\\[\\]]", TRUE,  FALSE);
+//  TQRegExp globChars ("[\\*\\?\\[\\]]", true,  false);
 
   m_regexps.clear();
 //  m_regexpsContainsGlobs.clear();
diff --git a/kfind/kquery.h b/kfind/kquery.h
index 34ed16457..51e07b51d 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -11,7 +11,7 @@
 
 #include <tdeio/job.h>
 #include <kurl.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 class KFileItem;
 
diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp
index cb9f17abb..196df322c 100644
--- a/khelpcenter/application.cpp
+++ b/khelpcenter/application.cpp
@@ -27,7 +27,7 @@
 
 using namespace KHC;
 
-Application::Application() : KUniqueApplication(), mMainWindow( 0 )
+Application::Application() : TDEUniqueApplication(), mMainWindow( 0 )
 {
 }
 
@@ -49,7 +49,7 @@ int Application::newInstance()
 
   mMainWindow->openUrl( url );
 
-  return KUniqueApplication::newInstance();
+  return TDEUniqueApplication::newInstance();
 }
 
 static TDECmdLineOptions options[] =
@@ -58,7 +58,7 @@ static TDECmdLineOptions options[] =
   TDECmdLineLastOption
 };
 
-extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
+extern "C" int TDE_EXPORT kdemain( int argc, char **argv )
 {
   TDEAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"),
                         HELPCENTER_VERSION,
diff --git a/khelpcenter/application.h b/khelpcenter/application.h
index b908e2b09..aae52d199 100644
--- a/khelpcenter/application.h
+++ b/khelpcenter/application.h
@@ -20,13 +20,13 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 namespace KHC {
 
 class MainWindow;
 
-class Application : public KUniqueApplication
+class Application : public TDEUniqueApplication
 {
   public:
     Application();
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index eba2fda2d..d3242c7d8 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -2,9 +2,9 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kurl.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 
 #include "prefs.h"
@@ -204,7 +204,7 @@ bool DocEntry::isDirectory() const
 
 bool DocEntry::readFromFile( const TQString &fileName )
 {
-  KDesktopFile file( fileName );
+  TDEDesktopFile file( fileName );
 
   mName = file.readName();
   mSearch = file.readEntry( "X-DOC-Search" );
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index e56062a07..5244689d2 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -1,9 +1,9 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include "htmlsearch.h"
 
@@ -112,7 +112,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode )
 
   kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl;
   
-  KSimpleConfig cfg( cfgfile );
+  TDESimpleConfig cfg( cfgfile );
   cfg.setGroup( "KCM Locale" );
   TQString name = cfg.readEntry( "Name", langcode );
   
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 7acac556d..821cc0d05 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -148,7 +148,7 @@ void FontDialog::setupFontEncodingBox()
 
 void FontDialog::load()
 {
-	TDEConfig *cfg = kapp->config();
+	TDEConfig *cfg = tdeApp->config();
 	{
 		TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" );
 
@@ -178,7 +178,7 @@ void FontDialog::load()
 
 void FontDialog::save()
 {
-	TDEConfig *cfg = kapp->config();
+	TDEConfig *cfg = tdeApp->config();
 	{
 		TDEConfigGroupSaver groupSaver( cfg, "General" );
 		cfg->writeEntry( "UseKonqSettings", false );
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index c42aaaece..77d540c29 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -24,7 +24,7 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 093fcb8d4..815bfca32 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -26,8 +26,8 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <kstatusbar.h>
 
 #include <tqheader.h>
@@ -73,10 +73,10 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent )
 {
 	m_initialized = false;
 
-	connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-	         this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) );
-	connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-	         this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+	         this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+	         this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) );
 	
 	setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	addColumn( TQString::null );
@@ -94,7 +94,7 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent )
 
 	m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
 
-	m_config = kapp->config();
+	m_config = tdeApp->config();
 	m_config->setGroup( "Glossary" );
 
 }
@@ -142,13 +142,13 @@ int Glossary::glossaryCTime() const
 
 void Glossary::rebuildGlossaryCache()
 {
-	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
+	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
 	Q_ASSERT( mainWindow );
 	mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) );
 
 	TDEProcess *meinproc = new TDEProcess;
-	connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-	         this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
+	connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+	         this, TQ_SLOT( meinprocExited( TDEProcess * ) ) );
 
 	*meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
 	*meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
@@ -172,7 +172,7 @@ void Glossary::meinprocExited( TDEProcess *meinproc )
 	
 	m_status = CacheOk;
 
-	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( kapp->mainWidget() );
+	TDEMainWindow *mainWindow = dynamic_cast<TDEMainWindow *>( tdeApp->mainWidget() );
 	Q_ASSERT( mainWindow );
 	mainWindow->statusBar()->message( i18n( "Rebuilding cache... done." ), 2000 );
 
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 429fa48a0..0b2c67138 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -56,20 +56,20 @@ void History::setupActions( TDEActionCollection *coll )
   TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward();
 
   m_backAction = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left,
-      this, TQT_SLOT( back() ), coll, "back" );
-  connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( backActivated( int ) ) );
-  connect( m_backAction->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           TQT_SLOT( fillBackMenu() ) );
+      this, TQ_SLOT( back() ), coll, "back" );
+  connect( m_backAction->popupMenu(), TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( backActivated( int ) ) );
+  connect( m_backAction->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+           TQ_SLOT( fillBackMenu() ) );
   m_backAction->setEnabled( false );
 
   m_forwardAction = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right,
-      this, TQT_SLOT( forward() ), coll,
+      this, TQ_SLOT( forward() ), coll,
       "forward" );
-  connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( forwardActivated( int ) ) );
-  connect( m_forwardAction->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           TQT_SLOT( fillForwardMenu() ) );
+  connect( m_forwardAction->popupMenu(), TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( forwardActivated( int ) ) );
+  connect( m_forwardAction->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+           TQ_SLOT( fillForwardMenu() ) );
   m_forwardAction->setEnabled( false );
 }
 
@@ -78,9 +78,9 @@ void History::installMenuBarHook( TDEMainWindow *mainWindow )
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>(
       mainWindow->guiFactory()->container( "go_web", mainWindow ) );
   if ( goMenu ) {
-    connect( goMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( fillGoMenu() ) );
-    connect( goMenu, TQT_SIGNAL( activated( int ) ),
-             TQT_SLOT( goMenuActivated( int ) ) );
+    connect( goMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( fillGoMenu() ) );
+    connect( goMenu, TQ_SIGNAL( activated( int ) ),
+             TQ_SLOT( goMenuActivated( int ) ) );
     m_goMenuIndex = goMenu->count();
   }
 }
@@ -178,7 +178,7 @@ void History::goHistoryActivated( int steps )
   if ( m_goBuffer )
     return;
   m_goBuffer = steps;
-  TQTimer::singleShot( 0, this, TQT_SLOT( goHistoryDelayed() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( goHistoryDelayed() ) );
 }
 
 void History::goHistoryDelayed()
@@ -256,7 +256,7 @@ void History::fillForwardMenu()
 
 void History::fillGoMenu()
 {
-  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
+  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu || m_goMenuIndex == -1 )
     return;
@@ -289,7 +289,7 @@ void History::fillGoMenu()
 
 void History::goMenuActivated( int id )
 {
-  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( kapp->mainWidget() );
+  TDEMainWindow *mainWindow = static_cast<TDEMainWindow *>( tdeApp->mainWidget() );
   TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu )
     return;
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 5fd0f4640..0a9c78b69 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -4,8 +4,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
 
@@ -22,7 +22,7 @@ HTMLSearch::HTMLSearch()
 
 TQString HTMLSearch::dataPath(const TQString& _lang)
 {
-    return kapp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
+    return tdeApp->dirs()->saveLocation("data", TQString("khelpcenter/%1").arg(_lang));
 }
 
 
@@ -56,7 +56,7 @@ void HTMLSearch::scanDir(const TQString& dir)
         if (*it != "." && *it != "..")
         {
             scanDir(dir + *it + "/");
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
 }
 
@@ -74,7 +74,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
 
     // add KDE help dirs
     if (config->readBoolEntry("KDE", true))
-        dirs = kapp->dirs()->findDirs("html", _lang + "/");
+        dirs = tdeApp->dirs()->findDirs("html", _lang + "/");
     kdDebug() << "got " << dirs.count() << " dirs\n";
 
     // TODO: Man and Info!!
@@ -232,7 +232,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     // create progress dialog
     progress = new ProgressDialog(parent);
     progress->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // create files list ----------------------------------------------
     if (!saveFilesList(_lang))
@@ -243,7 +243,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     // run htdig ------------------------------------------------------
     TDEConfig *config = new TDEConfig("khelpcenterrc", true);
     TDEConfigGroupSaver saver(config, "htdig");
-    TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
+    TQString exe = config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig"));
 
     if (exe.isEmpty())
     {
@@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
         kdDebug() << "Running htdig" << endl;
 
-        connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
-                this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int)));
+        connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+                this, TQ_SLOT(htdigStdout(TDEProcess *,char*,int)));
 
-        connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
-                this, TQT_SLOT(htdigExited(TDEProcess *)));
+        connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+                this, TQ_SLOT(htdigExited(TDEProcess *)));
 
         _htdigRunning = true;
 
@@ -310,7 +310,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
         // execute htdig
         _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout );
 
-        kapp->enter_loop();
+        tdeApp->enter_loop();
 
         if (!_proc->normalExit() || _proc->exitStatus() != 0)
 	{
@@ -322,13 +322,13 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
         // _filesDigged += CHUNK_SIZE;
         progress->setFilesDigged(_filesDigged);
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     progress->setState(2);
 
     // run htmerge -----------------------------------------------------
-    exe = config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge"));
+    exe = config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge"));
     if (exe.isEmpty())
     {
         delete config;
@@ -340,14 +340,14 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
 
     kdDebug() << "Running htmerge" << endl;
 
-    connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(htmergeExited(TDEProcess *)));
+    connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(htmergeExited(TDEProcess *)));
 
     _htmergeRunning = true;
 
     _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
-    kapp->enter_loop();
+    tdeApp->enter_loop();
 
     if (!_proc->normalExit() || _proc->exitStatus() != 0)
     {
@@ -360,7 +360,7 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     delete _proc;
 
     progress->setState(3);
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     delete progress;
     delete config;
@@ -393,7 +393,7 @@ void HTMLSearch::htdigExited(TDEProcess *p)
 {
     kdDebug() << "htdig terminated " << p->exitStatus() << endl;
     _htdigRunning = false;
-    kapp->exit_loop();
+    tdeApp->exit_loop();
 }
 
 
@@ -401,7 +401,7 @@ void HTMLSearch::htmergeExited(TDEProcess *)
 {
   kdDebug() << "htmerge terminated" << endl;
   _htmergeRunning = false;
-  kapp->exit_loop();
+  tdeApp->exit_loop();
 }
 
 
@@ -415,7 +415,7 @@ void HTMLSearch::htsearchExited(TDEProcess *)
 {
   kdDebug() << "htsearch terminated" << endl;
   _htsearchRunning = false;
-  kapp->exit_loop();
+  tdeApp->exit_loop();
 }
 
 
@@ -432,7 +432,7 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   // run htsearch ----------------------------------------------------
   TDEConfig *config = new TDEConfig("khelpcenterrc", true);
   TDEConfigGroupSaver saver(config, "htdig");
-  TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
+  TQString exe = config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch"));
   if (exe.isEmpty())
   {
       delete config;
@@ -444,17 +444,17 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
 
   kdDebug() << "Running htsearch" << endl;
 
-  connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
-	  this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)));
-  connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)),
-	  this, TQT_SLOT(htsearchExited(TDEProcess *)));
+  connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+	  this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int)));
+  connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)),
+	  this, TQ_SLOT(htsearchExited(TDEProcess *)));
 
   _htsearchRunning = true;
   _searchResult = "";
 
   _proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 
-  kapp->enter_loop();
+  tdeApp->enter_loop();
 
   if (!_proc->normalExit() || _proc->exitStatus() != 0)
     {
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 3db9c9895..d130f9dbd 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -19,14 +19,14 @@
  */
 
 #include <tqlayout.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurllabel.h>
 #include <tdeapplication.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 #include <tdefiledialog.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include "klangcombo.h"
 #include <kurlrequester.h>
 #include <klineedit.h>
@@ -60,8 +60,8 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   url->setText(i18n("ht://dig home page"));
   url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
-  connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
-      this, TQT_SLOT(urlClicked(const TQString&)));
+  connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)),
+      this, TQ_SLOT(urlClicked(const TQString&)));
 
   gb = new TQGroupBox(i18n("Program Locations"), this);
 
@@ -74,7 +74,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( htdigBin );
   grid->addWidget(l, 1,0);
   grid->addWidget(htdigBin, 1,1);
-  connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(htdigBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
   TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" );
   TQWhatsThis::add( htdigBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -84,7 +84,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( htsearchBin );
   grid->addWidget(l, 2,0);
   grid->addWidget(htsearchBin, 2,1);
-  connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(htsearchBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
   wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" );
   TQWhatsThis::add( htsearchBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -94,7 +94,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( htmergeBin );
   grid->addWidget(l, 3,0);
   grid->addWidget(htmergeBin, 3,1);
-  connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged()));
+  connect(htmergeBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged()));
   wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" );
   TQWhatsThis::add( htmergeBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -110,17 +110,17 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
 
   indexKDE = new TQCheckBox(i18n("&TDE help"), gb);
   vvbox->addWidget(indexKDE);
-  connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(indexKDE, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
   indexMan = new TQCheckBox(i18n("&Man pages"), gb);
   vvbox->addWidget(indexMan);
   indexMan->setEnabled(false),
-  connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(indexMan, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
   indexInfo = new TQCheckBox(i18n("&Info pages"), gb);
   vvbox->addWidget(indexInfo);
   indexInfo->setEnabled(false);
-  connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
+  connect(indexInfo, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()));
 
   gb = new TQGroupBox(i18n("Additional Search Paths"), this);
   hbox->addWidget(gb);
@@ -159,12 +159,12 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name)
   TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
   runButton->setFixedSize(runButton->sizeHint());
   vbox->addWidget(runButton, AlignRight);
-  connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
+  connect(runButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateIndex()));
 
-  connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked()));
-  connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked()));
-  connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)),
-      this, TQT_SLOT(pathSelected(const TQString &)));
+  connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked()));
+  connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delClicked()));
+  connect(searchPaths, TQ_SIGNAL(highlighted(const TQString &)),
+      this, TQ_SLOT(pathSelected(const TQString &)));
 
   checkButtons();
 
@@ -184,7 +184,7 @@ void TDEHTMLSearchConfig::loadLanguages()
 
   for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
     {
-      KSimpleConfig entry(*it);
+      TDESimpleConfig entry(*it);
       entry.setGroup(TQString::fromLatin1("KCM Locale"));
       TQString name = entry.readEntry(TQString::fromLatin1("Name"), TDEGlobal::locale()->translate("without name"));
 
@@ -256,9 +256,9 @@ void TDEHTMLSearchConfig::load()
   TDEConfig *config = new TDEConfig("khelpcenterrc", true);
 
   config->setGroup("htdig");
-  htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")));
-  htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
-  htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", kapp->dirs()->findExe("htmerge")));
+  htdigBin->lineEdit()->setText(config->readPathEntry("htdig", tdeApp->dirs()->findExe("htdig")));
+  htsearchBin->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
+  htmergeBin->lineEdit()->setText(config->readPathEntry("htmerge", tdeApp->dirs()->findExe("htmerge")));
 
   config->setGroup("Scope");
   indexKDE->setChecked(config->readBoolEntry("KDE", true));
@@ -310,9 +310,9 @@ void TDEHTMLSearchConfig::save()
 
 void TDEHTMLSearchConfig::defaults()
 {
-  htdigBin->lineEdit()->setText(kapp->dirs()->findExe("htdig"));
-  htsearchBin->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
-  htmergeBin->lineEdit()->setText(kapp->dirs()->findExe("htmerge"));
+  htdigBin->lineEdit()->setText(tdeApp->dirs()->findExe("htdig"));
+  htsearchBin->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
+  htmergeBin->lineEdit()->setText(tdeApp->dirs()->findExe("htmerge"));
 
   indexKDE->setChecked(true);
   indexMan->setChecked(false);
@@ -328,7 +328,7 @@ void TDEHTMLSearchConfig::defaults()
 
 void TDEHTMLSearchConfig::urlClicked(const TQString &url)
 {
-  kapp->invokeBrowser(url);
+  tdeApp->invokeBrowser(url);
 }
 
 
@@ -336,7 +336,7 @@ void TDEHTMLSearchConfig::generateIndex()
 {
   save();
 
-  TQString exe = kapp->dirs()->findExe("tdehtmlindex");
+  TQString exe = tdeApp->dirs()->findExe("tdehtmlindex");
   if (exe.isEmpty())
     return;
 
@@ -345,8 +345,8 @@ void TDEHTMLSearchConfig::generateIndex()
   indexProc = new TDEProcess;
   *indexProc << exe << "--lang" << language->currentTag();
 
-  connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)),
-      this, TQT_SLOT(indexTerminated(TDEProcess *)));
+  connect(indexProc, TQ_SIGNAL(processExited(TDEProcess *)),
+      this, TQ_SLOT(indexTerminated(TDEProcess *)));
 
   runButton->setEnabled(false);
 
@@ -362,7 +362,7 @@ void TDEHTMLSearchConfig::indexTerminated(TDEProcess *)
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
+  TDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
   {
     TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
     return new TDEHTMLSearchConfig(parent, name);
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 308109d12..a53a1b01f 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -23,7 +23,7 @@
 
 #include <tqiconset.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "klangcombo.h"
 #include "klangcombo.moc"
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index b3c70915c..be9975d7a 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -98,10 +98,10 @@ void KTagComboBox::clear()
   delete old_popup;
   old_popup = popup;
   popup = new TQPopupMenu(this);
-  connect( popup, TQT_SIGNAL(activated(int)),
-                        TQT_SLOT(internalActivate(int)) );
-  connect( popup, TQT_SIGNAL(highlighted(int)),
-                        TQT_SLOT(internalHighlight(int)) );
+  connect( popup, TQ_SIGNAL(activated(int)),
+                        TQ_SLOT(internalActivate(int)) );
+  connect( popup, TQ_SIGNAL(highlighted(int)),
+                        TQ_SLOT(internalHighlight(int)) );
 }
 
 int KTagComboBox::count() const
@@ -176,10 +176,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons
   checkInsertPos(pi, text, index);
   pi->insertItem(text, p, count(), index);
   tags->append(tag);
-  connect( p, TQT_SIGNAL(activated(int)),
-                        TQT_SLOT(internalActivate(int)) );
-  connect( p, TQT_SIGNAL(highlighted(int)),
-                        TQT_SLOT(internalHighlight(int)) );
+  connect( p, TQ_SIGNAL(activated(int)),
+                        TQ_SLOT(internalActivate(int)) );
+  connect( p, TQ_SIGNAL(highlighted(int)),
+                        TQ_SLOT(internalHighlight(int)) );
 }
 
 void KTagComboBox::paintEvent( TQPaintEvent * ev)
diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index 33a783127..a289d3f7c 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -4,7 +4,7 @@
 
 #include <tdelocale.h>
 #include <kprogress.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 #include "progressdialog.moc"
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index 230a7eb69..8ca4ddfb2 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqwhatsthis.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurllabel.h>
 #include <tdeapplication.h>
@@ -61,8 +61,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   url->setText(i18n("ht://dig home page"));
   url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
-  connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
-      this, TQT_SLOT(urlClicked(const TQString&)));
+  connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)),
+      this, TQ_SLOT(urlClicked(const TQString&)));
 
   gb = new TQGroupBox(i18n("Program Locations"), this);
 
@@ -75,8 +75,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( mHtsearchUrl );
   grid->addWidget(l, 1,0);
   grid->addWidget(mHtsearchUrl, 1,1);
-  connect( mHtsearchUrl->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SIGNAL( changed() ) );
+  connect( mHtsearchUrl->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SIGNAL( changed() ) );
   TQString wtstr = i18n( "Enter the URL of the htsearch CGI program." );
   TQWhatsThis::add( mHtsearchUrl, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -86,8 +86,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( mIndexerBin );
   grid->addWidget(l, 2,0);
   grid->addWidget(mIndexerBin, 2,1);
-  connect( mIndexerBin->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SIGNAL( changed() ) );
+  connect( mIndexerBin->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SIGNAL( changed() ) );
   wtstr = i18n( "Enter the path to your htdig indexer program here." );
   TQWhatsThis::add( mIndexerBin, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -98,8 +98,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   l->setBuddy( mDbDir );
   grid->addWidget(l, 3,0);
   grid->addWidget(mDbDir, 3,1);
-  connect( mDbDir->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SIGNAL( changed() ) );
+  connect( mDbDir->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SIGNAL( changed() ) );
   wtstr = i18n( "Enter the path to the htdig database folder." );
   TQWhatsThis::add( mDbDir, wtstr );
   TQWhatsThis::add( l, wtstr );
@@ -121,7 +121,7 @@ void HtmlSearchConfig::load( TDEConfig *config )
 {
   config->setGroup("htdig");
 
-  mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")));
+  mHtsearchUrl->lineEdit()->setText(config->readPathEntry("htsearch", tdeApp->dirs()->findExe("htsearch")));
   mIndexerBin->lineEdit()->setText(config->readPathEntry("indexer"));
   mDbDir->lineEdit()->setText(config->readPathEntry("dbdir", "/opt/www/htdig/db/" ) );
 }
@@ -137,14 +137,14 @@ void HtmlSearchConfig::save( TDEConfig *config )
 
 void HtmlSearchConfig::defaults()
 {
-    mHtsearchUrl->lineEdit()->setText(kapp->dirs()->findExe("htsearch"));
+    mHtsearchUrl->lineEdit()->setText(tdeApp->dirs()->findExe("htsearch"));
     mIndexerBin->lineEdit()->setText("");
     mDbDir->lineEdit()->setText("/opt/www/htdig/db/" );
 }
 
 void HtmlSearchConfig::urlClicked(const TQString &url)
 {
-  kapp->invokeBrowser(url);
+  tdeApp->invokeBrowser(url);
 }
 
 } // End namespace KHC
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 2c71d2bbe..f7e44c813 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 
 #include <tqfile.h>
@@ -95,7 +95,7 @@ void InfoTree::build( NavigatorItem *parent )
   m_categoryItem = new NavigatorItem( entry, parent );
   m_categoryItem->setAutoDeleteDocEntry( true );
 
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   cfg->setGroup( "Info pages" );
   TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
   // Default paths taken fron tdebase/tdeioslave/info/kde-info2html.conf
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index bb3c69db6..0f9cf08bd 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -32,8 +32,8 @@
 #include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <kdialog.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdetempfile.h>
@@ -73,7 +73,7 @@ IndexDirDialog::IndexDirDialog( TQWidget *parent )
   urlLayout->addWidget( mIndexUrlRequester );
 
   mIndexUrlRequester->setURL( Prefs::indexDirectory() );
-  connect(mIndexUrlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotUrlChanged( const TQString &)));
+  connect(mIndexUrlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotUrlChanged( const TQString &)));
   slotUrlChanged( mIndexUrlRequester->lineEdit()->text() );
 }
 
@@ -120,13 +120,13 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
   buttonLayout->addStretch( 1 );
 
   mDetailsButton = new TQPushButton( this );
-  connect( mDetailsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleDetails() ) );
+  connect( mDetailsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( toggleDetails() ) );
   buttonLayout->addWidget( mDetailsButton );
 
   hideDetails();
 
   mEndButton = new TQPushButton( this );
-  connect( mEndButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEnd() ) );
+  connect( mEndButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEnd() ) );
   buttonLayout->addWidget( mEndButton );
 
   setFinished( false );
@@ -240,12 +240,12 @@ KCMHelpCenter::KCMHelpCenter( KHC::SearchEngine *engine, TQWidget *parent,
 
   load();
 
-  bool success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
+  bool success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
       0, "buildIndexProgress()", "kcmhelpcenter",
       "slotIndexProgress()", false );
   if ( !success ) kdError() << "connect DCOP signal failed" << endl;
 
-  success = kapp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
+  success = tdeApp->dcopClient()->connectDCOPSignal( "khc_indexbuilder",
       0, "buildIndexError(TQString)", "kcmhelpcenter",
       "slotIndexError(TQString)", false );
   if ( !success ) kdError() << "connect DCOP signal failed" << endl;
@@ -279,8 +279,8 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent )
   mListView->addColumn( i18n("Status") );
   mListView->setColumnAlignment( 1, AlignCenter );
   topLayout->addWidget( mListView );
-  connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-    TQT_SLOT( checkSelection() ) );
+  connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+    TQ_SLOT( checkSelection() ) );
 
   TQBoxLayout *urlLayout = new TQHBoxLayout( topLayout );
 
@@ -291,7 +291,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent )
   urlLayout->addWidget( mIndexDirLabel, 1 );
 
   TQPushButton *button = new TQPushButton( i18n("Change..."), parent );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showIndexDirDialog() ) );
+  connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showIndexDirDialog() ) );
   urlLayout->addWidget( button );
 
   TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
@@ -446,10 +446,10 @@ bool KCMHelpCenter::buildIndex()
 
   if ( !mProgressDialog ) {
     mProgressDialog = new IndexProgressDialog( this );
-    connect( mProgressDialog, TQT_SIGNAL( cancelled() ),
-             TQT_SLOT( cancelBuildIndex() ) );
-    connect( mProgressDialog, TQT_SIGNAL( closed() ),
-             TQT_SLOT( slotProgressClosed() ) );
+    connect( mProgressDialog, TQ_SIGNAL( cancelled() ),
+             TQ_SLOT( cancelBuildIndex() ) );
+    connect( mProgressDialog, TQ_SIGNAL( closed() ),
+             TQ_SLOT( slotProgressClosed() ) );
   }
   mProgressDialog->setLabelText( name );
   mProgressDialog->setTotalSteps( mIndexQueue.count() );
@@ -476,12 +476,12 @@ void KCMHelpCenter::startIndexProcess()
   *mProcess << mCmdFile->name();
   *mProcess << Prefs::indexDirectory();
 
-  connect( mProcess, TQT_SIGNAL( processExited( TDEProcess * ) ),
-           TQT_SLOT( slotIndexFinished( TDEProcess * ) ) );
-  connect( mProcess, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
-  connect( mProcess, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( mProcess, TQ_SIGNAL( processExited( TDEProcess * ) ),
+           TQ_SLOT( slotIndexFinished( TDEProcess * ) ) );
+  connect( mProcess, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+  connect( mProcess, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
 
   if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
     kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process."
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 6fac581c2..cea3ad289 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -26,11 +26,11 @@
 #include <tdeaboutdata.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 
 #include <tqfile.h>
@@ -91,12 +91,12 @@ void IndexBuilder::processCmdQueue()
   *proc << args;
 
 
-  connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-           TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
-  connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
-  connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ),
-           TQT_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) );
+  connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+           TQ_SLOT( slotProcessExited( TDEProcess * ) ) );
+  connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) );
+  connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ),
+           TQ_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) );
 
   mCmdQueue.remove( it );
 
@@ -143,21 +143,21 @@ void IndexBuilder::sendErrorSignal( const TQString &error )
   TQByteArray params;
   TQDataStream stream( params, IO_WriteOnly );
   stream << error;
-  kapp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );  
+  tdeApp->dcopClient()->emitDCOPSignal("buildIndexError(TQString)", params );  
 }
 
 void IndexBuilder::sendProgressSignal()
 {
   kdDebug(1402) << "IndexBuilder::sendProgressSignal()" << endl;
  
-  kapp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );  
+  tdeApp->dcopClient()->emitDCOPSignal("buildIndexProgress()", TQByteArray() );  
 }
 
 void IndexBuilder::quit()
 {
   kdDebug(1402) << "IndexBuilder::quit()" << endl;
 
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
@@ -181,7 +181,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KUniqueApplication::addCmdLineOptions();
+  TDEUniqueApplication::addCmdLineOptions();
 
   TDEApplication app;
 
@@ -211,7 +211,7 @@ int main( int argc, char **argv )
 
   IndexBuilder builder(cmdFile);
 
-  TQTimer::singleShot(0, &builder, TQT_SLOT(buildIndices()));
+  TQTimer::singleShot(0, &builder, TQ_SLOT(buildIndices()));
 
   return app.exec();
 }
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index 8cbaf6b00..4f1c7e0f8 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -21,9 +21,9 @@
 #ifndef KHC_INDEXBUILDER_H
 #define KHC_INDEXBUILDER_H
 
-#include <kuniqueapplication.h>
-
 #include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqtimer.h>
 
 class TDEProcess;
diff --git a/khelpcenter/khelpcenter.kcfg b/khelpcenter/khelpcenter.kcfg
index 836bb9f45..d23e31753 100644
--- a/khelpcenter/khelpcenter.kcfg
+++ b/khelpcenter/khelpcenter.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>kstandarddirs.h</include>
+  <include>tdestandarddirs.h</include>
   <kcfgfile name="khelpcenterrc"/>
 
   <group name="Search">
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 8a79b536c..909dbca17 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -90,37 +90,37 @@ MainWindow::MainWindow()
 {
     mSplitter = new TQSplitter( this );
 
-    mDoc = new View( mSplitter, 0, TQT_TQOBJECT(this), 0, TDEHTMLPart::DefaultGUI, actionCollection() );
-    connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             TQT_SLOT( setCaption( const TQString & ) ) );
-    connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
-             TQT_SLOT( statusBarMessage( const TQString & ) ) );
-    connect( mDoc, TQT_SIGNAL( onURL( const TQString & ) ),
-             TQT_SLOT( statusBarMessage( const TQString & ) ) );
-    connect( mDoc, TQT_SIGNAL( started( TDEIO::Job * ) ),
-             TQT_SLOT( slotStarted( TDEIO::Job * ) ) );
-    connect( mDoc, TQT_SIGNAL( completed() ),
-             TQT_SLOT( documentCompleted() ) );
-    connect( mDoc, TQT_SIGNAL( searchResultCacheAvailable() ),
-             TQT_SLOT( enableLastSearchAction() ) );
-
-    connect( mDoc, TQT_SIGNAL( selectionChanged() ),
-             TQT_SLOT( enableCopyTextAction() ) );
+    mDoc = new View( mSplitter, 0, this, 0, TDEHTMLPart::DefaultGUI, actionCollection() );
+    connect( mDoc, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             TQ_SLOT( setCaption( const TQString & ) ) );
+    connect( mDoc, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+             TQ_SLOT( statusBarMessage( const TQString & ) ) );
+    connect( mDoc, TQ_SIGNAL( onURL( const TQString & ) ),
+             TQ_SLOT( statusBarMessage( const TQString & ) ) );
+    connect( mDoc, TQ_SIGNAL( started( TDEIO::Job * ) ),
+             TQ_SLOT( slotStarted( TDEIO::Job * ) ) );
+    connect( mDoc, TQ_SIGNAL( completed() ),
+             TQ_SLOT( documentCompleted() ) );
+    connect( mDoc, TQ_SIGNAL( searchResultCacheAvailable() ),
+             TQ_SLOT( enableLastSearchAction() ) );
+
+    connect( mDoc, TQ_SIGNAL( selectionChanged() ),
+             TQ_SLOT( enableCopyTextAction() ) );
 
     statusBar()->insertItem(i18n("Preparing Index"), 0, 1);
     statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter);
 
     connect( mDoc->browserExtension(),
-             TQT_SIGNAL( openURLRequest( const KURL &,
+             TQ_SIGNAL( openURLRequest( const KURL &,
                                      const KParts::URLArgs & ) ),
-             TQT_SLOT( slotOpenURLRequest( const KURL &,
+             TQ_SLOT( slotOpenURLRequest( const KURL &,
                                        const KParts::URLArgs & ) ) );
 
     mNavigator = new Navigator( mDoc, mSplitter, "nav" );
-    connect( mNavigator, TQT_SIGNAL( itemSelected( const TQString & ) ),
-             TQT_SLOT( viewUrl( const TQString & ) ) );
-    connect( mNavigator, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ),
-             TQT_SLOT( slotGlossSelected( const GlossaryEntry & ) ) );
+    connect( mNavigator, TQ_SIGNAL( itemSelected( const TQString & ) ),
+             TQ_SLOT( viewUrl( const TQString & ) ) );
+    connect( mNavigator, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ),
+             TQ_SLOT( slotGlossSelected( const GlossaryEntry & ) ) );
 
     mSplitter->moveToFirst(mNavigator);
     mSplitter->setResizeMode(mNavigator, TQSplitter::KeepSize);
@@ -130,7 +130,7 @@ MainWindow::MainWindow()
     mSplitter->setSizes(sizes);
     setGeometry(366, 0, 800, 600);
 
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     {
       TDEConfigGroupSaver groupSaver( cfg, "General" );
       if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) {
@@ -150,10 +150,10 @@ MainWindow::MainWindow()
 
     History::self().installMenuBarHook( this );
 
-    connect( &History::self(), TQT_SIGNAL( goInternalUrl( const KURL & ) ),
-             mNavigator, TQT_SLOT( openInternalUrl( const KURL & ) ) );
-    connect( &History::self(), TQT_SIGNAL( goUrl( const KURL & ) ),
-             mNavigator, TQT_SLOT( selectItem( const KURL & ) ) );
+    connect( &History::self(), TQ_SIGNAL( goInternalUrl( const KURL & ) ),
+             mNavigator, TQ_SLOT( openInternalUrl( const KURL & ) ) );
+    connect( &History::self(), TQ_SIGNAL( goUrl( const KURL & ) ),
+             mNavigator, TQ_SLOT( selectItem( const KURL & ) ) );
 
     statusBarMessage(i18n("Ready"));
     enableCopyTextAction();
@@ -208,48 +208,48 @@ void MainWindow::writeConfig()
 
 void MainWindow::setupActions()
 {
-    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
-    KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(),
+    KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
+    KStdAction::print( this, TQ_SLOT( print() ), actionCollection(),
                        "printFrame" );
 
-    TDEAction *prevPage  = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ),
+    TDEAction *prevPage  = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQ_SLOT( prevPage() ),
                          actionCollection(), "prevPage" );
     prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
 
-    TDEAction *nextPage  = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ),
+    TDEAction *nextPage  = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQ_SLOT( nextPage() ),
                          actionCollection(), "nextPage" );
     nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
 
-    TDEAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() );
+    TDEAction *home = KStdAction::home( this, TQ_SLOT( slotShowHome() ), actionCollection() );
     home->setText(i18n("Table of &Contents"));
     home->setToolTip(i18n("Table of contents"));
     home->setWhatsThis(i18n("Go back to the table of contents"));
 
-    mCopyText = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
+    mCopyText = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
 
-    mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT( slotLastSearch() ),
+    mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, this,
+                                     TQ_SLOT( slotLastSearch() ),
                                      actionCollection(), "lastsearch" );
     mLastSearchAction->setEnabled( false );
 
-    new TDEAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator),
-      TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" );
-    KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
+    new TDEAction( i18n("Build Search Index..."), 0, mNavigator,
+      TQ_SLOT( showIndexDialog() ), actionCollection(), "build_index" );
+    KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ),
       actionCollection() );
 
     TDEConfig *cfg = TDEGlobal::config();
     cfg->setGroup( "Debug" );
     if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
-      new TDEAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
-                   TQT_SLOT( showSearchStderr() ), actionCollection(),
+      new TDEAction( i18n("Show Search Error Log"), 0, this,
+                   TQ_SLOT( showSearchStderr() ), actionCollection(),
                    "show_search_stderr" );
     }
 
     History::self().setupActions( actionCollection() );
 
-    new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
-    new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
-    new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
+    new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), this, TQ_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
+    new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), this, TQ_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
+    new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), this, TQ_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
 }
 
 void MainWindow::slotCopySelectedText()
@@ -265,8 +265,8 @@ void MainWindow::print()
 void MainWindow::slotStarted(TDEIO::Job *job)
 {
     if (job)
-       connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)),
-               TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
+       connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)),
+               TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
 
     History::self().updateActions();
 }
@@ -447,7 +447,7 @@ void MainWindow::updateZoomActions()
   actionCollection()->action( "incFontSizes" )->setEnabled( mDoc->zoomFactor() + mDoc->zoomStepping() <= 300 );
   actionCollection()->action( "decFontSizes" )->setEnabled( mDoc->zoomFactor() - mDoc->zoomStepping() >= 20 );
 
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   {
     TDEConfigGroupSaver groupSaver( cfg, "General" );
     cfg->writeEntry( "Font zoom factor", mDoc->zoomFactor() );
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 05bd68129..d2658e8e1 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -39,18 +39,18 @@
 
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <tdemessagebox.h>
 #include <kiconloader.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 #include <kcharsets.h>
 #include <kdialog.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kprotocolinfo.h>
 #include <kservicegroup.h>
 
@@ -80,13 +80,13 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
    : TQWidget( parent, name ), mIndexDialog( 0 ),
      mView( view ), mSelected( false )
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("General");
     mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false);
 
     mSearchEngine = new SearchEngine( view );
-    connect( mSearchEngine, TQT_SIGNAL( searchFinished() ),
-             TQT_SLOT( slotSearchFinished() ) );
+    connect( mSearchEngine, TQ_SIGNAL( searchFinished() ),
+             TQ_SLOT( slotSearchFinished() ) );
 
     DocMetaInfo::self()->scanMetaInfo();
 
@@ -103,18 +103,18 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
     clearButton->setIconSet( TDEApplication::reverseLayout() ?
       SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
     searchLayout->addWidget( clearButton );
-    connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );
+    connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( clearSearch() ) );
     TQToolTip::add( clearButton, i18n("Clear search") );
 
     mSearchEdit = new TQLineEdit( mSearchFrame );
     searchLayout->addWidget( mSearchEdit );
-    connect( mSearchEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotSearch() ) );
-    connect( mSearchEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-             TQT_SLOT( checkSearchButton() ) );
+    connect( mSearchEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotSearch() ) );
+    connect( mSearchEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+             TQ_SLOT( checkSearchButton() ) );
 
     mSearchButton = new TQPushButton( i18n("&Search"), mSearchFrame );
     searchLayout->addWidget( mSearchButton );
-    connect( mSearchButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearch() ) );
+    connect( mSearchButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearch() ) );
 
     clearButton->setFixedHeight( mSearchButton->height() );
 
@@ -134,8 +134,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
       mSearchWidget->readConfig( TDEGlobal::config() );
     }
 
-    connect( mTabWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ),
-             TQT_SLOT( slotTabChanged( TQWidget * ) ) );
+    connect( mTabWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ),
+             TQ_SLOT( slotTabChanged( TQWidget * ) ) );
 }
 
 Navigator::~Navigator()
@@ -168,22 +168,22 @@ void Navigator::setupContentsTab()
     mContentsTree->setRootIsDecorated(false);
     mContentsTree->setSorting(-1, false);
 
-    connect(mContentsTree, TQT_SIGNAL(clicked(TQListViewItem*)),
-            TQT_SLOT(slotItemSelected(TQListViewItem*)));
-    connect(mContentsTree, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-           TQT_SLOT(slotItemSelected(TQListViewItem*)));
+    connect(mContentsTree, TQ_SIGNAL(clicked(TQListViewItem*)),
+            TQ_SLOT(slotItemSelected(TQListViewItem*)));
+    connect(mContentsTree, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+           TQ_SLOT(slotItemSelected(TQListViewItem*)));
     mTabWidget->addTab(mContentsTree, i18n("&Contents"));
 }
 
 void Navigator::setupSearchTab()
 {
     mSearchWidget = new SearchWidget( mSearchEngine, mTabWidget );
-    connect( mSearchWidget, TQT_SIGNAL( searchResult( const TQString & ) ),
-             TQT_SLOT( slotShowSearchResult( const TQString & ) ) );
-    connect( mSearchWidget, TQT_SIGNAL( scopeCountChanged( int ) ),
-             TQT_SLOT( checkSearchButton() ) );
-    connect( mSearchWidget, TQT_SIGNAL( showIndexDialog() ),
-      TQT_SLOT( showIndexDialog() ) );
+    connect( mSearchWidget, TQ_SIGNAL( searchResult( const TQString & ) ),
+             TQ_SLOT( slotShowSearchResult( const TQString & ) ) );
+    connect( mSearchWidget, TQ_SIGNAL( scopeCountChanged( int ) ),
+             TQ_SLOT( checkSearchButton() ) );
+    connect( mSearchWidget, TQ_SIGNAL( showIndexDialog() ),
+      TQ_SLOT( showIndexDialog() ) );
 
     mTabWidget->addTab( mSearchWidget, i18n("Search Options"));
 }
@@ -191,8 +191,8 @@ void Navigator::setupSearchTab()
 void Navigator::setupGlossaryTab()
 {
     mGlossaryTree = new Glossary( mTabWidget );
-    connect( mGlossaryTree, TQT_SIGNAL( entrySelected( const GlossaryEntry & ) ),
-             this, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ) );
+    connect( mGlossaryTree, TQ_SIGNAL( entrySelected( const GlossaryEntry & ) ),
+             this, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ) );
     mTabWidget->addTab( mGlossaryTree, i18n( "G&lossary" ) );
 }
 
@@ -279,7 +279,7 @@ void Navigator::insertAppletDocs( NavigatorItem *topItem )
 void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
                                            const TQString &file )
 {
-    KDesktopFile desktopFile( file );
+    TDEDesktopFile desktopFile( file );
     TQString docPath = desktopFile.readDocPath();
     if ( !docPath.isNull() ) {
       // First parameter is ignored if second is an absolute path
@@ -294,14 +294,14 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
 
 void Navigator::insertInfoDocs( NavigatorItem *topItem )
 {
-  InfoTree *infoTree = new InfoTree( TQT_TQOBJECT(this) );
+  InfoTree *infoTree = new InfoTree( this );
   infoTree->build( topItem );
 }
 
 NavigatorItem *Navigator::insertScrollKeeperDocs( NavigatorItem *topItem,
                                                   NavigatorItem *after )
 {
-  ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( TQT_TQOBJECT(this) );
+  ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( this );
   return builder->build( topItem, after );
 }
 
@@ -643,8 +643,8 @@ void Navigator::showIndexDialog()
 {
   if ( !mIndexDialog ) {
     mIndexDialog = new KCMHelpCenter( mSearchEngine, this );
-    connect( mIndexDialog, TQT_SIGNAL( searchIndexUpdated() ), mSearchWidget,
-             TQT_SLOT( updateScopeList() ) );
+    connect( mIndexDialog, TQ_SIGNAL( searchIndexUpdated() ), mSearchWidget,
+             TQ_SLOT( updateScopeList() ) );
   }
   mIndexDialog->show();
   mIndexDialog->raise();
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index 798f71101..2cc03e99d 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -39,7 +39,7 @@ class TQPushButton;
 class TDEListView;
 class KService;
 class TDEProcess;
-class KProcIO;
+class TDEProcIO;
 
 class KCMHelpCenter;
 
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index 80c2e33cb..337aa39d4 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -73,7 +73,7 @@ void PluginTraverser::process( DocEntry *entry )
       appItem = new NavigatorAppItem( entry, mListView, mCurrentItem );
     else
       appItem = new NavigatorAppItem( entry, mParentItem, mCurrentItem );
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     cfg->setGroup( "General" );
     appItem->setRelpath( cfg->readPathEntry( "AppsRoot" ) );
     mCurrentItem = appItem;
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index c16da7d50..2f8a9775f 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 
 #include <tqdom.h>
 #include <tqfile.h>
@@ -44,7 +44,7 @@ ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( TQObject *parent, const char *
 
 void ScrollKeeperTreeBuilder::loadConfig()
 {
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   {
     TDEConfigGroupSaver groupSaver( cfg, "ScrollKeeper" );
     mShowEmptyDirs = cfg->readBoolEntry( "ShowEmptyDirs", false );
@@ -58,10 +58,10 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
 
   kdDebug(1400) << "ScrollKeeper language: " << lang << endl;
 
-  KProcIO proc;
+  TDEProcIO proc;
   proc << "scrollkeeper-get-content-list";
   proc << lang;
-  connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
+  connect(&proc,TQ_SIGNAL(readReady(TDEProcIO *)),TQ_SLOT(getContentsList(TDEProcIO *)));
   if (!proc.start(TDEProcess::Block)) {
     kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
     return 0;
@@ -106,7 +106,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
   return result;
 }
 
-void ScrollKeeperTreeBuilder::getContentsList( KProcIO *proc )
+void ScrollKeeperTreeBuilder::getContentsList( TDEProcIO *proc )
 {
   TQString filename;
   proc->readln( filename, true );
diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h
index cca8a2c22..73ed064b3 100644
--- a/khelpcenter/scrollkeepertreebuilder.h
+++ b/khelpcenter/scrollkeepertreebuilder.h
@@ -25,7 +25,7 @@
 
 #include "navigatoritem.h"
 
-class KProcIO;
+class TDEProcIO;
 
 class TQDomNode;
 
@@ -40,7 +40,7 @@ class ScrollKeeperTreeBuilder : public TQObject
     NavigatorItem *build( NavigatorItem *parent, NavigatorItem *after );
 
   private slots:
-    void getContentsList( KProcIO *proc );
+    void getContentsList( TDEProcIO *proc );
 
   private:
     void loadConfig();
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 07aa81535..e24279f0d 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -4,8 +4,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 
@@ -97,10 +97,10 @@ void SearchTraverser::connectHandler( SearchHandler *handler )
   int count = 0;
   if ( it != mConnectCount.end() ) count = *it;
   if ( count == 0 ) {
-    connect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
-      TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
-    connect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
-      TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
+    connect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
+      TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
+    connect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
+      TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
   }
   mConnectCount[ handler ] = ++count;
 }
@@ -116,10 +116,10 @@ void SearchTraverser::disconnectHandler( SearchHandler *handler )
     int count = *it;
     --count;
     if ( count == 0 ) {
-      disconnect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
-        this, TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
-      disconnect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
-        this, TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
+      disconnect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ),
+        this, TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) );
+      disconnect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ),
+        this, TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) );
     }
     mConnectCount[ handler ] = count;
   }
@@ -352,12 +352,12 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
       *mProc << arg.utf8();
     }
 
-    connect( mProc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
-    connect( mProc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
-    connect( mProc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-             TQT_SLOT( searchExited( TDEProcess * ) ) );
+    connect( mProc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+    connect( mProc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+    connect( mProc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+             TQ_SLOT( searchExited( TDEProcess * ) ) );
 
     mSearchRunning = true;
     mSearchResult = "";
@@ -366,7 +366,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
     mProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
 
     while (mSearchRunning && mProc->isRunning())
-      kapp->processEvents();
+      tdeApp->processEvents();
 
     if ( !mProc->normalExit() || mProc->exitStatus() != 0 ) {
       kdError() << "Unable to run search program '" << commonSearchProgram
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 54a0a9a38..1b66c32ee 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -24,12 +24,12 @@
 #include "prefs.h"
 #include "docentry.h"
 
-#include <kdesktopfile.h>
-#include <kprocess.h>
+#include <tdedesktopfile.h>
+#include <tdeprocess.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <stdlib.h>
 
@@ -44,7 +44,7 @@ SearchHandler *SearchHandler::initFromFile( const TQString &filename )
 {
   SearchHandler *handler = new SearchHandler;
 
-  KDesktopFile file( filename );
+  TDEDesktopFile file( filename );
 
   handler->mSearchCommand = file.readEntry( "SearchCommand" );
   handler->mSearchUrl = file.readEntry( "SearchUrl" );
@@ -114,12 +114,12 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
       *proc << arg.utf8();
     }
 
-    connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
-    connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
-             TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
-    connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-             TQT_SLOT( searchExited( TDEProcess * ) ) );
+    connect( proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) );
+    connect( proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+             TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) );
+    connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+             TQ_SLOT( searchExited( TDEProcess * ) ) );
 
     SearchJob *searchJob = new SearchJob;
     searchJob->mEntry = entry;
@@ -139,10 +139,10 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words,
     kdDebug() << "SearchHandler::search() URL: " << urlString << endl;
   
     TDEIO::TransferJob *job = TDEIO::get( KURL( urlString ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
     SearchJob *searchJob = new SearchJob;
     searchJob->mEntry = entry;
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index c4ceb20be..3dc86ed5d 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqcombobox.h>
 #include <tqlayout.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -81,8 +81,8 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
   for (int i=0; i < ScopeNum; ++i ) {
     mScopeCombo->insertItem( scopeSelectionLabel( i ) );
   }
-  connect( mScopeCombo, TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( scopeSelectionChanged( int ) ) );
+  connect( mScopeCombo, TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( scopeSelectionChanged( int ) ) );
 
   l = new TQLabel( mScopeCombo, i18n("&Scope selection:"), this );
 
@@ -96,16 +96,16 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent )
 
   TQPushButton *indexButton = new TQPushButton( i18n("Build Search &Index..."),
                                               this );
-  connect( indexButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( showIndexDialog() ) );
+  connect( indexButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( showIndexDialog() ) );
   topLayout->addWidget( indexButton );
 
 // FIXME: Use SearchHandler on double-clicked document
 #if 0
-  connect( mScopeListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           TQT_SLOT( scopeDoubleClicked( TQListViewItem * ) ) );
+  connect( mScopeListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           TQ_SLOT( scopeDoubleClicked( TQListViewItem * ) ) );
 #endif
-  connect( mScopeListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-           TQT_SLOT( scopeClicked( TQListViewItem * ) ) );
+  connect( mScopeListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+           TQ_SLOT( scopeClicked( TQListViewItem * ) ) );
 }
 
 
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 83083da9f..0ee679549 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -23,8 +23,8 @@
 #include "docentry.h"
 
 #include <kiconloader.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
@@ -133,8 +133,8 @@ int TOC::cachedCTime() const
 void TOC::buildCache()
 {
 	TDEProcess *meinproc = new TDEProcess;
-	connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ),
-	         this, TQT_SLOT( meinprocExited( TDEProcess * ) ) );
+	connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ),
+	         this, TQ_SLOT( meinprocExited( TDEProcess * ) ) );
 
 	*meinproc << locate( "exe", "meinproc" );
 	*meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" );
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index f7e5940fb..b0190afd8 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -13,7 +13,7 @@
 #include <tdehtmlview.h>
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfileinfo.h>
 #include <tqclipboard.h>
@@ -35,10 +35,10 @@ View::View( TQWidget *parentWidget, const char *widgetName,
 
     m_zoomStepping = 10;
 
-    connect( this, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             this, TQT_SLOT( setTitle( const TQString & ) ) );
-    connect( this, TQT_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ),
-             this, TQT_SLOT( showMenu( const TQString &, const TQPoint& ) ) );
+    connect( this, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             this, TQ_SLOT( setTitle( const TQString & ) ) );
+    connect( this, TQ_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ),
+             this, TQ_SLOT( showMenu( const TQString &, const TQPoint& ) ) );
              
     TQString css = langLookup("common/tde-default.css");
     if (!css.isEmpty())
@@ -62,7 +62,7 @@ View::~View()
 
 void View::copySelectedText()
 {
-  kapp->clipboard()->setText( selectedText() );
+  tdeApp->clipboard()->setText( selectedText() );
 }
 
 bool View::openURL( const KURL &url )
@@ -267,7 +267,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos)
   }
   else
   {
-    pop->insertItem(i18n("Copy Link Address"), this, TQT_SLOT(slotCopyLink()));
+    pop->insertItem(i18n("Copy Link Address"), this, TQ_SLOT(slotCopyLink()));
     mCopyURL = completeURL(url).url();
   }
 	
@@ -374,7 +374,7 @@ KURL View::urlFromLinkNode( const DOM::Node &n ) const
 
 void View::slotReload( const KURL &url )
 {
-  const_cast<TDEHTMLSettings *>( settings() )->init( kapp->config() );
+  const_cast<TDEHTMLSettings *>( settings() )->init( tdeApp->config() );
   KParts::URLArgs args = browserExtension()->urlArgs();
   args.reload = true;
   browserExtension()->setURLArgs( args );
diff --git a/khotkeys/CMakeL10n.txt b/khotkeys/CMakeL10n.txt
index 9efb3961d..5a4d15337 100644
--- a/khotkeys/CMakeL10n.txt
+++ b/khotkeys/CMakeL10n.txt
@@ -3,3 +3,9 @@
 tde_l10n_create_template( "khotkeys" )
 
 tde_l10n_auto_add_subdirectories()
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/khotkeys.desktop/"
+    SOURCES app/khotkeys.desktop kcontrol/khotkeys.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/khotkeys/TODO b/khotkeys/TODO
index d8e7fd352..00e84a7cc 100644
--- a/khotkeys/TODO
+++ b/khotkeys/TODO
@@ -11,7 +11,7 @@ SOON :
 pri modify gestures vymazat stav
 nektere simple akce by mely mit i conditions (nebo alespon jedno okno)
 QPtrList -> QValueList
-pouzit Q/KApp( nogui ? ) v daemonu ?
+pouzit Q/TDEApp( nogui ? ) v daemonu ?
 class Condition + tab 'Windows' -> 'Conditions'
   - asi rozdelit Command/URL na Command/URL a SwitchToWindow
   - nebo udelat, ze Command_url_action_data ( atd. ) maji jen jednu shortcut a tak, tj. dalsi zjednoduseni UI ?
diff --git a/khotkeys/app/CMakeLists.txt b/khotkeys/app/CMakeLists.txt
index df2bd70db..470fdf1ce 100644
--- a/khotkeys/app/CMakeLists.txt
+++ b/khotkeys/app/CMakeLists.txt
@@ -22,6 +22,14 @@ link_directories(
 )
 
 
+##### other data ################################
+
+tde_create_translated_desktop(
+  SOURCE khotkeys.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/kded
+)
+
+
 ##### kded_khotkeys (module) ####################
 
 tde_add_kpart( kded_khotkeys AUTOMOC
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 27e78d90c..64da17c14 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -16,6 +16,7 @@
 
 #include "app.h"
 
+#include <dcopclient.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
@@ -38,22 +39,20 @@ namespace KHotKeys
 // KhotKeysApp
 
 KHotKeysApp::KHotKeysApp()
-    :   KUniqueApplication( false, true ), // no styles
+    :   TDEUniqueApplication( false, true ), // no styles
         delete_helper( new TQObject )
     {
     init_global_data( true, delete_helper ); // grab keys
-    // CHECKME triggery a dalsi vytvaret az tady za inicializaci
     actions_root = NULL;
     reread_configuration();
     }
 
 KHotKeysApp::~KHotKeysApp()
     {
-    // CHECKME triggery a dalsi rusit uz tady pred cleanupem
     delete actions_root;
-// Many global data should be destroyed while the TQApplication object still
-// exists, and therefore 'this' cannot be the parent, as ~Object
-// for 'this' would be called after ~TQApplication - use proxy object
+    // Many global data should be destroyed while the TQApplication object still
+    // exists, and therefore 'this' cannot be the parent, as ~Object()
+    // for 'this' would be called after ~TQApplication() - use proxy object
     delete delete_helper;
     }
 
@@ -79,7 +78,7 @@ void KHotKeysApp::reread_configuration()
 
 void KHotKeysApp::quit()
     {
-    kapp->quit();
+    tdeApp->quit();
     }
 
 } // namespace KHotKeys
@@ -92,67 +91,53 @@ using namespace KHotKeys;
 static int khotkeys_screen_number = 0;
 
 extern "C"
-int KDE_EXPORT kdemain( int argc, char** argv )
+int TDE_EXPORT kdemain( int argc, char** argv )
+{
+  // Check if khotkeys is already running as a kded module.
+  // In such case just exit.
+  DCOPClient *dcopClient = new DCOPClient;
+  if (!dcopClient->isAttached())
+  {
+    if (!dcopClient->attach())
+    {
+      kdWarning(1217) << "khotkeys [application]: could not register with DCOP. Exiting." << endl;
+      delete dcopClient;
+      return 1;
+    }
+  }
+  TQCString replyType;
+  TQByteArray replyData;
+  if (dcopClient->call("kded", "kded", "loadedModules()",
+        TQByteArray(), replyType, replyData))
+  {
+    if (replyType == "QCStringList")
     {
-        {
-	// multiheaded hotkeys
-        TQCString multiHead = getenv("TDE_MULTIHEAD");
-        if (multiHead.lower() == "true") {
-	    Display *dpy = XOpenDisplay(NULL);
-	    if (! dpy) {
-		fprintf(stderr, "%s: FATAL ERROR while trying to open display %s\n",
-			argv[0], XDisplayName(NULL));
-		exit(1);
-	    }
-
-	    int number_of_screens = ScreenCount(dpy);
-	    khotkeys_screen_number = DefaultScreen(dpy);
-	    int pos;
-	    TQCString displayname = XDisplayString(dpy);
-	    XCloseDisplay(dpy);
-	    dpy = 0;
-
-	    if ((pos = displayname.findRev('.')) != -1)
-		displayname.remove(pos, 10);
-
-	    TQCString env;
-	    if (number_of_screens != 1) {
-		for (int i = 0; i < number_of_screens; i++) {
-		    if (i != khotkeys_screen_number && fork() == 0) {
-			khotkeys_screen_number = i;
-			// break here because we are the child process, we don't
-			// want to fork() anymore
-			break;
-		    }
-		}
-
-		env.sprintf("DISPLAY=%s.%d", displayname.data(), khotkeys_screen_number);
-		if (putenv(strdup(env.data()))) {
-		    fprintf(stderr,
-			    "%s: WARNING: unable to set DISPLAY environment variable\n",
-			    argv[0]);
-		    perror("putenv()");
-		}
-	    }
-	}
-        }
-
-    TQCString appname;
-    if (khotkeys_screen_number == 0)
-	appname = "khotkeys";
-    else
-	appname.sprintf("khotkeys-screen-%d", khotkeys_screen_number);
-
-                             // no need to i18n these, no GUI
-    TDECmdLineArgs::init( argc, argv, appname, I18N_NOOP( "KHotKeys" ),
-        I18N_NOOP( "KHotKeys daemon" ), KHOTKEYS_VERSION );
-    KUniqueApplication::addCmdLineOptions();
-    if( !KHotKeysApp::start()) // already running
-        return 0;
-    KHotKeysApp app;
-    app.disableSessionManagement();
-    return app.exec();
+      TQDataStream reply(replyData, IO_ReadOnly);
+      QCStringList modules;
+      reply >> modules;
+      if (modules.contains("khotkeys"))
+      {
+        // khotkeys is already running as a service, do nothing
+        kdWarning(1217) << "khotkeys is already running as a kded module. Exiting." << endl;
+        delete dcopClient;
+        return 2;
+      }
     }
+  }
+  delete dcopClient;
+
+  // no need to i18n these, no GUI
+  TDECmdLineArgs::init( argc, argv, "khotkeys", I18N_NOOP( "KHotKeys" ),
+      I18N_NOOP( "KHotKeys daemon" ), KHOTKEYS_VERSION );
+  TDEUniqueApplication::addCmdLineOptions();
+  if( !KHotKeysApp::start()) // already running
+  {
+    return 0;
+  }
+  KHotKeysApp app;
+  app.disableSessionManagement();
+  return app.exec();
+}
 
 
 #include "app.moc"
diff --git a/khotkeys/app/app.h b/khotkeys/app/app.h
index e0b3566ab..56c590886 100644
--- a/khotkeys/app/app.h
+++ b/khotkeys/app/app.h
@@ -11,7 +11,7 @@
 #ifndef _KHOTKEYS_APP_H_
 #define _KHOTKEYS_APP_H_
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 namespace KHotKeys
 {
@@ -19,7 +19,7 @@ namespace KHotKeys
 class Action_data_group;
 
 class KHotKeysApp
-    : public KUniqueApplication
+    : public TDEUniqueApplication
     {
     TQ_OBJECT
     K_DCOP
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index afbd2bceb..debb08d80 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -16,6 +16,7 @@
 
 #include "kded.h"
 
+#include <dcopclient.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
@@ -34,10 +35,18 @@
 #include <voices.h>
 
 extern "C" 
-KDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj )
-    {
-    return new KHotKeys::KHotKeysModule( obj );
-    }
+TDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj )
+{
+  // Check if khotkeys is already running as a stand alone application.
+  // In such case just exit.
+  if (tdeApp->dcopClient()->isApplicationRegistered("khotkeys"))
+  {
+    kdWarning(1217) << "khotkeys [kded module] is already running as a standalone application. Exiting." << endl;
+    return nullptr;
+  }
+
+  return new KHotKeys::KHotKeysModule( obj );
+}
 
 namespace KHotKeys
 {
@@ -47,22 +56,7 @@ namespace KHotKeys
 KHotKeysModule::KHotKeysModule( const TQCString& obj )
     : KDEDModule( obj )
     {
-    for( int i = 0;
-         i < 5;
-         ++i )
-        {
-        if( kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
-            {
-            TQByteArray data, replyData;
-            TQCString reply;
-            // wait for it to finish
-            kapp->dcopClient()->call( "khotkeys*", "khotkeys", "quit()", data, reply, replyData );
-            sleep( 1 );
-            }
-        }
-    client.registerAs( "khotkeys", false ); // extra dcop connection (like if it was an app)
     init_global_data( true, this ); // grab keys
-    // CHECKME triggery a dalsi vytvaret az tady za inicializaci
     actions_root = NULL;
     reread_configuration();
     }
diff --git a/khotkeys/app/kded.h b/khotkeys/app/kded.h
index b2740a3a1..026087abe 100644
--- a/khotkeys/app/kded.h
+++ b/khotkeys/app/kded.h
@@ -12,27 +12,27 @@
 #define _KHOTKEYS_KDED_H_
 
 #include <kdedmodule.h>
-#include <dcopclient.h>
 
 namespace KHotKeys
 {
 
 class Action_data_group;
 
-class KHotKeysModule
-    : public KDEDModule
+class KHotKeysModule : public KDEDModule
     {
     TQ_OBJECT
     K_DCOP
+
     k_dcop:
         ASYNC reread_configuration();
         ASYNC quit(); 
+
     public:
         KHotKeysModule( const TQCString& obj );
         virtual ~KHotKeysModule();
+
     private:
         Action_data_group* actions_root;
-        DCOPClient client;
     };
 
 //***************************************************************************
diff --git a/khotkeys/app/khotkeys.desktop b/khotkeys/app/khotkeys.desktop
new file mode 100644
index 000000000..b40b5a6e5
--- /dev/null
+++ b/khotkeys/app/khotkeys.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Service
+
+Name=KHotkeys Daemon
+
+Comment=Handles input actions for the current session
+
+X-TDE-ServiceTypes=KDEDModule
+X-TDE-ModuleType=Library
+X-TDE-Library=khotkeys
+X-TDE-FactoryName=khotkeys
+X-TDE-Kded-autoload=true
+X-TDE-Kded-load-on-demand=false
diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp
index 0fdc48ab9..e556d218f 100644
--- a/khotkeys/arts/soundrecorder_arts.cpp
+++ b/khotkeys/arts/soundrecorder_arts.cpp
@@ -41,7 +41,7 @@
 #define ABS(X) ( ((X)>0) ? (X) : -(X) )
 
 extern "C"
-KDE_EXPORT
+TDE_EXPORT
 KHotKeys::SoundRecorder* khotkeys_soundrecorder_create( TQObject* parent, const char* name )
 {
     return new KHotKeys::SoundRecorderArts( parent, name );
@@ -61,7 +61,7 @@ SoundRecorderArts::SoundRecorderArts(TQObject *parent, const char *name)
         ( void ) check;
 
 	m_recStream->usePolling( false );
-	connect( m_recStream, TQT_SIGNAL(data (TQByteArray &)), this, TQT_SLOT(slotDataReceived(TQByteArray& )));
+	connect( m_recStream, TQ_SIGNAL(data (TQByteArray &)), this, TQ_SLOT(slotDataReceived(TQByteArray& )));
 }
 
 SoundRecorderArts::~SoundRecorderArts()
@@ -80,7 +80,7 @@ void SoundRecorderArts::start()
 void SoundRecorderArts::stop()
 {
 	m_recStream->stop();
-	TQTimer::singleShot(400,this,TQT_SLOT(slotEmitSignal()));
+	TQTimer::singleShot(400,this,TQ_SLOT(slotEmitSignal()));
 }
 
 void SoundRecorderArts::abort()
diff --git a/khotkeys/arts/voicerecorder_arts.cpp b/khotkeys/arts/voicerecorder_arts.cpp
index 8b5c752ad..b63e16cad 100644
--- a/khotkeys/arts/voicerecorder_arts.cpp
+++ b/khotkeys/arts/voicerecorder_arts.cpp
@@ -25,7 +25,7 @@
 #include <arts/kplayobjectfactory.h>
 
 extern "C"
-KDE_EXPORT
+TDE_EXPORT
 void khotkeys_voicerecorder_arts_play( const TQString& file )
 {
         KHotKeys::VoiceRecorder::arts_play_fun check = khotkeys_voicerecorder_arts_play; // check the type matches
diff --git a/khotkeys/data/trinity2b1.khotkeys b/khotkeys/data/trinity2b1.khotkeys
index 7dfe3e0ec..967f389ad 100644
--- a/khotkeys/data/trinity2b1.khotkeys
+++ b/khotkeys/data/trinity2b1.khotkeys
@@ -395,7 +395,6 @@ MouseButton=2
 Timeout=1000
 
 [Main]
-Autostart=true
 Disabled=false
 Version=2
 ImportId=trinity2b1
diff --git a/khotkeys/kcontrol/CMakeL10n.txt b/khotkeys/kcontrol/CMakeL10n.txt
deleted file mode 100644
index a51e4afa8..000000000
--- a/khotkeys/kcontrol/CMakeL10n.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_create_template(
-    CATALOG "desktop_files/khotkeys.desktop/"
-    SOURCES khotkeys.desktop
-    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
-)
diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt
index 902c5a0e6..b1bd06bdd 100644
--- a/khotkeys/kcontrol/CMakeLists.txt
+++ b/khotkeys/kcontrol/CMakeLists.txt
@@ -47,12 +47,3 @@ tde_add_kpart( kcm_khotkeys AUTOMOC
   LINK ui-static
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
-
-
-##### kcm_khotkeys_init (module) ################
-
-tde_add_kpart( kcm_khotkeys_init AUTOMOC
-  SOURCES init.cpp
-  LINK tdecore-shared
-  DESTINATION ${PLUGIN_INSTALL_DIR}
-)
diff --git a/khotkeys/kcontrol/Makefile.am b/khotkeys/kcontrol/Makefile.am
index 03a728ae3..8f0a18480 100644
--- a/khotkeys/kcontrol/Makefile.am
+++ b/khotkeys/kcontrol/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = ui
 
-kde_module_LTLIBRARIES = kcm_khotkeys.la kcm_khotkeys_init.la
+kde_module_LTLIBRARIES = kcm_khotkeys.la
 
 kcm_khotkeys_la_SOURCES = \
     menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp \
@@ -15,11 +15,6 @@ kcm_khotkeys_la_SOURCES = \
 kcm_khotkeys_la_LIBADD  = ui/libui.la $(LIB_TDEUI) $(LIB_ARTS) 
 kcm_khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 
-kcm_khotkeys_init_la_SOURCES = init.cpp
-    
-kcm_khotkeys_init_la_LIBADD  = $(LIB_TDECORE)
-kcm_khotkeys_init_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-
 noinst_HEADERS = menuedit.h window_trigger_widget.h \
     tab_widget.h main_buttons_widget.h actions_listview_widget.h menuentry_widget.h \
     general_tab.h action_group_tab.h kcmkhotkeys.h windowdef_list_widget.h \
diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp
index 1bdeffd75..8ba35f323 100644
--- a/khotkeys/kcontrol/action_group_tab.cpp
+++ b/khotkeys/kcontrol/action_group_tab.cpp
@@ -36,18 +36,18 @@ Action_group_tab::Action_group_tab( TQWidget* parent_P , const char* name_P )
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( disable_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
-        module, TQT_SLOT( changed()));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( disable_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_multilineedit, TQ_SIGNAL( textChanged()),
+        module, TQ_SLOT( changed()));
     }
     
 void Action_group_tab::clear_data()
     {
-    disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
-        TQT_SLOT( action_group_name_changed( const TQString& )));
+    disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this,
+        TQ_SLOT( action_group_name_changed( const TQString& )));
     action_name_lineedit->clear();
     action_name_lineedit->setReadOnly( false );
     disable_checkbox->setChecked( false );
@@ -71,8 +71,8 @@ void Action_group_tab::set_data( const Action_data_group* data_P )
     else
         disable_checkbox->setText( i18n( "&Disable" ));
     comment_multilineedit->setText( data_P->comment());
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this,
-        TQT_SLOT( action_group_name_changed( const TQString& )));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this,
+        TQ_SLOT( action_group_name_changed( const TQString& )));
     system_group = data_P->system_group();
     }
 
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index d007ab5f5..2f87132d8 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -50,7 +50,7 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
     popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION );
     popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION );
     popup->insertItem( i18n( "Waiting..." ), TYPE_WAITING_ACTION );
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
     new_button->setPopup( popup );
     actions_listview->header()->hide();
     actions_listview->addColumn( "" );
@@ -60,17 +60,17 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
     modify_button->setEnabled( false );
     delete_button->setEnabled( false );
     clear_data();
-    connect( actions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( actions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
 
     // KHotKeys::Module::changed()
-    connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)), module, TQT_SLOT(changed()));
+    connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)), module, TQ_SLOT(changed()));
     }
 
 Action_list_widget::~Action_list_widget()
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index 1b6c7a743..9fe4716c2 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -39,10 +39,10 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char
     actions_listview->header()->hide();
     actions_listview->addColumn( "" );
     actions_listview->setRootIsDecorated( true ); // CHECKME
-    connect( actions_listview, TQT_SIGNAL( current_changed( TQListViewItem* )),
-        TQT_SLOT( current_changed( TQListViewItem* )));
-    connect( actions_listview, TQT_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )),
-        TQT_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
+    connect( actions_listview, TQ_SIGNAL( current_changed( TQListViewItem* )),
+        TQ_SLOT( current_changed( TQListViewItem* )));
+    connect( actions_listview, TQ_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )),
+        TQ_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
     // KHotKeys::Module::changed()
     }
 
diff --git a/khotkeys/kcontrol/command_url_widget.cpp b/khotkeys/kcontrol/command_url_widget.cpp
index 133913360..5d06c1a16 100644
--- a/khotkeys/kcontrol/command_url_widget.cpp
+++ b/khotkeys/kcontrol/command_url_widget.cpp
@@ -37,8 +37,8 @@ Command_url_widget::Command_url_widget( TQWidget* parent_P, const char* name_P )
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( command_url_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( command_url_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 void Command_url_widget::clear_data()
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 817602a12..f0a43cb93 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -49,10 +49,10 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
     popup->insertItem( i18n( "Not_condition", "Not" ), TYPE_NOT );
     popup->insertItem( i18n( "And_condition", "And" ), TYPE_AND );
     popup->insertItem( i18n( "Or_condition", "Or" ), TYPE_OR );
-    connect( conditions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( conditions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
 
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
     new_button->setPopup( popup );
     conditions_listview->header()->hide();
     conditions_listview->addColumn( "" );
@@ -66,14 +66,14 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
     move_down_button->setEnabled( false );
     clear_data();
     // KHotKeys::Module::changed()
-    connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
-    connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
-    connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)),
-            module, TQT_SLOT(changed()));
+    connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed()));
+    connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed()));
+    connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed()));
+    connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)),
+            module, TQ_SLOT(changed()));
     }
 
 Condition_list_widget::~Condition_list_widget()
diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp
index bee149860..d986e5a51 100644
--- a/khotkeys/kcontrol/dcop_widget.cpp
+++ b/khotkeys/kcontrol/dcop_widget.cpp
@@ -36,14 +36,14 @@ Dcop_widget::Dcop_widget( TQWidget* parent_P, const char* name_P )
     clear_data();
     try_button->setText( i18n( "to try", "&Try" )); // Qt designer can't do this
     // KHotKeys::Module::changed()
-    connect( remote_app_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( remote_object_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( called_function_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( arguments_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( remote_app_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( remote_object_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( called_function_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( arguments_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
     
 void Dcop_widget::clear_data()
diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp
index cf2337446..07382c4ed 100644
--- a/khotkeys/kcontrol/general_settings_tab.cpp
+++ b/khotkeys/kcontrol/general_settings_tab.cpp
@@ -26,9 +26,6 @@ namespace KHotKeys
 General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name_P )
     : General_settings_tab_ui( parent_P, name_P )
     {
-    // KHotKeys::Module::changed()
-    connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
     }
 
 void General_settings_tab::import_clicked()
@@ -36,16 +33,6 @@ void General_settings_tab::import_clicked()
     module->import();
     }
 
-void General_settings_tab::write_data() const
-    {
-    module->set_daemon_disabled( disable_daemon_checkbox->isChecked());
-    }
-
-void General_settings_tab::read_data()
-    {
-    disable_daemon_checkbox->setChecked( module->daemon_disabled());
-    }
-
 void General_settings_tab::clear_data()
     {
     // "global" tab, not action specific, do nothing
diff --git a/khotkeys/kcontrol/general_settings_tab.h b/khotkeys/kcontrol/general_settings_tab.h
index ba76bf68e..962111b36 100644
--- a/khotkeys/kcontrol/general_settings_tab.h
+++ b/khotkeys/kcontrol/general_settings_tab.h
@@ -22,8 +22,6 @@ class General_settings_tab
     TQ_OBJECT
     public:
         General_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
-        void read_data();
-        void write_data() const;
     public slots:
         void clear_data();
     protected slots:
diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp
index 1cd98d461..21ca6f952 100644
--- a/khotkeys/kcontrol/general_tab.cpp
+++ b/khotkeys/kcontrol/general_tab.cpp
@@ -73,22 +73,22 @@ General_tab::General_tab( TQWidget* parent_P, const char* name_P )
             }
     clear_data();
     // KHotKeys::Module::changed()
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( disable_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_multilineedit, TQT_SIGNAL( textChanged()),
-        module, TQT_SLOT( changed()));
-    connect( action_type_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( disable_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_multilineedit, TQ_SIGNAL( textChanged()),
+        module, TQ_SLOT( changed()));
+    connect( action_type_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
     }
     
 void General_tab::clear_data()
     {
-    disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        this, TQT_SLOT( action_name_changed( const TQString& )));
-    disconnect( action_type_combo, TQT_SIGNAL( activated( int )),
-        this, TQT_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
+    disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        this, TQ_SLOT( action_name_changed( const TQString& )));
+    disconnect( action_type_combo, TQ_SIGNAL( activated( int )),
+        this, TQ_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ?
     action_name_lineedit->clear();
     disable_checkbox->setChecked( false );
     disable_checkbox->setText( i18n( "&Disable" ));
@@ -113,10 +113,10 @@ void General_tab::set_data( const Action_data* data_P )
     comment_multilineedit->setText( data_P->comment());
     action_type_combo->setCurrentItem( Tab_widget::type( data_P ));
 //    module->set_action_type( data_P->type());
-    connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        TQT_SLOT( action_name_changed( const TQString& )));
-    connect( action_type_combo, TQT_SIGNAL( activated( int )),
-        TQT_SIGNAL( action_type_changed( int )));
+    connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        TQ_SLOT( action_name_changed( const TQString& )));
+    connect( action_type_combo, TQ_SIGNAL( activated( int )),
+        TQ_SIGNAL( action_type_changed( int )));
     }
 
 void General_tab::get_data( TQString& name_O, TQString& comment_O, bool& enabled_O )
diff --git a/khotkeys/kcontrol/gesture_triggers_tab.cpp b/khotkeys/kcontrol/gesture_triggers_tab.cpp
index b00f60963..52c41cd9e 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.cpp
+++ b/khotkeys/kcontrol/gesture_triggers_tab.cpp
@@ -35,12 +35,12 @@ Gesture_triggers_tab::Gesture_triggers_tab( TQWidget* parent_P, const char* name
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( gesture_edit_button1, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( gesture_edit_button2, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( gesture_edit_button3, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( gesture_edit_button1, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( gesture_edit_button2, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( gesture_edit_button3, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     } 
 
 void Gesture_triggers_tab::clear_data()
@@ -142,8 +142,8 @@ Gesture_edit_dialog::Gesture_edit_dialog( const TQString& gesture_P )
     _page = new GestureRecordPage( _gesture,
                                   this, "GestureRecordPage");
    
-//    connect(_page, TQT_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
-//            this, TQT_SLOT(enableButtonOK(bool)));
+//    connect(_page, TQ_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture
+//            this, TQ_SLOT(enableButtonOK(bool)));
    
     setMainWidget( _page );
     }
diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp
index e9e768bb0..bc254a878 100644
--- a/khotkeys/kcontrol/gesturerecordpage.cpp
+++ b/khotkeys/kcontrol/gesturerecordpage.cpp
@@ -49,8 +49,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
     _recorder = new GestureRecorder(this, "recorder");
     _recorder->setMinimumHeight(150);
     setStretchFactor(_recorder, 1);
-    connect(_recorder, TQT_SIGNAL(recorded(const TQString &)),
-            this, TQT_SLOT(slotRecorded(const TQString &)));
+    connect(_recorder, TQ_SIGNAL(recorded(const TQString &)),
+            this, TQ_SLOT(slotRecorded(const TQString &)));
 
     TQHBox *hBox = new TQHBox(this, "hbox");
 
@@ -62,8 +62,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
     hBox->setStretchFactor(spacer, 1);
 
     _resetButton = new TQPushButton(i18n("&Reset"), hBox, "resetButton");
-    connect(_resetButton, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotResetClicked()));
+    connect(_resetButton, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotResetClicked()));
 
 
 
diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp
index 8585fedbc..200fa6b97 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.cpp
+++ b/khotkeys/kcontrol/gestures_settings_tab.cpp
@@ -39,12 +39,12 @@ Gestures_settings_tab::Gestures_settings_tab( TQWidget* parent_P, const char* na
     mouse_button_combo->insertItem( i18n( "Button 8 (if available)" ), 6 );
     mouse_button_combo->insertItem( i18n( "Button 9 (if available)" ), 7 );
     // KHotKeys::Module::changed()
-    connect( mouse_gestures_globally, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( mouse_button_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( timeout_input, TQT_SIGNAL( valueChanged( int )),
-        module, TQT_SLOT( changed()));
+    connect( mouse_gestures_globally, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( mouse_button_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( timeout_input, TQ_SIGNAL( valueChanged( int )),
+        module, TQ_SLOT( changed()));
     }
 
 void Gestures_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
deleted file mode 100644
index 9b34b2686..000000000
--- a/khotkeys/kcontrol/init.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-
- KHotKeys
- 
- Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
-
- Distributed under the terms of the GNU General Public License version 2.
- 
-****************************************************************************/
-
-#define _INIT_CPP_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dcopref.h>
-#include <tdeapplication.h>
-#include <tdeconfig.h>
-#include <kdebug.h>
-#include <stdlib.h>
-
-extern "C"
-{
-    KDE_EXPORT void init_khotkeys()
-    {
-    TDEConfig cfg( "khotkeysrc", true );
-    cfg.setGroup( "Main" );
-    if( !cfg.readBoolEntry( "Autostart", false ))
-        return;
-    // Non-xinerama multhead support in KDE is just a hack
-    // involving forking apps per-screen. Don't bother with
-    // kded modules in such case.
-    TQCString multiHead = getenv("TDE_MULTIHEAD");
-    if (multiHead.lower() == "true")
-        kapp->tdeinitExec( "khotkeys" );
-    else
-        {
-        DCOPRef ref( "kded", "kded" );
-        if( !ref.call( "loadModule", TQCString( "khotkeys" )))
-            {
-            kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl;
-            kapp->tdeinitExec( "khotkeys" );
-            }
-        }
-    }
-}
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 85dbaaaa8..80c50d56c 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <tdeglobal.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdefiledialog.h>
 #include <dcopref.h>
 #include <klibloader.h>
@@ -48,7 +48,7 @@
 
 extern "C"
 {
-    KDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
+    TDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
     {
 //    sleep( 20 ); // CHECKME DEBUG
     TDEGlobal::locale()->insertCatalogue("khotkeys");
@@ -67,7 +67,7 @@ Module::Module( TQWidget* parent_P, const char* )
     {
     setButtons( Help | Cancel | Apply | Ok );
     module = this;
-    init_global_data( false, TQT_TQOBJECT(this) ); // don't grab keys
+    init_global_data( false, this ); // don't grab keys
     init_arts();
     TQVBoxLayout* vbox = new TQVBoxLayout( this ); 
     vbox->setSpacing( 6 );
@@ -78,12 +78,12 @@ Module::Module( TQWidget* parent_P, const char* )
     vbox->addWidget( splt );
     buttons_widget = new Main_buttons_widget( this );
     vbox->addWidget( buttons_widget );
-    connect( actions_listview_widget, TQT_SIGNAL( current_action_changed()),
-        TQT_SLOT( listview_current_action_changed()));
-    connect( buttons_widget, TQT_SIGNAL( new_action_pressed()),  TQT_SLOT( new_action()));
-    connect( buttons_widget, TQT_SIGNAL( new_action_group_pressed()),  TQT_SLOT( new_action_group()));
-    connect( buttons_widget, TQT_SIGNAL( delete_action_pressed()),  TQT_SLOT( delete_action()));
-    connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings()));
+    connect( actions_listview_widget, TQ_SIGNAL( current_action_changed()),
+        TQ_SLOT( listview_current_action_changed()));
+    connect( buttons_widget, TQ_SIGNAL( new_action_pressed()),  TQ_SLOT( new_action()));
+    connect( buttons_widget, TQ_SIGNAL( new_action_group_pressed()),  TQ_SLOT( new_action_group()));
+    connect( buttons_widget, TQ_SIGNAL( delete_action_pressed()),  TQ_SLOT( delete_action()));
+    connect( buttons_widget, TQ_SIGNAL( global_settings_pressed()), TQ_SLOT( global_settings()));
 //    listview_current_action_changed(); // init
 						
 		TDEAboutData* about = new TDEAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION,
@@ -122,24 +122,33 @@ void Module::save()
     tab_widget->save_current_action_changes();
     settings.actions = _actions_root;
     settings.write_settings();
-    if( daemon_disabled())
+    if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
+        // khotkeys running as a standalone application
         TQByteArray data;
-        kapp->dcopClient()->send( "khotkeys*", "khotkeys", "quit()", data );
-        kdDebug( 1217 ) << "disabling khotkeys daemon" << endl;
+        kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
+        tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
         }
     else
         {
-        if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
+        TQCString replyType;
+        TQByteArray replyData;
+        if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
+              TQByteArray(), replyType, replyData))
             {
-            kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-            TDEApplication::tdeinitExec( "khotkeys" );
-            }
-        else
-            {
-            TQByteArray data;
-            kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
-            kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
+            if (replyType == "QCStringList")
+                {
+                TQDataStream reply(replyData, IO_ReadOnly);
+                QCStringList modules;
+                reply >> modules;
+                if (modules.contains("khotkeys"))
+                    {
+                    // khotkeys running as a kded service
+                    TQByteArray data;
+                    kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
+                    tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
+                    }
+                }
             }
         }
     emit TDECModule::changed( false );
@@ -276,7 +285,7 @@ void Module::import()
         i18n( "Select File with Actions to Be Imported" ));
     if( file.isEmpty())
         return;
-    KSimpleConfig cfg( file, true );
+    TDESimpleConfig cfg( file, true );
     if( !settings.import( cfg, true ))
         {
         KMessageBox::error( topLevelWidget(),
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index 7d1876d8d..46e28ecd9 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -51,8 +51,6 @@ class Module
         int gesture_timeout() const;
         void set_gestures_exclude( Windowdef_list* windows );
         const Windowdef_list* gestures_exclude() const;
-        void set_daemon_disabled( bool disable );
-        bool daemon_disabled() const;
         void import();
 		TDEShortcut voice_shortcut() const;
 		void set_voice_shortcut( const TDEShortcut&) ;
@@ -140,19 +138,6 @@ const Windowdef_list* Module::gestures_exclude() const
     }
 
 inline
-void Module::set_daemon_disabled( bool disabled_P )
-    {
-    settings.daemon_disabled = disabled_P;
-    }
-
-inline
-bool Module::daemon_disabled() const
-    {
-    return settings.daemon_disabled;
-    }
-
-
-inline
 void Module::set_voice_shortcut( const TDEShortcut& cut)
    {
     settings.voice_shortcut=cut;
diff --git a/khotkeys/kcontrol/keyboard_input_widget.cpp b/khotkeys/kcontrol/keyboard_input_widget.cpp
index 4d5727482..a518fa02d 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.cpp
+++ b/khotkeys/kcontrol/keyboard_input_widget.cpp
@@ -36,16 +36,16 @@ Keyboard_input_widget::Keyboard_input_widget( TQWidget* parent_P, const char* na
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( action_window_radio, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( active_window_radio, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( specific_window_radio, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( keyboard_input_multilineedit, TQT_SIGNAL( textChanged()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( action_window_radio, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( active_window_radio, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( specific_window_radio, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( keyboard_input_multilineedit, TQ_SIGNAL( textChanged()),
+        module, TQ_SLOT( changed()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     }
 
 void Keyboard_input_widget::clear_data()
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index 4394e36b6..d9e0c5af2 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -5,8 +5,7 @@ Type=Application
 X-DocPath=kcontrol/khotkeys/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=khotkeys
-X-TDE-Init-Library=khotkeys_init
-X-TDE-Init=khotkeys
+X-TDE-StartupNotify=false
 Categories=Qt;TDE;X-TDE-settings-accessibility;
 
 Name=Input Actions
diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp
index 3532cc13f..4a1e258b5 100644
--- a/khotkeys/kcontrol/main_buttons_widget.cpp
+++ b/khotkeys/kcontrol/main_buttons_widget.cpp
@@ -26,18 +26,18 @@ namespace KHotKeys
 Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P )
     : Main_buttons_widget_ui( parent_P, name_P )
     {
-    connect( new_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_pressed()));
-    connect( new_action_group_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_group_pressed()));
-    connect( delete_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( delete_action_pressed()));
-    connect( global_settings_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( global_settings_pressed()));
+    connect( new_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_pressed()));
+    connect( new_action_group_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_group_pressed()));
+    connect( delete_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( delete_action_pressed()));
+    connect( global_settings_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( global_settings_pressed()));
     enable_delete( false );
     // KHotKeys::Module::changed()
-    connect( new_action_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( new_action_group_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_action_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( new_action_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( new_action_group_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( delete_action_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why
     }
 
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 08b8a3c22..12191ff63 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -189,18 +189,36 @@ KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P )
 void khotkeys_send_reread_config()
     {
     TQByteArray data;
-    if( !kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
-    if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
+    if( !tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
+    if(tdeApp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
-        kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-        TDEApplication::tdeinitExec( "khotkeys" );
+        // khotkeys running as a standalone application
+        TQByteArray data;
+        kdDebug( 1217 ) << "telling khotkeys standalone application to reread configuration" << endl;
+        tdeApp->dcopClient()->send( "khotkeys", "khotkeys", "reread_configuration()", data );
         }
     else
         {
-        TQByteArray data;
-        kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
-        kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
+        TQCString replyType;
+        TQByteArray replyData;
+        if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()",
+              TQByteArray(), replyType, replyData))
+            {
+            if (replyType == "QCStringList")
+                {
+                TQDataStream reply(replyData, IO_ReadOnly);
+                QCStringList modules;
+                reply >> modules;
+                if (modules.contains("khotkeys"))
+                    {
+                    // khotkeys running as a kded service
+                    TQByteArray data;
+                    kdDebug( 1217 ) << "telling khotkeys kded daemon to reread configuration" << endl;
+                    tdeApp->dcopClient()->send( "kded", "khotkeys", "reread_configuration()", data );
+                    }
+                }
+            }
         }
     }
 
@@ -303,7 +321,6 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
         return "";
         }
     entry->reparent( khotkeys_get_menu_root( settings.actions ));
-    settings.daemon_disabled = false; // #91782
     settings.write_settings();
     khotkeys_send_reread_config();
     return shortcut;
diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h
index f7aa43436..776076e1d 100644
--- a/khotkeys/kcontrol/menuedit.h
+++ b/khotkeys/kcontrol/menuedit.h
@@ -21,24 +21,24 @@ extern "C"
     {
 // initializes khotkeys DSO - loads i18n catalogue
 // handled automatically by KHotKeys wrapper class in kmenuedit
-KDE_EXPORT void khotkeys_init( void );
+TDE_EXPORT void khotkeys_init( void );
 // clean up khotkeys DSO
 // handled automatically by KHotKeys wrapper class in kmenuedit
-KDE_EXPORT void khotkeys_cleanup( void );
+TDE_EXPORT void khotkeys_cleanup( void );
 // return keyboard shortcut ( e.g. "ALT+T" ) for given menu entry ( e.g.
 // "System/Konsole.desktop"
-KDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P );
+TDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P );
 // changes assigned shortcut to menu entry a updates config file
-KDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
+TDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
     const TQString& shortcut_P );
 // menu entry was moved in TDE Menu
-KDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P );
+TDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P );
 // menu entry was removed
-KDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P );
+TDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P );
 // List of all hotkeys in use
-KDE_EXPORT TQStringList khotkeys_get_all_shortcuts( );
+TDE_EXPORT TQStringList khotkeys_get_all_shortcuts( );
 // Find menu entry that uses shortcut
-KDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P );
+TDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P );
     } // extern "C"
 
 #endif
diff --git a/khotkeys/kcontrol/menuentry_widget.cpp b/khotkeys/kcontrol/menuentry_widget.cpp
index 9b313d20d..8fac287b8 100644
--- a/khotkeys/kcontrol/menuentry_widget.cpp
+++ b/khotkeys/kcontrol/menuentry_widget.cpp
@@ -37,8 +37,8 @@ Menuentry_widget::Menuentry_widget( TQWidget* parent_P, const char* name_P )
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( menuentry_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( menuentry_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 void Menuentry_widget::clear_data()
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index d3ca4afbe..9f9bba39c 100644
--- a/khotkeys/kcontrol/tab_widget.cpp
+++ b/khotkeys/kcontrol/tab_widget.cpp
@@ -59,8 +59,8 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P )
     pages[ TAB_GESTURES_SETTINGS ] = new Gestures_settings_tab;
     General_tab* general_tab;
     pages[ TAB_GENERAL ] = general_tab = new General_tab;
-    connect( general_tab, TQT_SIGNAL( action_type_changed( int )),
-        TQT_SLOT( set_action_type_slot( int )));
+    connect( general_tab, TQ_SIGNAL( action_type_changed( int )),
+        TQ_SLOT( set_action_type_slot( int )));
     pages[ TAB_GROUP_GENERAL ] = new Action_group_tab;
     pages[ TAB_CONDITIONS ] = new Condition_list_tab;
     pages[ TAB_ACTIONS ] = new Action_list_tab;
@@ -76,7 +76,7 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P )
     for( tab_pos_t i = TAB_FIRST;
          i < TAB_END;
          ++i )
-        connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+        connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
 #ifdef HAVE_ARTS
     if( haveArts())
         show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
@@ -103,7 +103,6 @@ void Tab_widget::save_current_action_changes()
     if( current_type == NONE ) // info, global settings
         {
         static_cast< Gestures_settings_tab* >( pages[ TAB_GESTURES_SETTINGS ] )->write_data(); // saves
-        static_cast< General_settings_tab* >( pages[ TAB_GENERAL_SETTINGS ] )->write_data(); // saves
         static_cast< Voice_settings_tab* >( pages[ TAB_VOICE_SETTINGS ] )->write_data(); // saves
         }
     else if( current_type == GROUP )
@@ -235,7 +234,6 @@ void Tab_widget::load_current_action()
         {
         static_cast< Gestures_settings_tab* >( pages[ TAB_GESTURES_SETTINGS ] )->read_data(); // loads
         static_cast< Voice_settings_tab* >( pages[ TAB_VOICE_SETTINGS ] )->read_data(); // loads
-        static_cast< General_settings_tab* >( pages[ TAB_GENERAL_SETTINGS ] )->read_data(); // loads
         }
     else if( current_type == GROUP )
         {
@@ -441,18 +439,18 @@ void Tab_widget::show_pages( const Pages_set& pages_P )
         {
         removePage( pages[ i ] );
         if( pages_P.is_set( i )) // don't clear page contents if it stays visible
-            disconnect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+            disconnect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
         }
     clear_pages();
     // reconnect all pages to this signal
-    disconnect( this, TQT_SIGNAL( clear_pages_signal()), NULL, NULL );
+    disconnect( this, TQ_SIGNAL( clear_pages_signal()), NULL, NULL );
     for( tab_pos_t i = TAB_FIRST;
          i < TAB_END;
          ++i )
         {
         if( pages_P.is_set( i ))
             addTab( pages[ i ], i18n( tab_labels[ i ] ));
-        connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data()));
+        connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data()));
         }
     show();
     }
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 947a148b8..d3773c3f3 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -55,9 +55,9 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
     if( haveArts())
         popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER );
 #endif
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
-    connect( triggers_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
+    connect( triggers_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
 
     new_button->setPopup( popup );
     copy_button->setEnabled( false );
@@ -69,16 +69,16 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P )
     triggers_listview->setForceSelect( true );
     clear_data();
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( new_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( copy_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( delete_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 Triggers_tab::~Triggers_tab()
@@ -230,8 +230,8 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
     lay->addWidget( bt, 0 , TQt::AlignHCenter );
     lay->addStretch();
     clear_data();
-    connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )),
-        this, TQT_SLOT( capturedShortcut( const TDEShortcut& )));
+    connect( bt, TQ_SIGNAL( capturedShortcut( const TDEShortcut& )),
+        this, TQ_SLOT( capturedShortcut( const TDEShortcut& )));
     }
 
 void Shortcut_trigger_widget::clear_data()
@@ -320,8 +320,8 @@ Gesture_trigger_dialog::Gesture_trigger_dialog( Gesture_trigger* trigger_P )
     _page = new GestureRecordPage( _trigger->gesturecode(),
                                   this, "GestureRecordPage");
 
-    connect(_page, TQT_SIGNAL(gestureRecorded(bool)),
-            this, TQT_SLOT(enableButtonOK(bool)));
+    connect(_page, TQ_SIGNAL(gestureRecorded(bool)),
+            this, TQ_SLOT(enableButtonOK(bool)));
 
     setMainWidget( _page );
     }
@@ -343,7 +343,7 @@ _trigger( trigger_P ), _page( NULL )
 {
 	_page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : TQString::null ,  this, "VoiceRecordPage");
 
-	connect(_page, TQT_SIGNAL(voiceRecorded(bool)), this, TQT_SLOT(enableButtonOK(bool)));
+	connect(_page, TQ_SIGNAL(voiceRecorded(bool)), this, TQ_SLOT(enableButtonOK(bool)));
 
 	setMainWidget( _page );
 }
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index 69d51ef55..5e56226a9 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -98,9 +98,9 @@
         </widget>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">action_group_name_changed( const TQString&amp; )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index 2895e5752..12537d770 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -185,14 +185,14 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
     <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
     <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index 5a285b32e..375ae4138 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -50,9 +50,9 @@
         </widget>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index 269b889ce..98b13c653 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -184,14 +184,14 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
     <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
     <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
index feeae535d..a9dc2e8c6 100644
--- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
@@ -261,10 +261,10 @@
     <tabstop>try_button</tabstop>
     <tabstop>PushButton1</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">run_kdcop_pressed()</slot>
     <slot access="protected" specifier="pure virtual">try_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
index 9dc10309e..e119c8512 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -16,14 +16,6 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="TQCheckBox">
-            <property name="name">
-                <cstring>disable_daemon_checkbox</cstring>
-            </property>
-            <property name="text">
-                <string>Disable KHotKeys daemon</string>
-            </property>
-        </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout1</cstring>
@@ -107,9 +99,9 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">import_clicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index 9deef2245..b422d09cc 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -133,10 +133,10 @@
         </widget>
     </vbox>
 </widget>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">action_name_changed( const TQString&amp; )</slot>
     <slot access="protected" specifier="pure virtual">action_type_changed(int)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
index 068806a02..c848ef4fe 100644
--- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
@@ -506,11 +506,11 @@
         <slot>edit_gesture_pressed3()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed1()</slot>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed2()</slot>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed3()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
index 521e44f46..ff00fbf6e 100644
--- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
@@ -183,9 +183,9 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
index 6af0aefc6..a24d36665 100644
--- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
@@ -89,9 +89,9 @@
         <slot>browse_pressed()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
index 557be7dd4..e1d110522 100644
--- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
@@ -157,12 +157,12 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
index bcd113c57..8ccb8a9e2 100644
--- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
@@ -90,11 +90,11 @@
         <slot>slotPlayPressed()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">slotRecordPressed()</slot>
     <slot access="protected" specifier="pure virtual">slotPlayPressed()</slot>
     <slot access="protected" specifier="pure virtual">slotStopPressed()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
index aaa52e891..78a106a81 100644
--- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
@@ -156,12 +156,12 @@
 <forwards>
     <forward>class TQListViewItem;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
index d15dab5df..a21633852 100644
--- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
@@ -480,11 +480,11 @@
     <tabstop>window_role_lineedit</tabstop>
     <tabstop>autodetect_button</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">window_class_combo_changed(int)</slot>
     <slot access="protected" specifier="pure virtual">window_role_combo_changed(int)</slot>
     <slot access="protected" specifier="pure virtual">window_title_combo_changed(int)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp
index 1d97d69ab..952cc0dbe 100644
--- a/khotkeys/kcontrol/voice_settings_tab.cpp
+++ b/khotkeys/kcontrol/voice_settings_tab.cpp
@@ -26,7 +26,7 @@ namespace KHotKeys
 Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P )
     : Voice_settings_tab_ui( parent_P, name_P )
     {
-		connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& )));
+		connect( keyButton , TQ_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQ_SLOT(slotCapturedKey( const TDEShortcut& )));
     }
 
 void Voice_settings_tab::read_data()
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index fc231a82c..daef922c9 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tdemessagebox.h>
 #include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -46,13 +46,13 @@ bool VoiceRecorder::init( KLibrary* lib )
 }
 
 VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name)
-	: Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(TQT_TQOBJECT(this))) , _state(sNotModified), _tempFile(0L) ,  _voiceId(voiceId)
+	: Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) ,  _voiceId(voiceId)
 {
 	_sound=sound_P;
 	buttonPlay->setEnabled(sound_P.size() > 50);
 	buttonStop->setEnabled(false);
 
-	connect (_recorder , TQT_SIGNAL(recorded(const Sound& )) , this , TQT_SLOT(slotSoundRecorded(const Sound& ) ));
+	connect (_recorder , TQ_SIGNAL(recorded(const Sound& )) , this , TQ_SLOT(slotSoundRecorded(const Sound& ) ));
 
 	//if(voiceid_P.isEmpty())
 	emit recorded(false);
@@ -168,7 +168,7 @@ bool VoiceRecorder::drawSound()
 	uint lx=0;
 	uint ly=height/2;
 
-	/***     DRAW THE TQT_SIGNAL     ******/
+	/***     DRAW THE TQ_SIGNAL     ******/
 	for(uint f=1; f<length; f++)
 	{
 		uint nx=f*width/length;
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index 1c7f8c938..d34ef7fad 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -12,7 +12,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdelocale.h>
 #include <tdemessagebox.h>
@@ -59,9 +59,9 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c
     setStretchFactor(spacer, 1);
 
 
-	connect(_recorder1, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
-	connect(_recorder2, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged()));
-	connect(_lineEdit , TQT_SIGNAL( textChanged (const TQString&)) , this , TQT_SLOT(slotChanged()));
+	connect(_recorder1, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged()));
+	connect(_recorder2, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged()));
+	connect(_lineEdit , TQ_SIGNAL( textChanged (const TQString&)) , this , TQ_SLOT(slotChanged()));
 
 
     }
diff --git a/khotkeys/kcontrol/waiting_widget.cpp b/khotkeys/kcontrol/waiting_widget.cpp
index 6f1c0c657..135261e30 100644
--- a/khotkeys/kcontrol/waiting_widget.cpp
+++ b/khotkeys/kcontrol/waiting_widget.cpp
@@ -33,8 +33,8 @@ Waiting_widget::Waiting_widget( TQWidget* parent_P, const char* name_P )
     : Waiting_widget_ui( parent_P, name_P )
     {
     // KHotKeys::Module::changed()
-    connect(waiting_spinbox, TQT_SIGNAL(valueChanged(int)),
-        module, TQT_SLOT(changed()));
+    connect(waiting_spinbox, TQ_SIGNAL(valueChanged(int)),
+        module, TQ_SLOT(changed()));
     }
 
 void Waiting_widget::set_data( const Waiting_action* data_P )
diff --git a/khotkeys/kcontrol/window_trigger_widget.cpp b/khotkeys/kcontrol/window_trigger_widget.cpp
index c897cf14a..ad8871504 100644
--- a/khotkeys/kcontrol/window_trigger_widget.cpp
+++ b/khotkeys/kcontrol/window_trigger_widget.cpp
@@ -33,14 +33,14 @@ Window_trigger_widget::Window_trigger_widget( TQWidget* parent_P, const char* na
     {
     clear_data();
     // KHotKeys::Module::changed()
-    connect( window_appears_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( window_disappears_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( window_activates_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( window_deactivates_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( window_appears_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( window_disappears_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( window_activates_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( window_deactivates_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     } 
 
 void Window_trigger_widget::clear_data()
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index dc16d780f..b36e46e0d 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -43,10 +43,10 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na
     {
     TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work
     popup->insertItem( i18n( "Simple Window..." ), TYPE_WINDOWDEF_SIMPLE );
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
 
-    connect( windows_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-             this, TQT_SLOT( modify_pressed() ) );
+    connect( windows_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+             this, TQ_SLOT( modify_pressed() ) );
     new_button->setPopup( popup );
     windows_listview->header()->hide();
     windows_listview->addColumn( "" );
@@ -57,16 +57,16 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na
     delete_button->setEnabled( false );
     clear_data();
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( new_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( copy_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( delete_button, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 Windowdef_list_widget::~Windowdef_list_widget()
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp
index e0a6671e7..381287166 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp
@@ -37,31 +37,31 @@ Windowdef_simple_widget::Windowdef_simple_widget( TQWidget* parent_P, const char
     window_title_lineedit->setEnabled( false );
     window_class_lineedit->setEnabled( false );
     window_role_lineedit->setEnabled( false );
-    connect( autodetect_button, TQT_SIGNAL( clicked()), TQT_SLOT( autodetect_clicked()));
+    connect( autodetect_button, TQ_SIGNAL( clicked()), TQ_SLOT( autodetect_clicked()));
     clear_data();
     // KHotKeys::Module::changed()
-    connect( window_title_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( window_title_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( window_class_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( window_class_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( window_role_combo, TQT_SIGNAL( activated( int )),
-        module, TQT_SLOT( changed()));
-    connect( window_role_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
-    connect( type_normal_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( type_dialog_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( type_dock_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( type_desktop_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
+    connect( window_title_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( window_title_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( window_class_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( window_class_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( window_role_combo, TQ_SIGNAL( activated( int )),
+        module, TQ_SLOT( changed()));
+    connect( window_role_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
+    connect( type_normal_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( type_dialog_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( type_dock_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( type_desktop_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
+    connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )),
+        module, TQ_SLOT( changed()));
     }
 
 void Windowdef_simple_widget::clear_data()
@@ -144,9 +144,9 @@ void Windowdef_simple_widget::window_title_combo_changed( int item_P )
     
 void Windowdef_simple_widget::set_autodetect( TQObject* obj_P, const char* slot_P )
     {
-    disconnect( TQT_SIGNAL( autodetect_signal()));
+    disconnect( TQ_SIGNAL( autodetect_signal()));
     if( obj_P != NULL )
-        connect( this, TQT_SIGNAL( autodetect_signal()), obj_P, slot_P );
+        connect( this, TQ_SIGNAL( autodetect_signal()), obj_P, slot_P );
     }
     
 void Windowdef_simple_widget::autodetect_clicked()
@@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked()
     
 void Windowdef_simple_widget::autodetect()
     {
-    WindowSelector* sel = new WindowSelector( TQT_TQOBJECT(this), TQT_SLOT( autodetect_window_selected( WId )));
+    WindowSelector* sel = new WindowSelector( this, TQ_SLOT( autodetect_window_selected( WId )));
     sel->select();
     }
 
diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index 745f85682..0b3389fbe 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -29,20 +29,20 @@ namespace KHotKeys
 
 WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
     {
-    connect( this, TQT_SIGNAL( selected_signal( WId )), receiver_P, slot_P );
+    connect( this, TQ_SIGNAL( selected_signal( WId )), receiver_P, slot_P );
     }
 
 void WindowSelector::select()
     {
-    kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
-    kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+    tdeApp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
+    tdeApp->installX11EventFilter( this );
     }
 
 bool WindowSelector::x11Event( XEvent* e )
     {
     if( e->type != ButtonPress )
         return false;
-    kapp->desktop()->releaseMouse();
+    tdeApp->desktop()->releaseMouse();
     if( e->xbutton.button == Button1 )
         {
         WId window = findRealWindow( e->xbutton.subwindow );
diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp
index 4f481ea59..7993f1dc8 100644
--- a/khotkeys/shared/action_data.cpp
+++ b/khotkeys/shared/action_data.cpp
@@ -295,7 +295,7 @@ Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_
     set_trigger( new Shortcut_trigger( this, shortcut_P ));
     }
 
-template<> KDE_EXPORT
+template<> TDE_EXPORT
 void Simple_action_data< Shortcut_trigger, Command_url_action >
     ::cfg_write( TDEConfig& cfg_P ) const
     {
@@ -315,7 +315,7 @@ Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_grou
     set_trigger( new Shortcut_trigger( this, shortcut_P ));
     }
     
-template<> KDE_EXPORT
+template<> TDE_EXPORT
 void Simple_action_data< Shortcut_trigger, Menuentry_action >
     ::cfg_write( TDEConfig& cfg_P ) const
     {
@@ -325,7 +325,7 @@ void Simple_action_data< Shortcut_trigger, Menuentry_action >
 
 // Dcop_shortcut_action_data
 
-template<> KDE_EXPORT
+template<> TDE_EXPORT
 void Simple_action_data< Shortcut_trigger, Dcop_action >
     ::cfg_write( TDEConfig& cfg_P ) const
     {
@@ -335,7 +335,7 @@ void Simple_action_data< Shortcut_trigger, Dcop_action >
 
 // Keyboard_input_shortcut_action_data
 
-template<> KDE_EXPORT
+template<> TDE_EXPORT
 void Simple_action_data< Shortcut_trigger, Keyboard_input_action >
     ::cfg_write( TDEConfig& cfg_P ) const
     {
@@ -345,7 +345,7 @@ void Simple_action_data< Shortcut_trigger, Keyboard_input_action >
 
 // Activate_window_shortcut_action_data
 
-template<> KDE_EXPORT
+template<> TDE_EXPORT
 void Simple_action_data< Shortcut_trigger, Activate_window_action >
     ::cfg_write( TDEConfig& cfg_P ) const
     {
diff --git a/khotkeys/shared/action_data.h b/khotkeys/shared/action_data.h
index 5d84c6f18..a29ef591f 100644
--- a/khotkeys/shared/action_data.h
+++ b/khotkeys/shared/action_data.h
@@ -31,7 +31,7 @@ namespace KHotKeys
 
 class Action_data_group;
 
-class KDE_EXPORT Action_data_base
+class TDE_EXPORT Action_data_base
     {
     public:
         Action_data_base( Action_data_group* parent_P, const TQString& name_P,
@@ -61,7 +61,7 @@ class KDE_EXPORT Action_data_base
     KHOTKEYS_DISABLE_COPY( Action_data_base );
     };
 
-class KDE_EXPORT Action_data_group
+class TDE_EXPORT Action_data_group
     : public Action_data_base
     {
     public:
@@ -88,7 +88,7 @@ class KDE_EXPORT Action_data_group
     };
         
 // this one represents a "whole" action, i.e. triggers, resulting actions, etc.
-class KDE_EXPORT Action_data
+class TDE_EXPORT Action_data
     : public Action_data_base
     {
         typedef Action_data_base base;
@@ -121,7 +121,7 @@ class KDE_EXPORT Action_data
 #endif
     };        
 
-class KDE_EXPORT Generic_action_data
+class TDE_EXPORT Generic_action_data
     : public Action_data
     {
         typedef Action_data base;
@@ -141,7 +141,7 @@ class KDE_EXPORT Generic_action_data
     };
 
 template< typename T, typename A >
-class KDE_EXPORT Simple_action_data
+class TDE_EXPORT Simple_action_data
     : public Action_data
     {
         typedef Action_data base;
@@ -157,7 +157,7 @@ class KDE_EXPORT Simple_action_data
         virtual void cfg_write( TDEConfig& cfg_P ) const;
     };
 
-class KDE_EXPORT Command_url_shortcut_action_data
+class TDE_EXPORT Command_url_shortcut_action_data
     : public Simple_action_data< Shortcut_trigger, Command_url_action >
     {
         typedef Simple_action_data< Shortcut_trigger, Command_url_action > base;
@@ -170,7 +170,7 @@ class KDE_EXPORT Command_url_shortcut_action_data
         Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P );
     };
 
-class KDE_EXPORT Menuentry_shortcut_action_data
+class TDE_EXPORT Menuentry_shortcut_action_data
     : public Simple_action_data< Shortcut_trigger, Menuentry_action >
     {
         typedef Simple_action_data< Shortcut_trigger, Menuentry_action > base;
@@ -189,7 +189,7 @@ typedef Simple_action_data< Shortcut_trigger, Keyboard_input_action >
 typedef Simple_action_data< Shortcut_trigger, Activate_window_action >
     Activate_window_shortcut_action_data;
 
-class KDE_EXPORT Keyboard_input_gesture_action_data
+class TDE_EXPORT Keyboard_input_gesture_action_data
     : public Action_data
     {
         typedef Action_data base;
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index 69c853fed..b5e7baa8e 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -21,14 +21,14 @@
 #include <kdebug.h>
 #include <kurifilter.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdelocale.h>
 #include <tdeaccel.h>
 #include <kservice.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdemessagebox.h>
 
 #include "windows.h"
@@ -124,7 +124,7 @@ void Command_url_action::execute()
     static bool sm_ready = false;
     if( !sm_ready )
         {
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         sm_ready = true;
         }
 //    int space_pos = command_url().find( ' ' );
@@ -149,7 +149,7 @@ void Command_url_action::execute()
             }
         case KURIFilterData::EXECUTABLE:
             {
-            if (!kapp->authorize("shell_access"))
+            if (!tdeApp->authorize("shell_access"))
 		return;
             if( !uri.hasArgsAndOptions())
                 {
@@ -167,7 +167,7 @@ void Command_url_action::execute()
             }
         case KURIFilterData::SHELL:
             {
-            if (!kapp->authorize("shell_access"))
+            if (!tdeApp->authorize("shell_access"))
 		return;
             if( !KRun::runCommand(
                 cmd + ( uri.hasArgsAndOptions() ? uri.argsAndOptions() : "" ),
diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h
index c7cabf0fc..d2e63db85 100644
--- a/khotkeys/shared/actions.h
+++ b/khotkeys/shared/actions.h
@@ -30,7 +30,7 @@ class Windowdef_list;
 
 // this one is a base for all "real" resulting actions, e.g. running a command,
 // Action_data instances usually contain at least one Action
-class KDE_EXPORT Action
+class TDE_EXPORT Action
     {
     public:
         Action( Action_data* data_P );
@@ -46,7 +46,7 @@ class KDE_EXPORT Action
     KHOTKEYS_DISABLE_COPY( Action );
     };
 
-class KDE_EXPORT Action_list
+class TDE_EXPORT Action_list
     : public TQPtrList< Action >
     {
     public:
@@ -60,7 +60,7 @@ class KDE_EXPORT Action_list
     KHOTKEYS_DISABLE_COPY( Action_list );
     };
 
-class KDE_EXPORT Command_url_action
+class TDE_EXPORT Command_url_action
     : public Action
     {
     typedef Action base;
@@ -78,7 +78,7 @@ class KDE_EXPORT Command_url_action
         TQString _command_url;
     };
     
-class KDE_EXPORT Menuentry_action
+class TDE_EXPORT Menuentry_action
     : public Command_url_action
     {
     typedef Command_url_action base;
@@ -94,7 +94,7 @@ class KDE_EXPORT Menuentry_action
         KService::Ptr _service;
     };
     
-class KDE_EXPORT Dcop_action
+class TDE_EXPORT Dcop_action
     : public Action
     {
     typedef Action base;
@@ -117,7 +117,7 @@ class KDE_EXPORT Dcop_action
         TQString args;
     };
         
-class KDE_EXPORT Keyboard_input_action
+class TDE_EXPORT Keyboard_input_action
     : public Action
     {
     typedef Action base;
@@ -142,7 +142,7 @@ class KDE_EXPORT Keyboard_input_action
         bool _active_window;
     };
 
-class KDE_EXPORT Activate_window_action
+class TDE_EXPORT Activate_window_action
     : public Action
     {
     typedef Action base;
@@ -159,7 +159,7 @@ class KDE_EXPORT Activate_window_action
         const Windowdef_list* _window;
     };
         
-class KDE_EXPORT Waiting_action
+class TDE_EXPORT Waiting_action
     : public Action
     {
     typedef Action base;
diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp
index b09284b44..1d9f37b9c 100644
--- a/khotkeys/shared/conditions.cpp
+++ b/khotkeys/shared/conditions.cpp
@@ -257,8 +257,8 @@ Active_window_condition::Active_window_condition( TDEConfig& cfg_P, Condition_li
 
 void Active_window_condition::init()
     {
-    connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-        this, TQT_SLOT( active_window_changed( WId )));
+    connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+        this, TQ_SLOT( active_window_changed( WId )));
     }
 
 bool Active_window_condition::match() const
@@ -323,8 +323,8 @@ Existing_window_condition::Existing_window_condition( TDEConfig& cfg_P, Conditio
 
 void Existing_window_condition::init()
     {
-    connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
     }
 
 bool Existing_window_condition::match() const
diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h
index 8e5b9e813..02b43a63c 100644
--- a/khotkeys/shared/conditions.h
+++ b/khotkeys/shared/conditions.h
@@ -30,7 +30,7 @@ class Action_data_base;
 class Action_data;
 class Condition_list_base;
 
-class KDE_EXPORT Condition
+class TDE_EXPORT Condition
     {
     public:
         Condition( Condition_list_base* parent_P );
@@ -49,7 +49,7 @@ class KDE_EXPORT Condition
     KHOTKEYS_DISABLE_COPY( Condition );
     };
         
-class KDE_EXPORT Condition_list_base
+class TDE_EXPORT Condition_list_base
     : public Condition, public TQPtrList< Condition > // inheritance ?
     {
     typedef Condition base;
@@ -64,7 +64,7 @@ class KDE_EXPORT Condition_list_base
         typedef TQPtrListIterator< Condition > Iterator;
     };
 
-class KDE_EXPORT Condition_list
+class TDE_EXPORT Condition_list
     : public Condition_list_base
     {
     typedef Condition_list_base base;
@@ -84,7 +84,7 @@ class KDE_EXPORT Condition_list
         Action_data_base* data;
     };
 
-class KDE_EXPORT Active_window_condition
+class TDE_EXPORT Active_window_condition
     : public TQObject, public Condition
     {
     TQ_OBJECT
@@ -111,7 +111,7 @@ class KDE_EXPORT Active_window_condition
         bool is_match;
     };
             
-class KDE_EXPORT Existing_window_condition
+class TDE_EXPORT Existing_window_condition
     : public TQObject, public Condition
     {
     TQ_OBJECT
@@ -139,7 +139,7 @@ class KDE_EXPORT Existing_window_condition
         bool is_match;
     };
 
-class KDE_EXPORT Not_condition
+class TDE_EXPORT Not_condition
     : public Condition_list_base
     {
     typedef Condition_list_base base;
@@ -154,7 +154,7 @@ class KDE_EXPORT Not_condition
         virtual bool accepts_children() const;
     };
             
-class KDE_EXPORT And_condition
+class TDE_EXPORT And_condition
     : public Condition_list_base
     {
     typedef Condition_list_base base;
@@ -167,7 +167,7 @@ class KDE_EXPORT And_condition
         virtual const TQString description() const;
     };
             
-class KDE_EXPORT Or_condition
+class TDE_EXPORT Or_condition
     : public Condition_list_base
     {
     typedef Condition_list_base base;
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 9933ba74f..d38d4f023 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -49,9 +49,9 @@ Gesture::Gesture( bool /*enabled_P*/, TQObject* parent_P )
     (void) new DeleteObject( this, parent_P );
     assert( gesture_handler == NULL );
     gesture_handler = this;
-    connect( &nostroke_timer, TQT_SIGNAL( timeout()), TQT_SLOT( stroke_timeout()));
-    connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-        TQT_SLOT( active_window_changed( WId )));
+    connect( &nostroke_timer, TQ_SIGNAL( timeout()), TQ_SLOT( stroke_timeout()));
+    connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+        TQ_SLOT( active_window_changed( WId )));
     }
       
 Gesture::~Gesture()
@@ -86,15 +86,15 @@ void Gesture::update_grab()
     if( _enabled && handlers.count() > 0
         && ( exclude == NULL || !exclude->match( Window_data( windows_handler->active_window()))))
         {
-        kapp->removeX11EventFilter( this ); // avoid being installed twice
-        kapp->installX11EventFilter( this );
+        tdeApp->removeX11EventFilter( this ); // avoid being installed twice
+        tdeApp->installX11EventFilter( this );
         // CHECKME at se grabuje jen kdyz je alespon jedno gesto?
         grab_mouse( true );
         }
     else
         {
         grab_mouse( false );
-        kapp->removeX11EventFilter( this );
+        tdeApp->removeX11EventFilter( this );
         }
     }
 
@@ -108,7 +108,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P )
     if( handlers.contains( receiver_P ))
         return;
     handlers[ receiver_P ] = true;
-    connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+    connect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
         receiver_P, slot_P );
     if( handlers.count() == 1 )
         update_grab();
@@ -119,7 +119,7 @@ void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P )
     if( !handlers.contains( receiver_P ))
         return;
     handlers.remove( receiver_P );
-    disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+    disconnect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
         receiver_P, slot_P );
     if( handlers.count() == 0 )
         update_grab();
diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h
index 01da65d00..9f4825f93 100644
--- a/khotkeys/shared/gestures.h
+++ b/khotkeys/shared/gestures.h
@@ -23,9 +23,9 @@ namespace KHotKeys
 {
 
 class Gesture;
-KDE_EXPORT extern Gesture* gesture_handler;
+TDE_EXPORT extern Gesture* gesture_handler;
 
-class KDE_EXPORT Stroke
+class TDE_EXPORT Stroke
     {
     public:
     // maximum number of numbers in stroke
@@ -62,7 +62,7 @@ class KDE_EXPORT Stroke
 	char ret_val[ MAX_SEQUENCE ];
     };
 
-class KDE_EXPORT Gesture
+class TDE_EXPORT Gesture
     : public TQWidget // not TQObject because of x11EventFilter()
     {
     TQ_OBJECT
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 7b9696c7e..44176ef44 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <tqwidget.h>
 
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeversion.h>
@@ -106,12 +106,12 @@ void Kbd::grab_shortcut( const TDEShortcut& shortcut_P )
         // CHECKME ugly ugly hack
         TQString name = ' ' + TQString::number( keycode_P );
         kga->insertItem( "", name, keycode_P );
-        kga->connectItem( name, this, TQT_SLOT( key_slot( int )));
+        kga->connectItem( name, this, TQ_SLOT( key_slot( int )));
 #endif
         TQString name = ' ' + shortcut_P.toStringInternal();
         kga->insert( name, name, TQString::null, shortcut_P, shortcut_P,
-            this, TQT_SLOT( key_slot( TQString )));
-        TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+            this, TQ_SLOT( key_slot( TQString )));
+        TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
         }
     }
     
@@ -129,7 +129,7 @@ void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P )
 #endif
         kga->remove( ' ' + shortcut_P.toStringInternal());
         grabs.remove( shortcut_P );
-        TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+        TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
         }
     }
 
diff --git a/khotkeys/shared/khlistbox.cpp b/khotkeys/shared/khlistbox.cpp
index ff6d96221..f0080d6de 100644
--- a/khotkeys/shared/khlistbox.cpp
+++ b/khotkeys/shared/khlistbox.cpp
@@ -25,15 +25,15 @@ KHListBox::KHListBox( TQWidget* parent_P, const char* name_P )
     : TQListBox( parent_P, name_P ), saved_current_item( NULL ),
         in_clear( false ), force_select( false )
     {
-    connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
-        TQT_SLOT( slot_selection_changed( TQListBoxItem* )));
-    connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
-        TQT_SLOT( slot_current_changed( TQListBoxItem* )));
+    connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* )),
+        TQ_SLOT( slot_selection_changed( TQListBoxItem* )));
+    connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem* )),
+        TQ_SLOT( slot_current_changed( TQListBoxItem* )));
     // CHECKME grrr
-    connect( this, TQT_SIGNAL( selectionChanged()),
-        TQT_SLOT( slot_selection_changed()));
-    connect( &insert_select_timer, TQT_SIGNAL( timeout()),
-        TQT_SLOT( slot_insert_select()));
+    connect( this, TQ_SIGNAL( selectionChanged()),
+        TQ_SLOT( slot_selection_changed()));
+    connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+        TQ_SLOT( slot_insert_select()));
     }
 
 void KHListBox::slot_selection_changed()
diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp
index ae348af33..a9943996a 100644
--- a/khotkeys/shared/khlistview.cpp
+++ b/khotkeys/shared/khlistview.cpp
@@ -25,15 +25,15 @@ KHListView::KHListView( TQWidget* parent_P, const char* name_P )
     : TDEListView( parent_P, name_P ), saved_current_item( NULL ),
         in_clear( false ), ignore( false ), force_select( false )
     {
-    connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )),
-        TQT_SLOT( slot_selection_changed( TQListViewItem* )));
-    connect( this, TQT_SIGNAL( currentChanged( TQListViewItem* )),
-        TQT_SLOT( slot_current_changed( TQListViewItem* )));
+    connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem* )),
+        TQ_SLOT( slot_selection_changed( TQListViewItem* )));
+    connect( this, TQ_SIGNAL( currentChanged( TQListViewItem* )),
+        TQ_SLOT( slot_current_changed( TQListViewItem* )));
     // CHECKME grrr
-    connect( this, TQT_SIGNAL( selectionChanged()),
-        TQT_SLOT( slot_selection_changed()));
-    connect( &insert_select_timer, TQT_SIGNAL( timeout()),
-        TQT_SLOT( slot_insert_select()));
+    connect( this, TQ_SIGNAL( selectionChanged()),
+        TQ_SLOT( slot_selection_changed()));
+    connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+        TQ_SLOT( slot_insert_select()));
     }
 
 void KHListView::slot_selection_changed()
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index 1a0f27e2b..01fbf9e28 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -14,12 +14,12 @@
 #include <tqtimer.h>
 
 #include <tdelistview.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KHotKeys
 {
 
-class KDE_EXPORT KHListView
+class TDE_EXPORT KHListView
     : public TDEListView
     {
     TQ_OBJECT
diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp
index 87fe74c38..123aa8bf9 100644
--- a/khotkeys/shared/khotkeysglobal.cpp
+++ b/khotkeys/shared/khotkeysglobal.cpp
@@ -18,7 +18,7 @@
 
 #include <assert.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klibloader.h>
 
 #include "input.h"
diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h
index c97ef1dea..427958936 100644
--- a/khotkeys/shared/khotkeysglobal.h
+++ b/khotkeys/shared/khotkeysglobal.h
@@ -38,17 +38,17 @@ extern Windows* windows_handler;
 #define KHOTKEYS_DISABLE_COPY( cls ) private: cls( const cls& ); cls& operator=( const cls& )
 
 // CHECKME hmms :(
-KDE_EXPORT bool khotkeys_active();
-KDE_EXPORT void khotkeys_set_active( bool active_P );
+TDE_EXPORT bool khotkeys_active();
+TDE_EXPORT void khotkeys_set_active( bool active_P );
 
 TQString get_menu_entry_from_path( const TQString& path_P );
 
-KDE_EXPORT void init_global_data( bool active_P, TQObject* owner_P );
+TDE_EXPORT void init_global_data( bool active_P, TQObject* owner_P );
 
 const char* const MENU_EDITOR_ENTRIES_GROUP_NAME = I18N_NOOP( "Menu Editor entries" );
 
-KDE_EXPORT bool haveArts();
-KDE_EXPORT void disableArts();
+TDE_EXPORT bool haveArts();
+TDE_EXPORT void disableArts();
 
 //***************************************************************************
 // Inline
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index becacd5d1..c4068564e 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -103,8 +103,6 @@ bool Settings::read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportT
         }
     if( import_P != ImportNone )
         return true; // don't read global settings
-    cfg_P.setGroup( "Main" ); // main group
-    daemon_disabled = cfg_P.readBoolEntry( "Disabled", false );
     cfg_P.setGroup( "Gestures" );
     gestures_disabled_globally = cfg_P.readBoolEntry( "Disabled", true );
     gesture_mouse_button = cfg_P.readNumEntry( "MouseButton", 2 );
@@ -132,9 +130,6 @@ void Settings::write_settings()
     cfg.writeEntry( "AlreadyImported", already_imported );
     cfg.setGroup( "Data" );
     int cnt = write_actions_recursively_v2( cfg, actions, true );
-    cfg.setGroup( "Main" );
-    cfg.writeEntry( "Autostart", cnt != 0 && !daemon_disabled );
-    cfg.writeEntry( "Disabled", daemon_disabled );
     cfg.setGroup( "Gestures" );
     cfg.writeEntry( "Disabled", gestures_disabled_globally );
     cfg.writeEntry( "MouseButton", gesture_mouse_button );
@@ -155,7 +150,6 @@ void Settings::write_settings()
 
 
 // return value means the number of enabled actions written in the cfg file
-// i.e. 'Autostart' for value > 0 should be on
 int Settings::write_actions_recursively_v2( TDEConfig& cfg_P, Action_data_group* parent_P, bool enabled_P )
     {
     int enabled_cnt = 0;
diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h
index e28502cfe..da4a291c1 100644
--- a/khotkeys/shared/settings.h
+++ b/khotkeys/shared/settings.h
@@ -26,7 +26,7 @@ enum ImportType
     ImportSilent // if already imported before, ignore (called from the update script)
     };
 
-class KDE_EXPORT Settings
+class TDE_EXPORT Settings
     {
     public:
         Settings();
@@ -37,7 +37,6 @@ class KDE_EXPORT Settings
         bool gestures_disabled_globally;
         int gesture_mouse_button;
         int gesture_timeout;
-        bool daemon_disabled;
         Windowdef_list* gestures_exclude;
 		TDEShortcut voice_shortcut;
     protected:
diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h
index 6453563de..f62eb2855 100644
--- a/khotkeys/shared/sound.h
+++ b/khotkeys/shared/sound.h
@@ -22,12 +22,12 @@
 
 #include <tqmemarray.h>
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
 @author Olivier Goffart
 */
-class KDE_EXPORT Sound{
+class TDE_EXPORT Sound{
 public:
     Sound();
     ~Sound();
diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h
index 5a770abbe..5f0ffe9fe 100644
--- a/khotkeys/shared/soundrecorder.h
+++ b/khotkeys/shared/soundrecorder.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include "sound.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLibrary;
 
@@ -34,7 +34,7 @@ namespace KHotKeys
 /**
 @author Olivier Goffart
 */
-class KDE_EXPORT SoundRecorder : public TQObject
+class TDE_EXPORT SoundRecorder : public TQObject
 {
 TQ_OBJECT
 public:
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 5bd8dbe3e..5457d8226 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -16,7 +16,7 @@
 
 #include "triggers.h"
 
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <twinmodule.h>
@@ -197,13 +197,13 @@ Window_trigger::~Window_trigger()
 void Window_trigger::init()
     {
     kdDebug( 1217 ) << "Window_trigger::init()" << endl;
-    connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
     if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ ))
-        connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
-            this, TQT_SLOT( active_window_changed( WId )));
-    connect( windows_handler, TQT_SIGNAL( window_changed( WId, unsigned int )),
-        this, TQT_SLOT( window_changed( WId, unsigned int )));
+        connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+            this, TQ_SLOT( active_window_changed( WId )));
+    connect( windows_handler, TQ_SIGNAL( window_changed( WId, unsigned int )),
+        this, TQ_SLOT( window_changed( WId, unsigned int )));
     }
 
 void Window_trigger::activate( bool activate_P )
@@ -335,7 +335,7 @@ Gesture_trigger::Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P )
 
 Gesture_trigger::~Gesture_trigger()
     {
-    gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+    gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     }
 
 void Gesture_trigger::cfg_write( TDEConfig& cfg_P ) const
@@ -368,9 +368,9 @@ void Gesture_trigger::handle_gesture( const TQString &gesture_P, WId window_P )
 void Gesture_trigger::activate( bool activate_P )
     {
     if( activate_P )
-        gesture_handler->register_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+        gesture_handler->register_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     else
-        gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+        gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
     }
 
 
diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h
index 3ed2171f0..681f784b7 100644
--- a/khotkeys/shared/triggers.h
+++ b/khotkeys/shared/triggers.h
@@ -14,7 +14,7 @@
 #include <tqptrlist.h>
 #include <tqtimer.h>
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "khotkeysglobal.h"
 #include "voicesignature.h"
@@ -29,7 +29,7 @@ namespace KHotKeys
 class Windowdef_list;
 class Action_data;
 
-class KDE_EXPORT Trigger
+class TDE_EXPORT Trigger
     {
     public:
         Trigger( Action_data* data_P );
@@ -45,7 +45,7 @@ class KDE_EXPORT Trigger
     KHOTKEYS_DISABLE_COPY( Trigger );
     };
 
-class KDE_EXPORT Trigger_list
+class TDE_EXPORT Trigger_list
     : public TQPtrList< Trigger >
     {
     public:
@@ -61,7 +61,7 @@ class KDE_EXPORT Trigger_list
     KHOTKEYS_DISABLE_COPY( Trigger_list );
     };
     
-class KDE_EXPORT Shortcut_trigger
+class TDE_EXPORT Shortcut_trigger
     : public Trigger, public Kbd_receiver
     {
     typedef Trigger base;
@@ -79,7 +79,7 @@ class KDE_EXPORT Shortcut_trigger
         TDEShortcut _shortcut;
     };
 
-class KDE_EXPORT Window_trigger
+class TDE_EXPORT Window_trigger
     : public TQObject, public Trigger        
     {
     TQ_OBJECT
@@ -121,7 +121,7 @@ class KDE_EXPORT Window_trigger
         bool active;
     };
 
-class KDE_EXPORT Gesture_trigger
+class TDE_EXPORT Gesture_trigger
     : public TQObject, public Trigger
     {
     TQ_OBJECT
@@ -142,7 +142,7 @@ class KDE_EXPORT Gesture_trigger
     };
 
 
-class KDE_EXPORT Voice_trigger
+class TDE_EXPORT Voice_trigger
     : public TQObject, public Trigger
     {
     TQ_OBJECT
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index a31ac8237..693c01044 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -28,7 +28,7 @@
 #include <kxerrorhandler.h>
 #include <kkeynative.h>
 #include <tqtimer.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 
 
 #include <X11/Xlib.h>
@@ -95,7 +95,7 @@ void Voice::record_start()
 	if(!_recorder)
 	{
 		_recorder= SoundRecorder::create(this);
-		connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& )));
+		connect(_recorder, TQ_SIGNAL(recorded(const Sound& )), this, TQ_SLOT(slot_sound_recorded(const Sound& )));
 	}
 
 	_recorder->start();
@@ -208,7 +208,7 @@ void Voice::set_shortcut( const TDEShortcut &shortcut)
         _kga = new TDEGlobalAccel( this );	
     _kga->remove("voice");
 
-	_kga->insert( "voice", i18n("Voice"), TQString::null,  shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;
+	_kga->insert( "voice", i18n("Voice"), TQString::null,  shortcut, 0, this, TQ_SLOT(slot_key_pressed())) ;
         _kga->updateConnections();
 }
 
@@ -224,7 +224,7 @@ void Voice::slot_key_pressed()
 		if(!_timer)
 		{
 			_timer=new TQTimer(this);
-			connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout()));
+			connect(_timer, TQ_SIGNAL(timeout()) , this, TQ_SLOT(slot_timeout()));
 		}
 		
 		_timer->start(1000*20,true);
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index ccf7943fc..f5e1127ff 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -28,7 +28,7 @@ class Voice_trigger;
 class VoiceSignature;
 
 
-class KDE_EXPORT Voice  : public TQObject
+class TDE_EXPORT Voice  : public TQObject
     {
     TQ_OBJECT
     public:
@@ -76,7 +76,7 @@ class KDE_EXPORT Voice  : public TQObject
     };
 
 	
-KDE_EXPORT extern Voice* voice_handler;
+TDE_EXPORT extern Voice* voice_handler;
 
 } // namespace KHotKeys
 
diff --git a/khotkeys/shared/voicesignature.h b/khotkeys/shared/voicesignature.h
index af987cce1..e0f31bb31 100644
--- a/khotkeys/shared/voicesignature.h
+++ b/khotkeys/shared/voicesignature.h
@@ -23,7 +23,7 @@
 
 #include <tqmemarray.h>
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class Sound;
 class TDEConfigBase;
@@ -66,7 +66,7 @@ namespace KHotKeys
 /**
 @author Olivier Goffart
 */
-class KDE_EXPORT VoiceSignature{
+class TDE_EXPORT VoiceSignature{
 public:
     explicit VoiceSignature(const Sound& s);
 
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index 077bf7b1d..e91e41df3 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -45,10 +45,10 @@ Windows::Windows( bool enable_signal_P, TQObject* parent_P )
     windows_handler = this;
     if( signals_enabled )
         {
-        connect( twin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId )));
-        connect( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId )));
-        connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )),
-            TQT_SLOT( active_window_changed_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( window_added_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( windowRemoved( WId )), TQ_SLOT( window_removed_slot( WId )));
+        connect( twin_module, TQ_SIGNAL( activeWindowChanged( WId )),
+            TQ_SLOT( active_window_changed_slot( WId )));
         }
     }
 
diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h
index e9868e52b..05890c435 100644
--- a/khotkeys/shared/windows.h
+++ b/khotkeys/shared/windows.h
@@ -34,7 +34,7 @@ const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET
 class Windowdef_list;
 /*class Action_data_base;*/
 
-class KDE_EXPORT Windows
+class TDE_EXPORT Windows
     : public TQObject
     {
     TQ_OBJECT
@@ -67,7 +67,7 @@ class KDE_EXPORT Windows
         WId _action_window;
     };
     
-struct KDE_EXPORT Window_data
+struct TDE_EXPORT Window_data
     {
     Window_data( WId id_P );
     TQString title; // _NET_WM_NAME or WM_NAME
@@ -76,7 +76,7 @@ struct KDE_EXPORT Window_data
     NET::WindowType type;
     };
     
-class KDE_EXPORT Windowdef
+class TDE_EXPORT Windowdef
     {
     public:
         Windowdef( const TQString& comment_P );
@@ -93,7 +93,7 @@ class KDE_EXPORT Windowdef
     KHOTKEYS_DISABLE_COPY( Windowdef ); // CHECKME asi pak udelat i pro vsechny potomky, at se nezapomene
     };
 
-class KDE_EXPORT Windowdef_list
+class TDE_EXPORT Windowdef_list
     : public TQPtrList< Windowdef >
     {
     public:
@@ -109,7 +109,7 @@ class KDE_EXPORT Windowdef_list
     KHOTKEYS_DISABLE_COPY( Windowdef_list );
     };
 
-class KDE_EXPORT Windowdef_simple
+class TDE_EXPORT Windowdef_simple
     : public Windowdef
     {
     typedef Windowdef base;
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 3368ee21e..d5ccea906 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -16,7 +16,7 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>
@@ -46,7 +46,7 @@ int main( int argc, char* argv[] )
         kdWarning() << "File " << id << " not found!" << endl;
         return 1;
         }
-    init_global_data( false, TQT_TQOBJECT(&app) );
+    init_global_data( false, &app );
     Settings settings;
     settings.read_settings( true );
     TDEConfig cfg( file, true );
@@ -57,6 +57,6 @@ int main( int argc, char* argv[] )
         }
     settings.write_settings();
     TQByteArray data;
-    kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
+    tdeApp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data );
     return 0;
     }
diff --git a/kicker/DESIGN b/kicker/DESIGN
index d589ab833..2bdc65706 100644
--- a/kicker/DESIGN
+++ b/kicker/DESIGN
@@ -16,7 +16,7 @@ Contents
 NOTE: This is the design which we are working towards, not the design as it
 currently is, but there's no point in documenting yesterday.
 
-The class Kicker is a subclass of KUniqueApplication and is where all the
+The class Kicker is a subclass of TDEUniqueApplication and is where all the
 fun begins. It is always available via the static Kicker::kicker() method.
 Upon creation, Kicker::kicker() ensures that its resources are added to the
 standard dirs. This includes tile, background and various plugin directories.
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 131ce7482..f8ddf0d38 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
@@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
     setIcon(SmallIcon("date"));
 
     settings = new SettingsWidgetImp(prefs, zone, 0, "General");
-    connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
+    connect(settings->kcfg_Type, TQ_SIGNAL(activated(int)), TQ_SLOT(selectPage(int)));
 
     settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
     settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
@@ -104,24 +104,24 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
     settings->widgetStack->addWidget(fuzzyPage, 3);
     fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
 
-    connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
-    connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(dateToggled()));
+    connect(settings->kcfg_PlainShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(settings->kcfg_PlainShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(analogPage->kcfg_AnalogShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(analogPage->kcfg_AnalogShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(fuzzyPage->kcfg_FuzzyShowDate, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
+    connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(dateToggled()));
 
     addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
 }
@@ -144,7 +144,7 @@ void TDEConfigDialogSingle::updateWidgetsDefault()
     item->swapDefault();
     // This is ugly, but kcfg_Type does not have its correct setting
     // at this point in time.
-    TQTimer::singleShot(0, this, TQT_SLOT(dateToggled()));
+    TQTimer::singleShot(0, this, TQ_SLOT(dateToggled()));
 }
 
 void TDEConfigDialogSingle::selectPage(int p)
@@ -353,9 +353,9 @@ void DigitalClock::updateClock()
     if (_force || newStr != _timeStr)
     {
         _timeStr = newStr;
-        setUpdatesEnabled( FALSE );
+        setUpdatesEnabled( false );
         display(_timeStr);
-        setUpdatesEnabled( TRUE );
+        setUpdatesEnabled( true );
         update();
     }
     
@@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
 // but other colors would break the lcd-lock anyway
 void DigitalClock::drawContents( TQPainter * p)
 {
-    setUpdatesEnabled( FALSE );
+    setUpdatesEnabled( false );
     TQPalette pal = palette();
     if (_prefs->digitalLCDStyle())
         pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128));
@@ -430,7 +430,7 @@ void DigitalClock::drawContents( TQPainter * p)
         pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
     setPalette( pal );
     p->translate( -2, -2 );
-    setUpdatesEnabled( TRUE );
+    setUpdatesEnabled( true );
     TQLCDNumber::drawContents( p );
     p->translate( +1, +1 );
 }
@@ -743,7 +743,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons
 void FuzzyClock::deleteMyself()
 {
     if(alreadyDrawing) // try again later
-        TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself()));
+        TQTimer::singleShot(1000, this, TQ_SLOT(deleteMyself()));
     else
         delete this;
 }
@@ -917,18 +917,18 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
     _date->setBackgroundOrigin(AncestorOrigin);
     _date->installEventFilter(this);   // catch mouse clicks
 
-    connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
-    connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()));
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
+    connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout()));
+    connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
 
     reconfigure();    // initialize clock widget
     slotUpdate();
 
-    if (kapp->authorizeTDEAction("kicker_rmb"))
+    if (tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         menu = new TDEPopupMenu();
-        connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
-        connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
+        connect(menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         setCustomMenu(menu);
     }
 
@@ -1156,7 +1156,7 @@ void ClockApplet::preferences(bool timezone)
   if (!dialog)
   {
     dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
-    connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure()));
+    connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotReconfigure()));
   }
 
   if (timezone)
@@ -1242,7 +1242,7 @@ void ClockApplet::reconfigure()
     m_updateOnTheMinute = updateInterval != shortInterval;
     if (m_updateOnTheMinute)
     {
-        connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+        connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
         updateInterval = ((60 - clockGetTime().second()) * 1000) + 500;
     }
     else
@@ -1250,7 +1250,7 @@ void ClockApplet::reconfigure()
         // in case we reconfigure to show seconds but setTimerTo60 is going to be called
         // we need to make sure to disconnect this so we don't end up updating only once
         // a minute ;)
-        disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+        disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
     }
 
     _timer->start(updateInterval);
@@ -1300,7 +1300,7 @@ void ClockApplet::reconfigure()
 void ClockApplet::setTimerTo60()
 {
 //    kdDebug() << "setTimerTo60" << endl;
-    disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+    disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
     _timer->changeInterval(60000);
 }
 
@@ -1417,7 +1417,7 @@ void ClockApplet::slotUpdate()
 
         if (seconds > 2)
         {
-            connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+            connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
             _timer->changeInterval(((60 - seconds) * 1000) + 500);
         }
     }
@@ -1430,7 +1430,7 @@ void ClockApplet::slotCalendarDeleted()
     _calendar = 0L;
     // don't reopen the calendar immediately ...
     _disableCalendar = true;
-    TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar()));
+    TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar()));
 
     // we are free to show a tip know :)
     installEventFilter(KickerTip::the());
@@ -1460,7 +1460,7 @@ void ClockApplet::toggleCalendar()
     removeEventFilter(KickerTip::the());
 
     _calendar = new DatePicker(this, _lastDate, _prefs);
-    connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
+    connect(_calendar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted()));
 
     TQSize size = _prefs->calendarSize();
 
@@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar()
 
 void ClockApplet::openContextMenu()
 {
-    if (!menu || !kapp->authorizeTDEAction("kicker_rmb"))
+    if (!menu || !tdeApp->authorizeTDEAction("kicker_rmb"))
         return;
 
     menu->exec( TQCursor::pos() );
@@ -1554,12 +1554,12 @@ void ClockApplet::aboutToShowContextMenu()
     copyMenu->insertItem(dt.time().toString(), 207);
     copyMenu->insertItem(dt.toString(), 208);
     copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209);
-    connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) );
+    connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) );
 
     if (!bImmutable)
     {
         TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu );
-        connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(zoneMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         for (int i = 0; i <= zone->remoteZoneCount(); i++)
         {
             if (i == 0)
@@ -1576,7 +1576,7 @@ void ClockApplet::aboutToShowContextMenu()
         zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110);
 
         TDEPopupMenu *type_menu = new TDEPopupMenu(menu);
-        connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(type_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1);
         type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2);
         type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3);
@@ -1585,7 +1585,7 @@ void ClockApplet::aboutToShowContextMenu()
 
         menu->insertItem(i18n("&Type"), type_menu, 101, 1);
         menu->insertItem(i18n("Show Time&zone"), zoneMenu, 110, 2);
-        if (kapp->authorize("user/root"))
+        if (tdeApp->authorize("user/root"))
         {
             menu->insertItem(SmallIcon("date"), i18n("&Adjust Date && Time..."), 103, 4);
         }
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index e8ced7f2d..c63eb7d32 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -293,9 +293,9 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 55ee382fd..253f8656c 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -41,9 +41,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("clockapplet");
         TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 81e126560..bd33473cd 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -509,9 +509,9 @@
     <include location="global" impldecl="in implementation">tdefontrequester.h</include>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>configureType()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 85a4f3f19..d33af74b3 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <tdelocale.h>
 
diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp
index d542d2593..88301b7cf 100644
--- a/kicker/applets/launcher/configdlg.cpp
+++ b/kicker/applets/launcher/configdlg.cpp
@@ -47,8 +47,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,
         m_ui->iconDim->insertItem(TQString::number(
             m_settings->iconDimChoices()[n]));
     }
-    connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)),
-            this, TQT_SLOT(updateButtons()));
+    connect(m_ui->iconDim, TQ_SIGNAL(textChanged(const TQString&)),
+            this, TQ_SLOT(updateButtons()));
     updateWidgets();
     m_oldIconDimText = m_ui->iconDim->currentText();
     updateButtons();
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index cdbc94dd5..40957c44f 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 #include <tdeglobalsettings.h>
 #include <tdesycocaentry.h>
 #include <kservice.h>
@@ -38,8 +38,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPat
 {
    _targetObject = target;
    _sender = sender;
-   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), 
-           target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
+   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), 
+           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));
 }
 
 QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name)
@@ -47,8 +47,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS
 {
    _targetObject = target;
    _sender = sender;
-   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)),
-           target, TQT_SLOT(addAppBeforeManually(TQString,TQString)));
+   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)),
+           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));
 }
 
 void QuickAddAppsMenu::slotExec(int id)
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 741eee46d..e7226c8a4 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeactionclasses.h>
 #include <kickertip.h>
 #include <tdelocale.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <krun.h>
 #include <kiconeffect.h>
 #include <tdeglobalsettings.h>
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kipc.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <math.h>
 #include <algorithm>
@@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u)
 }
 
 void QuickURL::run() const
-{  kapp->propagateSessionManager();   // is this needed?
+{  tdeApp->propagateSessionManager();   // is this needed?
    if (_service)
       KRun::run(*(_service), KURL::List());
    else
@@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
         setToggleButton(true);
         setOn( ShowDesktop::the()->desktopShowing() );
-        connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
+        connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );
     }
 
     TQToolTip::add(this, _qurl->name());
@@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
     configAction->plug(_popup);
         _popup->insertSeparator();
     _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), 
-            this, TQT_SLOT(removeApp()));
+            this, TQ_SLOT(removeApp()));
 
     m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"),
-        TDEShortcut(), TQT_TQOBJECT(this));
-    connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), 
-        this, TQT_SLOT(slotStickyToggled(bool)));
+        TDEShortcut(), this);
+    connect(m_stickyAction, TQ_SIGNAL(toggled(bool)), 
+        this, TQ_SLOT(slotStickyToggled(bool)));
     m_stickyAction->plug(_popup, 2);
     m_stickyId = _popup->idAt(2);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch()));
-    connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent,
-        TQT_SLOT(removeAppManually(QuickButton *)));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch()));
+    connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent,
+        TQ_SLOT(removeAppManually(QuickButton *)));
 }
 
 QuickButton::~QuickButton()
@@ -266,10 +266,10 @@ void QuickButton::launch()
    }
    if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
        if (isOn()) {
-           ShowDesktop::the()->showDesktop(TRUE);
+           ShowDesktop::the()->showDesktop(true);
        }
        else {
-           ShowDesktop::the()->showDesktop(FALSE);
+           ShowDesktop::the()->showDesktop(false);
        }
    }
    else {
@@ -303,7 +303,7 @@ void QuickButton::removeApp()
 void QuickButton::flash()
 {
    m_flashCounter = 2000;
-   TQTimer::singleShot(0, this, TQT_SLOT(slotFlash()));
+   TQTimer::singleShot(0, this, TQ_SLOT(slotFlash()));
 }
 
 void QuickButton::slotFlash()
@@ -314,7 +314,7 @@ void QuickButton::slotFlash()
         m_flashCounter -= timeout;
         if (m_flashCounter < 0) m_flashCounter = 0;
         update();
-        TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash()));
+        TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash()));
     }
 }
 
diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h
index 1c153d85c..d45480542 100644
--- a/kicker/applets/launcher/quickbuttongroup.h
+++ b/kicker/applets/launcher/quickbuttongroup.h
@@ -28,7 +28,7 @@ public:
 };
 
 QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc)
-{   return findProperty(desc, std::mem_fun(&QuickButton::url));}
+{   return findProperty(desc, std::mem_fn(&QuickButton::url));}
 
 inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
 {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
@@ -38,16 +38,16 @@ inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
 }
 
 inline void QuickButtonGroup::show()
-{   std::for_each(begin(),end(),std::mem_fun(&TQWidget::show));}
+{   std::for_each(begin(),end(),std::mem_fn(&TQWidget::show));}
 
 inline void QuickButtonGroup::hide()
-{   std::for_each(begin(),end(),std::mem_fun(&TQWidget::hide));}
+{   std::for_each(begin(),end(),std::mem_fn(&TQWidget::hide));}
 
 inline void QuickButtonGroup::setDragging(bool drag)
-{   std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setDragging),drag));}
+{   std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setDragging),std::placeholders::_1,drag));}
 
 inline void QuickButtonGroup::setEnableDrag(bool enable)
-{   std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setEnableDrag),enable));}
+{   std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setEnableDrag),std::placeholders::_1,enable));}
 
 inline void QuickButtonGroup::deleteContents()
 {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 624c229da..3f703348f 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdemessagebox.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 #include <kdebug.h>
 
@@ -69,7 +69,7 @@ const ButtonGroup::Index Append=ButtonGroup::Append;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("quicklauncher");
         return new QuickLauncher(configFile, KPanelApplet::Normal,
@@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
     m_dragButtons = 0;
 
     m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(),
-        TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
+        this, TQ_SLOT(slotConfigure()), this);
 
     m_saveTimer = new TQTimer(this, "m_saveTimer");
-    connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig()));
+    connect(m_saveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(saveConfig()));
 
     m_popularity = new PopularityStatistics();
 
@@ -168,15 +168,15 @@ void QuickLauncher::buildPopupMenu()
     m_appletPopup = new TQPopupMenu(this);
     m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu);
     m_removeAppsMenu = new TQPopupMenu(this);
-    connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()),
-            TQT_SLOT(fillRemoveAppsMenu()));
-    connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)), 
-            TQT_SLOT(removeAppManually(int)));
+    connect(m_removeAppsMenu, TQ_SIGNAL(aboutToShow()),
+            TQ_SLOT(fillRemoveAppsMenu()));
+    connect(m_removeAppsMenu, TQ_SIGNAL(activated(int)), 
+            TQ_SLOT(removeAppManually(int)));
     m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu);
 
     m_appletPopup->insertSeparator();
     m_appletPopup->setCheckable( true );
-    m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about()));
+    m_appletPopup->insertItem(i18n("About"), this, TQ_SLOT(about()));
     setCustomMenu(m_appletPopup);
 }
 
@@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure()
         m_configDialog = new ConfigDlg(this, "configdialog", 
             m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok | 
             KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default);
-        connect(m_configDialog, TQT_SIGNAL(settingsChanged()),
-            this, TQT_SLOT(slotSettingsDialogChanged()));
+        connect(m_configDialog, TQ_SIGNAL(settingsChanged()),
+            this, TQ_SLOT(slotSettingsDialogChanged()));
     }
 
     m_configDialog->show();
@@ -392,10 +392,10 @@ void QuickLauncher::addApp(TQString url, bool manuallyAdded)
 QuickButton* QuickLauncher::createButton(TQString url)
 {
     QuickButton* newButton=new QuickButton(url, m_configAction, this);
-    connect(newButton, TQT_SIGNAL(executed(TQString)), 
-            this, TQT_SLOT(slotOwnServiceExecuted(TQString)));
-    connect(newButton, TQT_SIGNAL(stickyToggled(bool)), 
-            this, TQT_SLOT(slotStickyToggled()));
+    connect(newButton, TQ_SIGNAL(executed(TQString)), 
+            this, TQ_SLOT(slotOwnServiceExecuted(TQString)));
+    connect(newButton, TQ_SIGNAL(stickyToggled(bool)), 
+            this, TQ_SLOT(slotStickyToggled()));
     newButton->setPopupDirection(popupDirection());
     return newButton;
 }
@@ -973,7 +973,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
 
     if (m_settings->autoAdjustEnabled())
     {
-        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));
     }
 }
 
@@ -1047,7 +1047,7 @@ void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId)
     m_popularity->useService(serviceMenuId);
     if (m_settings->autoAdjustEnabled())
     {
-        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));
     }
 }
 
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 800c9f8a6..770a8431f 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("lockout");
         return new Lockout(configFile, parent, "lockout");
@@ -82,25 +82,25 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
 
     bTransparent = conf->readBoolEntry( "Transparent", bTransparent );
 
-    connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ));
-    connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() ));
+    connect( lockButton, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ));
+    connect( logoutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( logout() ));
 
     lockButton->installEventFilter( this );
     logoutButton->installEventFilter( this );
 
-    if (!kapp->authorize("lock_screen"))
+    if (!tdeApp->authorize("lock_screen"))
        lockButton->hide();
 
-    if (!kapp->authorize("logout"))
+    if (!tdeApp->authorize("logout"))
        logoutButton->hide();
 
     lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
     logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
 
-    connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() ));
+    connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
 }
 
 Lockout::~Lockout()
@@ -146,12 +146,12 @@ void Lockout::lock()
     int kicker_screen_number = tqt_xscreen();
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+    tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
 }
 
 void Lockout::logout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 void Lockout::mousePressEvent(TQMouseEvent* e)
@@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e)
 
 bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
         return false;     // Process event normally:
 
     if( e->type() == TQEvent::MouseButtonPress )
@@ -201,17 +201,17 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
                 TQPopupMenu *popup = new TQPopupMenu();
 
                 popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"),
-                                   this, TQT_SLOT( lock() ) );
+                                   this, TQ_SLOT( lock() ) );
                 popup->insertSeparator();
                 
                 i18n("&Transparent");
                 //popup->insertItem( i18n( "&Transparent" ), 100 );
                 popup->insertItem( SmallIcon( "configure" ),
                                    i18n( "&Configure Screen Saver..." ),
-                                   this, TQT_SLOT( slotLockPrefs() ) );
+                                   this, TQ_SLOT( slotLockPrefs() ) );
 
                 //popup->setItemChecked( 100, bTransparent );
-                //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
+                //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) );
                 //if (conf->entryIsImmutable( "Transparent" ))
                 //    popup->setItemEnabled( 100, false );
                 popup->exec( me->globalPos() );
@@ -224,15 +224,15 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
                 TQPopupMenu *popup = new TQPopupMenu();
 
                 popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."),
-                                   this, TQT_SLOT( logout() ) );
+                                   this, TQ_SLOT( logout() ) );
                 popup->insertSeparator();
                 //popup->insertItem( i18n( "&Transparent" ), 100 );
                 popup->insertItem( SmallIcon( "configure" ),
                                    i18n( "&Configure Session Manager..." ),
-                                   this, TQT_SLOT( slotLogoutPrefs() ) );
+                                   this, TQ_SLOT( slotLogoutPrefs() ) );
 
                 //popup->setItemChecked( 100, bTransparent );
-                //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
+                //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) );
                 //if (conf->entryIsImmutable( "Transparent" ))
                 //    popup->setItemEnabled( 100, false );
                 popup->exec( me->globalPos() );
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b50aea3d8..f1d6c6e2a 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+    TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
     {
         TDEGlobal::locale()->insertCatalogue("mediaapplet");
         return new MediaApplet(configFile, KPanelApplet::Normal,
@@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW
     
     mpDirLister = new KDirLister();
     
-    connect( mpDirLister, TQT_SIGNAL( clear() ),
-            this, TQT_SLOT( slotClear() ) );
-    connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ),
-            this, TQT_SLOT( slotStarted(const KURL&) ) );
-    connect( mpDirLister, TQT_SIGNAL( completed() ),
-            this, TQT_SLOT( slotCompleted() ) );
-    connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-            this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-    connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-            this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-    connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
-            this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+    connect( mpDirLister, TQ_SIGNAL( clear() ),
+            this, TQ_SLOT( slotClear() ) );
+    connect( mpDirLister, TQ_SIGNAL( started(const KURL&) ),
+            this, TQ_SLOT( slotStarted(const KURL&) ) );
+    connect( mpDirLister, TQ_SIGNAL( completed() ),
+            this, TQ_SLOT( slotCompleted() ) );
+    connect( mpDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+            this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+    connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+            this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+    connect( mpDirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ),
+            this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
     
     reloadList();
 }
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index b87f73ab1..4cc27ffe8 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -30,7 +30,7 @@
 #include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdelocale.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <krun.h>
 #include <tdeglobalsettings.h>
 #include <kcursor.h>
@@ -45,13 +45,13 @@
 #include <konq_drag.h>
 
 MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
-	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
+	: PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0,
                 "MediumButton::mOpenTimer")
 {
-    TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+    TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()),
                                     &mActions, "pasteto");
     a->setShortcut(0);
-    a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy");
+    a = KStdAction::copy(this, TQ_SLOT(slotCopy()), &mActions, "copy");
     a->setShortcut(0);
     
     setBackgroundOrigin(AncestorOrigin);
@@ -64,11 +64,11 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
     
     refreshType();
     
-    connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen()));
+    connect(&mOpenTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDragOpen()));
     
     // Activate this code only if we find a way to have both an
     // action and a popup menu for the same kicker button
-    //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+    //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
     
     setPopup(new TQPopupMenu());
 }
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 37ac216a1..d1aae0268 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
+    TDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
     {
       TDEGlobal::locale()->insertCatalogue("kmenuapplet");
       return new KickerMenuApplet::Applet( configFile_P, parent_P );
@@ -89,8 +89,8 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P )
     setBackgroundOrigin(AncestorOrigin);
     dcopclient.registerAs( "menuapplet", false );
     // toolbarAppearanceChanged(int) is sent when changing macstyle
-    connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )),
-        this, TQT_SLOT( readSettings()));
+    connect( tdeApp, TQ_SIGNAL( toolbarAppearanceChanged( int )),
+        this, TQ_SLOT( readSettings()));
     claimSelection();
     readSettings();
     updateTopEdgeOffset();
@@ -298,11 +298,11 @@ void Applet::claimSelection()
 	{
         delete selection_watcher;
         selection_watcher = NULL;
-        connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection()));
+        connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection()));
         module = new KWinModule;
-	connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId )));
-	connect( module, TQT_SIGNAL( activeWindowChanged( WId )),
-	    this, TQT_SLOT( activeWindowChanged( WId )));
+	connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId )));
+	connect( module, TQ_SIGNAL( activeWindowChanged( WId )),
+	    this, TQ_SLOT( activeWindowChanged( WId )));
 	TQValueList< WId > windows = module->windows();
 	for( TQValueList< WId >::ConstIterator it = windows.begin();
 	     it != windows.end();
@@ -328,7 +328,7 @@ void Applet::lostSelection()
     if( selection_watcher == NULL )
         {
         selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
-        connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection()));
+        connect( selection_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( claimSelection()));
         }
     delete module;
     module = NULL;
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 7685f04d7..0af954fcb 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -36,9 +36,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
 #include <netwm.h>
@@ -73,7 +73,7 @@ static const int bgOffset = 300;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
       TDEGlobal::locale()->insertCatalogue("kminipagerapplet");
       return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet");
@@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
 
     setFont( TDEGlobalSettings::taskbarFont() );
 
-    m_twin = new KWinModule(TQT_TQOBJECT(this));
+    m_twin = new KWinModule(this);
     m_activeWindow = m_twin->activeWindow();
     m_curDesk = m_twin->currentDesktop();
 
@@ -132,22 +132,22 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
 
     drawButtons();
 
-    connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) );
-    connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
-    connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) );
-    connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) );
-    connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
-    connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
-    connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
+    connect( m_twin, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotSetDesktop(int) ) );
+    connect( m_twin, TQ_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
+    connect( m_twin, TQ_SIGNAL( numberOfDesktopsChanged(int)), TQ_SLOT( slotSetDesktopCount(int) ) );
+    connect( m_twin, TQ_SIGNAL( desktopGeometryChanged(int)), TQ_SLOT( slotRefreshViewportCount(int) ) );
+    connect( m_twin, TQ_SIGNAL( activeWindowChanged(WId)), TQ_SLOT( slotActiveWindowChanged(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowAdded(WId) ), this, TQ_SLOT( slotWindowAdded(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
+    connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) );
+    connect( tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
 
-    if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+    if (tdeApp->authorizeTDEAction("kicker_rmb") && tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
     {
         m_contextMenu = new TQPopupMenu();
-        connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
-        connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
+        connect(m_contextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         setCustomMenu(m_contextMenu);
     }
 
@@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
     { // must own manager selection before setting global desktop layout
         int screen = DefaultScreen( tqt_xdisplay());
         m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
-            screen, TQT_TQOBJECT(this) );
+            screen, this );
         if( !m_desktopLayoutOwner->claim( false ))
         {
             delete m_desktopLayoutOwner;
@@ -442,7 +442,7 @@ void KMiniPager::wheelEvent( TQWheelEvent* e )
 {
     int newDesk;
     int desktops = KWin::numberOfDesktops();
-   
+
 
     if(cycleWindow()){
 
@@ -456,7 +456,7 @@ void KMiniPager::wheelEvent( TQWheelEvent* e )
     {
         newDesk = (desktops + m_curDesk - 2) % desktops + 1;
     }
-  
+
     slotButtonSelected(newDesk);
     }
 }
@@ -484,10 +484,10 @@ void KMiniPager::drawButtons()
             m_desktops.append( desk );
             m_group->insert( desk, count );
 
-            connect(desk, TQT_SIGNAL(buttonSelected(int)),
-                    TQT_SLOT(slotButtonSelected(int)) );
-            connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )),
-                    TQT_SLOT(slotShowMenu(const TQPoint&, int )) );
+            connect(desk, TQ_SIGNAL(buttonSelected(int)),
+                    TQ_SLOT(slotButtonSelected(int)) );
+            connect(desk, TQ_SIGNAL(showMenu(const TQPoint&, int )),
+                    TQ_SLOT(slotShowMenu(const TQPoint&, int )) );
 
             desk->show();
             ++count;
@@ -727,7 +727,7 @@ void KMiniPager::aboutToShowContextMenu()
     rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset);
     rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset);
     rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset);
-    connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+    connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
     showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"):
                                                        i18n("&Columns"),
                          rowMenu);
@@ -735,6 +735,7 @@ void KMiniPager::aboutToShowContextMenu()
     showMenu->insertItem(i18n("&Window Thumbnails"), WindowThumbnails);
     showMenu->insertItem(i18n("&Window Icons"), WindowIcons);
     showMenu->insertItem(i18n("&Cycle on Wheel"), Cycle);
+    showMenu->insertItem(i18n("3&D Desk Borders"), Border3D);
 
     showMenu->insertTitle(i18n("Text Label"));
     showMenu->insertItem(i18n("Desktop N&umber"),
@@ -753,7 +754,7 @@ void KMiniPager::aboutToShowContextMenu()
         showMenu->insertItem(i18n("&Desktop Wallpaper"),
                          PagerSettings::EnumBackgroundType::BgLive + bgOffset);
     }
-    connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+    connect(showMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
     m_contextMenu->insertItem(i18n("&Pager Options"),showMenu);
 
     m_contextMenu->insertItem(SmallIcon("configure"),
@@ -767,10 +768,8 @@ void KMiniPager::aboutToShowContextMenu()
     m_contextMenu->setItemChecked(WindowThumbnails, m_settings->preview());
     m_contextMenu->setItemChecked(WindowIcons, m_settings->icons());
     m_contextMenu->setItemChecked(Cycle, m_settings->cycle());
+    m_contextMenu->setItemChecked(Border3D, m_settings->border3D());
     m_contextMenu->setItemEnabled(WindowIcons, m_settings->preview());
-    m_contextMenu->setItemEnabled(RenameDesktop,
-                                  m_settings->labelType() ==
-                                  PagerSettings::EnumLabelType::LabelName);
 }
 
 void KMiniPager::slotShowMenu(const TQPoint& pos, int desktop)
@@ -799,7 +798,7 @@ void KMiniPager::contextMenuActivated(int result)
             return;
 
         case ConfigureDesktops:
-            kapp->startServiceByDesktopName("desktop");
+            tdeApp->startServiceByDesktopName("desktop");
             return;
 
         case RenameDesktop:
@@ -822,6 +821,9 @@ void KMiniPager::contextMenuActivated(int result)
         case Cycle:
              m_settings->setCycle(!m_settings->cycle());
             break;
+        case Border3D:
+            m_settings->setBorder3D(!m_settings->border3D());
+            break;
         case WindowIcons:
             m_settings->setIcons(!m_settings->icons());
             break;
@@ -883,7 +885,7 @@ void KMiniPager::slotDesktopNamesChanged()
 
 void KMiniPager::showPager()
 {
-    DCOPClient *dcop=kapp->dcopClient();
+    DCOPClient *dcop=tdeApp->dcopClient();
 
     if (dcop->isApplicationRegistered("kpager"))
     {
@@ -892,7 +894,7 @@ void KMiniPager::showPager()
     else
     {
     // Let's run kpager if it isn't running
-        connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+        connect( dcop, TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) );
         dcop->setNotifications(true);
         TQString strAppPath(locate("exe", "kpager"));
         if (!strAppPath.isEmpty())
@@ -922,7 +924,7 @@ void KMiniPager::showKPager(bool toggleShow)
             pt=mapToGlobal( TQPoint(x(), y()) );
     }
 
-    DCOPClient *dcop=kapp->dcopClient();
+    DCOPClient *dcop=tdeApp->dcopClient();
 
     TQByteArray data;
     TQDataStream arg(data, IO_WriteOnly);
@@ -941,8 +943,8 @@ void KMiniPager::applicationRegistered( const TQCString  & appName )
 {
     if (appName == "kpager")
     {
-        disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ),
-                    this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+        disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
+                    this, TQ_SLOT(applicationRegistered(const TQCString &)) );
         showKPager(false);
     }
 }
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index ceb5ec8f4..6433a6790 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -64,7 +64,7 @@ public:
     void setActive( WId active ) { m_activeWindow = active; }
     WId activeWindow() { return m_activeWindow; }
 
-    enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle,
+    enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle, Border3D,
                          WindowIcons, ConfigureDesktops, RenameDesktop };
     int labelType() const { return m_settings->labelType(); }
 
@@ -73,6 +73,7 @@ public:
     bool desktopPreview() const { return m_settings->preview(); }
     bool cycleWindow() const { return m_settings->cycle(); }
     bool windowIcons() const { return m_settings->icons(); }
+    bool border3D() const { return m_settings->border3D(); }
 
 
     Orientation orientation() const { return KPanelApplet::orientation(); }
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 71e3f465b..3274f406b 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
 #include <tqstylesheet.h>
+#include <tqinputdialog.h>
 
 #include <netwm.h>
 #include <dcopclient.h>
@@ -83,10 +84,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v
 
     m_desktopName = m_pager->twin()->desktopName(m_desktop);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
-    connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
-    connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch()));
-    connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
+    connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
+    connect(&m_dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragSwitch()));
+    connect(&m_updateCompressor, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
 
     if (m_pager->desktopPreview())
     {
@@ -213,7 +214,7 @@ void KMiniPagerButton::loadBgPixmap()
     if (m_pager->bgType() != PagerSettings::EnumBackgroundType::BgLive)
         return; // not needed
 
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
     {
         client->attach();
@@ -247,8 +248,8 @@ void KMiniPagerButton::loadBgPixmap()
         }
         else if (s_commonSharedPixmap)
         { // other button is already fetching the pixmap
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
             return;
         }
     }
@@ -258,8 +259,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!s_commonSharedPixmap)
         {
             s_commonSharedPixmap = new TDESharedPixmap;
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1"));
         if (retval == false) {
@@ -274,8 +275,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!m_sharedPixmap)
         {
             m_sharedPixmap = new TDESharedPixmap;
-            connect(m_sharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(m_sharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop));
         if (retval == false) {
@@ -397,47 +398,39 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         }
     }
 
-    if (!liveBkgnd)
+    // frame
+    if (liveBkgnd || transparent)
     {
-        if (transparent)
+        if (m_pager->border3D())
         {
-            // transparent windows get an 1 pixel frame...
-            if (on)
-            {
-                bp->setPen(colorGroup().midlight());
-            }
-            else if (down)
-            {
-                bp->setPen(KickerLib::blendColors(colorGroup().mid(),
-                                                 colorGroup().midlight()));
-            }
-            else
-            {
-                bp->setPen(colorGroup().dark());
-            }
-
-            bp->drawRect(0, 0, w, h);
+            qDrawShadeRect(bp, 0, 0, w, h, on ? palette().active() : palette().inactive());
         }
         else
         {
-            TQBrush background;
-
-            if (on)
-            {
-                background = colorGroup().brush(TQColorGroup::Midlight);
-            }
-            else if (down)
-            {
-                background = TQBrush(KickerLib::blendColors(colorGroup().mid(),
-                                                    colorGroup().midlight()));
-            }
-            else
-            {
-                background = colorGroup().brush(TQColorGroup::Mid);
-            }
+            bp->setPen(on ? colorGroup().midlight()
+                          : KickerLib::blendColors(colorGroup().mid(), colorGroup().midlight()));
+            bp->drawRect(0, 0, w, h);
+        }
+    }
+    else
+    {
+        TQBrush background;
 
-            bp->fillRect(0, 0, w, h, background);
+        if (on)
+        {
+            background = colorGroup().brush(TQColorGroup::Midlight);
+        }
+        else if (down)
+        {
+            background = TQBrush(KickerLib::blendColors(colorGroup().mid(),
+                                                colorGroup().midlight()));
         }
+        else
+        {
+            background = colorGroup().brush(TQColorGroup::Mid);
+        }
+
+        bp->fillRect(0, 0, w, h, background);
     }
 
     // window preview...
@@ -492,22 +485,6 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         }
     }
 
-    if (liveBkgnd)
-    {
-        // draw a little border around the individual buttons
-        // makes it look a bit more finished.
-        if (on)
-        {
-            bp->setPen(colorGroup().midlight());
-        }
-        else
-        {
-            bp->setPen(colorGroup().mid());
-        }
-
-        bp->drawRect(0, 0, w, h);
-    }
-
     if (m_pager->labelType() != PagerSettings::EnumLabelType::LabelNone)
     {
         TQString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ?
@@ -724,17 +701,30 @@ void KMiniPagerButton::slotClicked()
 
 void KMiniPagerButton::rename()
 {
-  if ( !m_lineEdit ) {
-    m_lineEdit = new TQLineEdit( this );
-    connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) );
-    m_lineEdit->installEventFilter( this );
-  }
-  m_lineEdit->setGeometry( rect() );
-  m_lineEdit->setText(m_desktopName);
-  m_lineEdit->show();
-  m_lineEdit->setFocus();
-  m_lineEdit->selectAll();
-  m_pager->emitRequestFocus();
+    if (m_pager->labelType() == PagerSettings::EnumLabelType::LabelName)
+    {
+        if ( !m_lineEdit ) {
+            m_lineEdit = new TQLineEdit(this);
+            connect(m_lineEdit, TQ_SIGNAL(returnPressed()), m_lineEdit, TQ_SLOT(hide()));
+            m_lineEdit->installEventFilter(this);
+        }
+        m_lineEdit->setGeometry(rect());
+        m_lineEdit->setText(m_desktopName);
+        m_lineEdit->show();
+        m_lineEdit->setFocus();
+        m_lineEdit->selectAll();
+        m_pager->emitRequestFocus();
+    }
+    else
+    {
+        m_pager->twin()->setDesktopName(
+            m_desktop,
+            TQInputDialog::getText(
+                i18n("Renaming desktop %1").arg(m_desktopName),
+                i18n("Enter a new name for desktop %1 (%2):").arg(m_desktop).arg(m_desktopName)
+            )
+        );
+    }
 }
 
 void KMiniPagerButton::slotToggled( bool b )
@@ -752,7 +742,7 @@ bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
     {
         m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() );
         m_desktopName = m_lineEdit->text();
-        TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) );
+        TQTimer::singleShot( 0, m_lineEdit, TQ_SLOT( deleteLater() ) );
         m_lineEdit = 0;
         return true;
     }
diff --git a/kicker/applets/minipager/pagersettings.kcfg b/kicker/applets/minipager/pagersettings.kcfg
index 3a821f20a..11b6aa09d 100644
--- a/kicker/applets/minipager/pagersettings.kcfg
+++ b/kicker/applets/minipager/pagersettings.kcfg
@@ -49,15 +49,20 @@
             <label>Show desktop preview?</label>
             <default>true</default>
         </entry>
-        
+
         <entry name="Icons" type="Bool">
             <label>Show window icons in previews?</label>
             <default>true</default>
         </entry>
-        
+
         <entry name="Cycle" type="Bool">
           <label>Cycle through desktops with wheel?</label>
           <default>true</default>
         </entry>
+
+        <entry name="Border3D" type="Bool">
+          <label>3D Desk border</label>
+          <default>false</default>
+        </entry>
     </group>
 </kcfg>
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 8eb26afbc..71e08bbe1 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -38,7 +38,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet*  init(TQWidget * parent, const TQString & configFile)
+  TDE_EXPORT KPanelApplet*  init(TQWidget * parent, const TQString & configFile)
   {
     TDEGlobal::locale()->insertCatalogue("naughtyapplet");
 
@@ -71,24 +71,24 @@ NaughtyApplet::NaughtyApplet
   TQVBoxLayout * layout = new TQVBoxLayout(this);
   layout->addWidget(button_);
 
-  monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this));
+  monitor_ = new NaughtyProcessMonitor(2, 20, this);
 
   connect
     (
-     button_,   TQT_SIGNAL(clicked()),
-     this,      TQT_SLOT(slotPreferences())
+     button_,   TQ_SIGNAL(clicked()),
+     this,      TQ_SLOT(slotPreferences())
     );
 
   connect
     (
-     monitor_,  TQT_SIGNAL(runawayProcess(ulong, const TQString &)),
-     this,      TQT_SLOT(slotWarn(ulong, const TQString &))
+     monitor_,  TQ_SIGNAL(runawayProcess(ulong, const TQString &)),
+     this,      TQ_SLOT(slotWarn(ulong, const TQString &))
     );
 
   connect
     (
-     monitor_,  TQT_SIGNAL(load(uint)),
-     this,      TQT_SLOT(slotLoad(uint))
+     monitor_,  TQ_SIGNAL(load(uint)),
+     this,      TQ_SLOT(slotLoad(uint))
     );
 
   loadSettings();
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index 0239720fe..63b634e59 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -111,7 +111,7 @@ NaughtyProcessMonitor::NaughtyProcessMonitor
 #ifdef __NetBSD__
   d->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open");
 #endif
-  connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+  connect(d->timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 }
 
 NaughtyProcessMonitor::~NaughtyProcessMonitor()
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 1121cf45b..104cd5efe 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+  TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
   {
     TDEGlobal::locale()->insertCatalogue("krunapplet");
     return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet");
@@ -69,15 +69,15 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions,
     f = _btn->font();
     f.setPixelSize(12);
     _btn->setFont(f);
-    connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo()));
+    connect(_btn, TQ_SIGNAL(clicked()), TQ_SLOT(popup_combo()));
 
     // setup history combo
     _input = new KHistoryCombo(this);
     _input->setFocus();
     _input->clearEdit();
     watchForFocus(_input->lineEdit());
-    connect(_input, TQT_SIGNAL(activated(const TQString&)),
-	    TQT_SLOT(run_command(const TQString&)));
+    connect(_input, TQ_SIGNAL(activated(const TQString&)),
+	    TQ_SLOT(run_command(const TQString&)));
 
     TDEConfig *c = config();
     c->setGroup("General");
@@ -209,7 +209,7 @@ void RunApplet::run_command(const TQString& command)
     TQString exec;
     bool focusNeeded = false;
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     _filterData->setData( _input->currentText().stripWhiteSpace() );
     TQStringList filters;
@@ -230,7 +230,7 @@ void RunApplet::run_command(const TQString& command)
     }
     else if (cmd == "logout")
 	{
-	    bool shutdown = kapp->requestShutDown();
+	    bool shutdown = tdeApp->requestShutDown();
 	    if( !shutdown )
             {
                 // This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ?
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 1ac34cfec..a9eea202e 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kshell.h>
 #include <twin.h>
 #include <twinmodule.h>
@@ -53,7 +53,7 @@ SwallowApplet * SwallowApplet::self = 0L;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) {
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) {
 	return new SwallowApplet(configFile, parent, "kswallow applet");
     }
 }
@@ -157,11 +157,11 @@ void SwallowApplet::createApps( SwallowCommandList* list )
     while ( (it.current()) ) {
 	app = new SwallowApp( it.current(), this );
 	app->hide();
-	connect( app, TQT_SIGNAL( embedded(SwallowApp *)),
-		 TQT_SLOT( embedded(SwallowApp *)));
+	connect( app, TQ_SIGNAL( embedded(SwallowApp *)),
+		 TQ_SLOT( embedded(SwallowApp *)));
 	appList->append( app );
 	++it;
-	kapp->processEvents();
+	tdeApp->processEvents();
     }
 
     m_layout->activate();
@@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app )
     kdDebug() << "--> ratio: " << app->sizeRatio() << endl;
     kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl;
 
-    disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)),
-		this, TQT_SLOT( embedded(SwallowApp *)));
+    disconnect( app, TQ_SIGNAL( embedded(SwallowApp *)),
+		this, TQ_SLOT( embedded(SwallowApp *)));
 
     embeddedList->append( app );
 
@@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
     QXEmbed::initialize();
 
     winTitle = swc->title;
-    connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
-	    this, TQT_SLOT(windowAdded(WId)));
+    connect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)),
+	    this, TQ_SLOT(windowAdded(WId)));
 
     if (!swc->cmdline.isEmpty()) {
 	TDEProcess *process = new TDEProcess;
@@ -287,10 +287,10 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
 
 	// move window out of sight
 	//	*process << "-geometry";
-	//	*process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height());
+	//	*process << TQString("32x32+%1+%2").arg(tdeApp->desktop()->width()).arg(tdeApp->desktop()->height());
 
-	connect(process, TQT_SIGNAL(processExited(TDEProcess*)),
-		this, TQT_SLOT(processExited(TDEProcess*)));
+	connect(process, TQ_SIGNAL(processExited(TDEProcess*)),
+		this, TQ_SLOT(processExited(TDEProcess*)));
 
 	process->start();
     }
@@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win)
 	embed(win);
 	XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0);
 
-	disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
-		   this, TQT_SLOT(windowAdded(WId)));
+	disconnect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)),
+		   this, TQ_SLOT(windowAdded(WId)));
 
 	emit embedded( this );
     }
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 2985e1915..175e037e5 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -28,6 +28,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqcursor.h>
 #include <tqpopupmenu.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
 #include <tqtimer.h>
 #include <tqpixmap.h>
 #include <tqevent.h>
@@ -35,6 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqgrid.h>
 #include <tqpainter.h>
 #include <tqimage.h>
+#include <tqlayout.h>
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
@@ -58,12 +61,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <X11/Xlib.h>
 
-#define ICON_MARGIN 1
 #define ICON_END_MARGIN KickerSettings::showDeepButtons()?4:0
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("ksystemtrayapplet");
         return new SystemTrayApplet(configFile, KPanelApplet::Normal,
@@ -74,20 +76,22 @@ extern "C"
 SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int actions,
                                    TQWidget *parent, const char *name)
   : KPanelApplet(configFile, type, actions, parent, name),
-    m_showFrame(KickerSettings::showDeepButtons()?true:false),
+    m_showFrame(KickerSettings::showDeepButtons()),
     m_showHidden(false),
-    m_expandButton(0),
-    m_leftSpacer(0),
-    m_rightSpacer(0),
-    m_clockApplet(0),
-    m_settingsDialog(0),
+    m_expandButton(nullptr),
+    m_leftSpacer(nullptr),
+    m_rightSpacer(nullptr),
+    m_clockApplet(nullptr),
+    m_settingsDialog(nullptr),
     m_iconSelector(0),
-    m_autoRetractTimer(0),
+    m_autoRetractTimer(nullptr),
     m_autoRetract(false),
     m_iconSize(24),
     m_showClockInTray(false),
-    m_showClockSettingCB(0),
-    m_layout(0)
+    m_showClockSettingCB(nullptr),
+    m_iconMargin(1),
+    m_iconMarginSB(nullptr),
+    m_layout(nullptr)
 {
     DCOPObject::setObjId("SystemTrayApplet");
     loadSettings();
@@ -99,19 +103,19 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
 
     m_clockApplet = new ClockApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, this, "clockapplet");
     updateClockGeometry();
-    connect(m_clockApplet, TQT_SIGNAL(clockReconfigured()), this, TQT_SLOT(updateClockGeometry()));
-    connect(m_clockApplet, TQT_SIGNAL(updateLayout()), this, TQT_SLOT(updateClockGeometry()));
+    connect(m_clockApplet, TQ_SIGNAL(clockReconfigured()), this, TQ_SLOT(updateClockGeometry()));
+    connect(m_clockApplet, TQ_SIGNAL(updateLayout()), this, TQ_SLOT(updateClockGeometry()));
 
     setBackgroundOrigin(AncestorOrigin);
 
-    twin_module = new KWinModule(TQT_TQOBJECT(this));
+    twin_module = new KWinModule(this);
 
-    // kApplication notifies us of settings changes. added to support
+    // tdeApp notifies us of settings changes. added to support
     // disabling of frame effect on mouse hover
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false);
 
-    TQTimer::singleShot(0, this, TQT_SLOT(initialize()));
+    TQTimer::singleShot(0, this, TQ_SLOT(initialize()));
 }
 
 void SystemTrayApplet::updateClockGeometry()
@@ -119,14 +123,14 @@ void SystemTrayApplet::updateClockGeometry()
     if (m_clockApplet)
     {
         m_clockApplet->setPosition(position());
-			  if (orientation() == TQt::Horizontal)
-			  {
-	          m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height());
-   			}
-			  else
-			  {
-	          m_clockApplet->setFixedSize(width(),m_clockApplet->heightForWidth(width()));
- 			  }
+        if (orientation() == TQt::Horizontal)
+        {
+            m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height());
+        }
+        else
+        {
+            m_clockApplet->setFixedSize(width(),m_clockApplet->heightForWidth(width()));
+        }
     }
 }
 
@@ -151,10 +155,10 @@ void SystemTrayApplet::initialize()
     }
 
     // the KWinModule notifies us when tray windows are added or removed
-    connect( twin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ),
-             this, TQT_SLOT( systemTrayWindowAdded(WId) ) );
-    connect( twin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ),
-             this, TQT_SLOT( updateTrayWindows() ) );
+    connect( twin_module, TQ_SIGNAL( systemTrayWindowAdded(WId) ),
+             this, TQ_SLOT( systemTrayWindowAdded(WId) ) );
+    connect( twin_module, TQ_SIGNAL( systemTrayWindowRemoved(WId) ),
+             this, TQ_SLOT( updateTrayWindows() ) );
 
     TQCString screenstr;
     screenstr.setNum(tqt_xscreen());
@@ -190,7 +194,7 @@ void SystemTrayApplet::initialize()
 
         XSendEvent (display, root, False, StructureNotifyMask, (XEvent *)&xev);
     }
-    
+
     setBackground();
 }
 
@@ -249,11 +253,11 @@ void SystemTrayApplet::preferences()
                                        KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel,
                                        KDialogBase::Ok, true);
     m_settingsDialog->resize(450, 400);
-    connect(m_settingsDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(applySettings()));
-    connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings()));
-    connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished()));
+    connect(m_settingsDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(applySettings()));
+    connect(m_settingsDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(applySettings()));
+    connect(m_settingsDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(settingsDialogFinished()));
 
-    TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, TQt::Vertical);
+    TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 3, TQt::Vertical);
 
     m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid);
     m_showClockSettingCB->setChecked(m_showClockInTray);
@@ -289,6 +293,13 @@ void SystemTrayApplet::preferences()
         }
     }
 
+    TQHBox *hbox = new TQHBox(settingsGrid);
+    hbox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
+    TQLabel *iconMarginL = new TQLabel(i18n("Icon margin: "), hbox);
+    m_iconMarginSB = new TQSpinBox(0, 20, 1, hbox);
+    m_iconMarginSB->setSuffix(i18n(" px"));
+    m_iconMarginSB->setValue(m_iconMargin);
+
     m_settingsDialog->show();
 }
 
@@ -307,6 +318,7 @@ void SystemTrayApplet::applySettings()
     }
 
     m_showClockInTray = m_showClockSettingCB->isChecked();
+    m_iconMargin = m_iconMarginSB->value();
 
     TDEConfig *conf = config();
 
@@ -356,6 +368,7 @@ void SystemTrayApplet::applySettings()
 
     conf->setGroup("System Tray");
     conf->writeEntry("ShowClockInTray", m_showClockInTray);
+    conf->writeEntry("IconMargin", m_iconMargin);
 
     conf->sync();
 
@@ -448,12 +461,12 @@ void SystemTrayApplet::showExpandButton(bool show)
                                                             .width(),
                                              height() - 4);
             }
-            connect(m_expandButton, TQT_SIGNAL(clicked()),
-                    this, TQT_SLOT(toggleExpanded()));
+            connect(m_expandButton, TQ_SIGNAL(clicked()),
+                    this, TQ_SLOT(toggleExpanded()));
 
             m_autoRetractTimer = new TQTimer(this, "m_autoRetractTimer");
-            connect(m_autoRetractTimer, TQT_SIGNAL(timeout()),
-                    this, TQT_SLOT(checkAutoRetract()));
+            connect(m_autoRetractTimer, TQ_SIGNAL(timeout()),
+                    this, TQ_SLOT(checkAutoRetract()));
         }
         else
         {
@@ -483,7 +496,7 @@ void SystemTrayApplet::iconSizeChanged() {
 		(*emb)->setFixedSize(m_iconSize, m_iconSize);
 		++emb;
 	}
-	
+
 	emb = m_hiddenWins.begin();
 	while (emb != m_hiddenWins.end()) {
 		(*emb)->setFixedSize(m_iconSize, m_iconSize);
@@ -516,6 +529,7 @@ void SystemTrayApplet::loadSettings()
     conf->setGroup("System Tray");
     m_iconSize = conf->readNumEntry("systrayIconWidth", 22);
     m_showClockInTray = conf->readNumEntry("ShowClockInTray", false);
+    m_iconMargin = conf->readNumEntry("IconMargin", 1);
 }
 
 void SystemTrayApplet::systemTrayWindowAdded( WId w )
@@ -559,7 +573,7 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray )
         return;
     }
 
-    connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
+    connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows()));
     emb->setFixedSize(m_iconSize, m_iconSize);
 
     if (shouldHide(w))
@@ -627,7 +641,7 @@ void SystemTrayApplet::updateVisibleWins()
             (*emb)->hide();
         }
     }
-    
+
     TQMap< QXEmbed*, TQString > names; // cache window names and classes
     TQMap< QXEmbed*, TQString > classes;
     for( TrayEmbedList::const_iterator it = m_shownWins.begin();
@@ -682,8 +696,8 @@ void SystemTrayApplet::refreshExpandButton()
     if (orientation() == TQt::Vertical)
         a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
     else
-        a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
-    
+        a = (m_showHidden ^ tdeApp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
+
     m_expandButton->setArrowType(a);
 }
 
@@ -853,7 +867,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
         {
             TQPopupMenu* contextMenu = new TQPopupMenu(this);
             contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."),
-                                    this, TQT_SLOT(configure()));
+                                    this, TQ_SLOT(configure()));
 
             contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos());
 
@@ -881,7 +895,7 @@ int SystemTrayApplet::widthForHeight(int h) const
         me->setFixedHeight(h);
     }
 
-    return sizeHint().width(); 
+    return sizeHint().width();
 }
 
 int SystemTrayApplet::heightForWidth(int w) const
@@ -900,7 +914,7 @@ int SystemTrayApplet::heightForWidth(int w) const
         me->setFixedWidth(w);
     }
 
-    return sizeHint().height(); 
+    return sizeHint().height();
 }
 
 void SystemTrayApplet::moveEvent( TQMoveEvent* )
@@ -913,7 +927,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* )
 {
     layoutTray();
     // we need to give ourselves a chance to adjust our size before calling this
-    TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout()));
+    TQTimer::singleShot(0, this, TQ_SIGNAL(updateLayout()));
 }
 
 void SystemTrayApplet::layoutTray()
@@ -933,7 +947,7 @@ void SystemTrayApplet::layoutTray()
     int i = 0, line, nbrOfLines, heightWidth;
     bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this);
     delete m_layout;
-    m_layout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN);
+    m_layout = new TQGridLayout(this, 1, 1, 0, m_iconMargin);
 
     if (m_expandButton)
     {
@@ -951,20 +965,20 @@ void SystemTrayApplet::layoutTray()
     // the opposite direction of line
     int col = 0;
 
-    // 
+    //
     // The margin and spacing specified in the layout implies that:
-    // [-- ICON_MARGIN pixels --] [-- first icon --] [-- ICON_MARGIN pixels --] ... [-- ICON_MARGIN pixels --] [-- last icon --] [-- ICON_MARGIN pixels --]
+    // [-- m_iconMargin pixels --] [-- first icon --] [-- m_iconMargin pixels --] ... [-- m_iconMargin pixels --] [-- last icon --] [-- m_iconMargin pixels --]
     //
-    // So, if we say that iconWidth is the icon width plus the ICON_MARGIN pixels spacing, then the available width for the icons
-    // is the widget width minus ICON_MARGIN pixels margin. Forgetting these ICON_MARGIN pixels broke the layout algorithm in KDE <= 3.5.9.
+    // So, if we say that iconWidth is the icon width plus the m_iconMargin pixels spacing, then the available width for the icons
+    // is the widget width minus m_iconMargin pixels margin. Forgetting these m_iconMargin pixels broke the layout algorithm in KDE <= 3.5.9.
     //
     // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded.
     //
 
     if (orientation() == TQt::Vertical)
     {
-        int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout
-        heightWidth = width() - ICON_MARGIN;
+        int iconWidth = maxIconWidth() + m_iconMargin * 2; // +2 for the margins that implied by the layout
+        heightWidth = width() - m_iconMargin * 2;
         // to avoid nbrOfLines=0 we ensure heightWidth >= iconWidth!
         heightWidth = heightWidth < iconWidth ? iconWidth : heightWidth;
         nbrOfLines = heightWidth / iconWidth;
@@ -1040,8 +1054,8 @@ void SystemTrayApplet::layoutTray()
     }
     else // horizontal
     {
-        int iconHeight = maxIconHeight() + ICON_MARGIN; // +2 for the margins that implied by the layout
-        heightWidth = height() - ICON_MARGIN;
+        int iconHeight = maxIconHeight() + m_iconMargin * 2; // +2 for the margins that implied by the layout
+        heightWidth = height() - m_iconMargin * 2;
         heightWidth = heightWidth < iconHeight ? iconHeight : heightWidth; // to avoid nbrOfLines=0
         nbrOfLines = heightWidth / iconHeight;
 
@@ -1129,11 +1143,11 @@ void SystemTrayApplet::paletteChange(const TQPalette & /* oldPalette */)
 void SystemTrayApplet::setBackground()
 {
     TrayEmbedList::const_iterator lastEmb;
-    
+
     lastEmb = m_shownWins.end();
     for (TrayEmbedList::const_iterator emb = m_shownWins.begin(); emb != lastEmb; ++emb)
         (*emb)->setBackground();
-    
+
     lastEmb = m_hiddenWins.end();
     for (TrayEmbedList::const_iterator emb = m_hiddenWins.begin(); emb != lastEmb; ++emb)
         (*emb)->setBackground();
@@ -1188,7 +1202,7 @@ void TrayEmbed::ensureBackgroundSet()
 		// Get the RGB background image
 		bg.fill(parentWidget(), pos());
 		TQImage bgImage = bg.convertToImage();
-		
+
 		// Create the ARGB pixmap
 		Pixmap argbpixmap = XCreatePixmap(x11Display(), embeddedWinId(), width(), height(), 32);
 		GC gc;
@@ -1207,7 +1221,7 @@ void TrayEmbed::ensureBackgroundSet()
 				XDrawPoint(x11Display(), argbpixmap, gc, x, y);
 			}
 		}
-		XFlush(x11Display()); 
+		XFlush(x11Display());
 		XSetWindowBackgroundPixmap(x11Display(), embeddedWinId(), argbpixmap);
 		XFreePixmap(x11Display(), argbpixmap);
 		XFreeGC(x11Display(), gc);
diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index 2b49ce93e..d06d42b72 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -27,8 +27,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqvaluevector.h>
 #include <tqstringlist.h>
 #include <tqevent.h>
-#include <tqlayout.h>
-#include <tqcheckbox.h>
 #include <qxembed.h>
 
 #include <dcopobject.h>
@@ -40,6 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "simplebutton.h"
 
 class TQGridLayout;
+class TQSpinBox;
+class TQCheckBox;
 class TQTimer;
 class KWinModule;
 class TrayEmbed;
@@ -120,6 +120,8 @@ private:
     int m_iconSize;
     bool m_showClockInTray;
     TQCheckBox *m_showClockSettingCB;
+    uint m_iconMargin;
+    TQSpinBox *m_iconMarginSB;
     TQGridLayout* m_layout;
 };
 
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 3e76d6a8d..a34db8b73 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -38,12 +38,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
+    TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
     {
         // FIXME: what about two taskbars? perhaps this should be inserted just once
         TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
         int options = 0;
-        if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
+        if (tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop"))
            options = KPanelApplet::Preferences;
         TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch,
                                                     options, parent, "ktaskbarapplet" );
@@ -59,7 +59,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions
     TQHBoxLayout* layout = new TQHBoxLayout( this );
     container = new TaskBarContainer( false, configFile, this );
     container->setBackgroundOrigin( AncestorOrigin );
-    connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout()));
+    connect(container, TQ_SIGNAL(containerCountChanged()), this, TQ_SIGNAL(updateLayout()));
     layout->addWidget( container, 1 );
     container->popupDirectionChange(popupDirection());
 }
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 9665d21b9..b86b5ef9d 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
+	TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
 	{
 		TDEGlobal::locale()->insertCatalogue("trashapplet");
 		return new TrashApplet(configFile, KPanelApplet::Normal,
@@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQW
 
 	mpDirLister = new KDirLister();
 
-	connect( mpDirLister, TQT_SIGNAL( clear() ),
-	         this, TQT_SLOT( slotClear() ) );
-	connect( mpDirLister, TQT_SIGNAL( completed() ),
-	         this, TQT_SLOT( slotCompleted() ) );
-	connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-	         this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+	connect( mpDirLister, TQ_SIGNAL( clear() ),
+	         this, TQ_SLOT( slotClear() ) );
+	connect( mpDirLister, TQ_SIGNAL( completed() ),
+	         this, TQ_SLOT( slotCompleted() ) );
+	connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+	         this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
 
 	mpDirLister->openURL("trash:/");
 }
@@ -67,8 +67,8 @@ TrashApplet::~TrashApplet()
 {
 	// disconnect the dir lister before quitting so as not to crash
 	// on kicker exit
-	disconnect( mpDirLister, TQT_SIGNAL( clear() ),
-	            this, TQT_SLOT( slotClear() ) );
+	disconnect( mpDirLister, TQ_SIGNAL( clear() ),
+	            this, TQ_SLOT( slotClear() ) );
 	delete mpDirLister;
 	TDEGlobal::locale()->removeCatalogue("trashapplet");
 }
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 85c0eef62..96efb7436 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -32,14 +32,14 @@
 #include <konq_popupmenu.h>
 
 TrashButton::TrashButton(TQWidget *parent)
-	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)),
+	: PanelPopupButton(parent), mActions(this, this),
 	  mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
 {
 	TDEIO::UDSEntry entry;
 	TDEIO::NetAccess::stat("trash:/", entry, 0L);
 	mFileItem.assign(KFileItem(entry, "trash:/"));
 
-	TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+	TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()),
 	                               &mActions, "paste");
 	a->setShortcut(0);
 
@@ -53,7 +53,7 @@ TrashButton::TrashButton(TQWidget *parent)
 
 	// Activate this code only if we find a way to have both an
 	// action and a popup menu for the same kicker button
-	//connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+	//connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
 
 	setPopup(new TQPopupMenu());
 }
diff --git a/kicker/data/icons/cr16-app-kicker.png b/kicker/data/icons/cr16-app-kicker.png
index 681263792..da537e9d8 100644..100755
--- a/kicker/data/icons/cr16-app-kicker.png
+++ b/kicker/data/icons/cr16-app-kicker.png
diff --git a/kicker/data/icons/cr16-app-panel.png b/kicker/data/icons/cr16-app-panel.png
index 2331a29e0..2fe3f09b4 100644
--- a/kicker/data/icons/cr16-app-panel.png
+++ b/kicker/data/icons/cr16-app-panel.png
diff --git a/kicker/data/icons/cr22-app-kicker.png b/kicker/data/icons/cr22-app-kicker.png
index 7a3b5c6a6..e87ef4f81 100644..100755
--- a/kicker/data/icons/cr22-app-kicker.png
+++ b/kicker/data/icons/cr22-app-kicker.png
diff --git a/kicker/data/icons/cr32-app-kicker.png b/kicker/data/icons/cr32-app-kicker.png
index 5a8c1d4f0..97ef1a325 100644..100755
--- a/kicker/data/icons/cr32-app-kicker.png
+++ b/kicker/data/icons/cr32-app-kicker.png
diff --git a/kicker/data/icons/cr48-app-kicker.png b/kicker/data/icons/cr48-app-kicker.png
index 613dd6708..89b961958 100644..100755
--- a/kicker/data/icons/cr48-app-kicker.png
+++ b/kicker/data/icons/cr48-app-kicker.png
diff --git a/kicker/data/kickoff/kmenu_basic.png b/kicker/data/kickoff/kmenu_basic.png
index 4674a03ac..f5608af28 100644..100755
--- a/kicker/data/kickoff/kmenu_basic.png
+++ b/kicker/data/kickoff/kmenu_basic.png
diff --git a/kicker/data/kmenu_side/kside.png b/kicker/data/kmenu_side/kside.png
index dc07a0570..af0f0c32f 100644..100755
--- a/kicker/data/kmenu_side/kside.png
+++ b/kicker/data/kmenu_side/kside.png
diff --git a/kicker/data/kmenu_side/kside_tile.png b/kicker/data/kmenu_side/kside_tile.png
index d206d33d5..7129b8b7b 100644..100755
--- a/kicker/data/kmenu_side/kside_tile.png
+++ b/kicker/data/kmenu_side/kside_tile.png
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index cbd336f6f..ac35bfdbc 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <twinmodule.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kshell.h>
 #include <twin.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile)
     {
 	TDEGlobal::locale()->insertCatalogue("dockbarextension");
 	return new DockBarExtension(configFile, KPanelExtension::Normal,
@@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
   : KPanelExtension(configFile, type, actions, parent, name)
 {
     dragging_container = 0;
-    twin_module = new KWinModule(TQT_TQOBJECT(this));
-    connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
+    twin_module = new KWinModule(this);
+    connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) );
     setMinimumSize(DockContainer::sz(), DockContainer::sz());
     setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     loadContainerConfig();
@@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos)
 
         containers.insert(it, c);
     }
-    connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), 
-            TQT_SLOT(embeddedWindowDestroyed(DockContainer*)));
-    connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), 
-            TQT_SLOT(settingsChanged(DockContainer*)));
+    connect(c, TQ_SIGNAL(embeddedWindowDestroyed(DockContainer*)), 
+            TQ_SLOT(embeddedWindowDestroyed(DockContainer*)));
+    connect(c, TQ_SIGNAL(settingsChanged(DockContainer*)), 
+            TQ_SLOT(settingsChanged(DockContainer*)));
     c->resize(DockContainer::sz(), DockContainer::sz());
     c->show();
 }
diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog
index 71abc4321..811d029f3 100644
--- a/kicker/extensions/kasbar/ChangeLog
+++ b/kicker/extensions/kasbar/ChangeLog
@@ -634,7 +634,7 @@
 
 2002-05-14 Tuesday 10:31  gioele
 
-	* kapp.h -> tdeapplication.h
+	* tdeApp.h -> tdeapplication.h
 
 2002-04-23 Tuesday 14:02  binner
 
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 54dd1dfd6..a37af0883 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -61,7 +61,7 @@
 
 #include <tdeversion.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <kiconloader.h>
 #include <ktextbrowser.h>
@@ -129,7 +129,7 @@ void KasAboutDialog::addDemoBar()
    KasPopup *pop = new KasPopup( ci );
    ci->setPopup( pop );
    ci->setCustomPopup( true );
-   connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) );
+   connect( ci, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQ_SLOT(togglePopup()) );
 
    KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
    KasItem *i = 0;
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index f28d2fd1f..323a58150 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
     setMouseTracking( true );
     setMaxBoxes( 0 );
 
-    connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
+    connect( this, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) );
 }
 
 KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f )
@@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
     items.setAutoDelete( true );
     setMouseTracking( true );
     setMaxBoxes( 0 );
-    connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
+    connect( master_, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) );
 }
 
 KasBar::~KasBar()
@@ -145,8 +145,8 @@ KasResources *KasBar::resources()
 
     if ( isTopLevel() ) {
 	res = new KasResources( this );
-	connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) );
-	connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) );
+	connect( res, TQ_SIGNAL( changed() ), TQ_SIGNAL( configChanged() ) );
+	connect( this, TQ_SIGNAL( itemSizeChanged(int) ), res, TQ_SLOT( itemSizeChanged() ) );
 	return res;
     }
 
@@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable )
        kdDebug(1345) << "KasBar: Enabling transparency" << endl;
 
        rootPix = new KRootPixmap( this );
-       connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ),
-		this, TQT_SLOT( setBackground(const TQPixmap &) ) );
+       connect( rootPix, TQ_SIGNAL( backgroundUpdated(const TQPixmap &) ),
+		this, TQ_SLOT( setBackground(const TQPixmap &) ) );
 
        rootPix->setCustomPainting( true );
 
@@ -720,7 +720,7 @@ void KasBar::addTestItems()
    i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
    i->setAnimation( resources()->startupAnimation() );
    TQTimer *aniTimer = new TQTimer( i, "aniTimer" );
-   connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );
+   connect( aniTimer, TQ_SIGNAL( timeout() ), i, TQ_SLOT( advanceAnimation() ) );
    aniTimer->start( 100 );
    i->setShowAnimation( true );
 
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 5aad7392a..7780775f5 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -72,7 +72,7 @@ typedef TQPtrList<KasItem> KasItemList;
 /**
  * The main view for KasBar.
  */
-class KDE_EXPORT KasBar : public TQWidget
+class TDE_EXPORT KasBar : public TQWidget
 {
    TQ_OBJECT
    TQ_PROPERTY( int maxBoxes READ maxBoxes )
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 1dc85038c..bddeeacb2 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -104,7 +104,7 @@ int main( int argc, char **argv )
 
       kastasker->readConfig();
       kastasker->move( kastasker->detachedPosition() );
-      kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) );
+      kastasker->connect( kastasker->resources(), TQ_SIGNAL(changed()), TQ_SLOT(readConfig()) );
       kastasker->refreshAll();
   }
 
@@ -116,9 +116,9 @@ int main( int argc, char **argv )
   KWin::setOnAllDesktops( kasbar->winId(), true );
   kdDebug() << "kasbar: Window id is " << kasbar->winId() << endl;
 
-  TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+  tdeApp->dcopClient()->registerAs( "kasbar" );
 
-  app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
+  app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) );
 
   return app.exec();
 }
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 1aa373d3c..ad047a887 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -74,7 +74,7 @@
 
 extern "C"
 {
-   KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
+   TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
    {
       TDEGlobal::locale()->insertCatalogue("kasbarextension");
       return new KasBarExtension( configFile,
@@ -92,13 +92,13 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
       detached_( false )
 {
     kdDebug(1345) << "KasBarExtension: Created '" << name << "', '" << configFile << "'" << endl;
-//    TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" );
+//    tdeApp->dcopClient()->registerAs( "kasbar" );
 
 //    setBackgroundMode( NoBackground );
     kasbar = new KasTasker( orientation(), this, name );
 
-    connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );
-    connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) );
+    connect( kasbar, TQ_SIGNAL( layoutChanged() ), this, TQ_SIGNAL( updateLayout() ) );
+    connect( kasbar, TQ_SIGNAL( detachedChanged(bool) ), this, TQ_SLOT( setDetached(bool) ) );
 
     kasbar->setConfig( config() );
     kasbar->readConfig();
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 249e7c051..2e5b8d459 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -12,7 +12,7 @@
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdepopupmenu.h>
 
 #include <taskmanager.h>
@@ -39,7 +39,7 @@ KasClockItem::KasClockItem( KasBar *parent )
     setCustomPopup( true );
 
     TQTimer *t = new TQTimer( this, "t" );
-    connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) );
+    connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateTime() ) );
     t->start( 1000 );
 
     lcd = new LCD( parent );
@@ -53,8 +53,8 @@ KasClockItem::KasClockItem( KasBar *parent )
     lcd->setAutoMask( true );
     updateTime();
 
-    connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) );
+    connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) );
 }
 
 KasClockItem::~KasClockItem()
diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h
index b6b263318..d81815c7f 100644
--- a/kicker/extensions/kasbar/kasclockitem.h
+++ b/kicker/extensions/kasbar/kasclockitem.h
@@ -6,7 +6,7 @@
 /**
  * An item that displays a clock.
  */
-class KDE_EXPORT KasClockItem : public KasItem
+class TDE_EXPORT KasClockItem : public KasItem
 {
     TQ_OBJECT
 
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 693f912c4..de59f7b88 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent )
     setGroupItem( true );
     setText( i18n("Group") );
 
-    connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) );
-    connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) );
-    connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
+    connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( hidePopup() ) );
+    connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( update() ) );
+    connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
 }
 
 KasGroupItem::~KasGroupItem()
@@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t )
 	updateIcon();
     }
 
-    connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) );
+    connect( t, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( update() ) );
     update();
 }
 
@@ -257,7 +257,7 @@ KasPopup *KasGroupItem::createPopup()
     KasPopup *pop = new KasPopup( this );
     bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
 
-    connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) );
+    connect( pop, TQ_SIGNAL(shown()), TQ_SLOT(updatePopup()) );
 
     return pop;
 
@@ -291,7 +291,7 @@ void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev )
 void KasGroupItem::showGroupMenuAt( const TQPoint &p )
 {
     TaskRMBMenu *tm = new TaskRMBMenu(items, true, NULL, kasbar());
-    tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) );
+    tm->insertItem( i18n("&Ungroup" ), this, TQ_SLOT( ungroup() ) );
     tm->insertSeparator();
     tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() );
 
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 1967465f4..a95dac049 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent )
      frame(true), modified(false), attention_(false), prog( -1 ),
      anim(), aniFrame( 0 ), drawAnim( false )
 {
-    connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) );
-    connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) );
+    connect( parent, TQ_SIGNAL( dragStarted() ), TQ_SLOT( hidePopup() ) );
+    connect( this, TQ_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQ_SLOT( toggleOrientation() ) );
 }
 
 KasItem::~KasItem()
@@ -169,7 +169,7 @@ void KasItem::mouseEnter()
 
    if ( (!customPopup) && (popupTimer == 0) ) {
       popupTimer = new TQTimer( this, "popupTimer" );
-      connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) );
+      connect( popupTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( showPopup() ) );
       popupTimer->start( POPUP_DELAY, true );
    }
 
@@ -205,7 +205,7 @@ void KasItem::checkPopup()
 	    hidePopup();
     }
     else {
-	TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) );
+	TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) );
     }
 }
 
@@ -215,7 +215,7 @@ void KasItem::dragEnter()
 
    if ( dragTimer == 0 ) {
       dragTimer = new TQTimer( this, "dragTimer" );
-      connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) );
+      connect( dragTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( dragOverAction() ) );
       dragTimer->start( DRAG_SWITCH_DELAY, true );
    }
 
@@ -268,7 +268,7 @@ void KasItem::showPopup()
    pop->show();
    update();
 
-   TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) );
+   TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) );
 }
 
 void KasItem::hidePopup()
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 508955f9d..9731d1633 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -64,7 +64,7 @@ class KasPopup;
 #include <tqvaluevector.h>
 #include <tqapplication.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "kasbar.h"
 
@@ -73,7 +73,7 @@ class KasPopup;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KDE_EXPORT KasItem : public TQObject
+class TDE_EXPORT KasItem : public TQObject
 {
     TQ_OBJECT
 
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 6169d09b1..2643ab932 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -19,7 +19,7 @@
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdepopupmenu.h>
 
 #include <taskmanager.h>
@@ -34,11 +34,11 @@ KasLoadItem::KasLoadItem( KasBar *parent )
     : KasItem( parent )
 {
     TQTimer *t = new TQTimer( this, "KasLoadItem::t" );
-    connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) );
+    connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateDisplay() ) );
     t->start( 1000 );
     updateDisplay();
 
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) );
 }
 
 KasLoadItem::~KasLoadItem()
diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h
index 91af06080..c727d9709 100644
--- a/kicker/extensions/kasbar/kasloaditem.h
+++ b/kicker/extensions/kasbar/kasloaditem.h
@@ -3,12 +3,12 @@
 
 #include "kasitem.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 /**
  * An item that displays the system load.
  */
-class KDE_EXPORT KasLoadItem : public KasItem
+class TDE_EXPORT KasLoadItem : public KasItem
 {
     TQ_OBJECT
 
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 6d5255082..cce36b250 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -134,9 +134,9 @@ void KasPrefsDialog::addLookPage()
 
    itemSizeLabel->setBuddy( itemSizeCombo );
 
-   connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ),
-	    kasbar, TQT_SLOT( setItemSize( int ) ) );
-   connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) );
+   connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ),
+	    kasbar, TQ_SLOT( setItemSize( int ) ) );
+   connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( itemSizeChanged( int ) ) );
 
    new TQWidget( itemSizeBox );
 
@@ -144,10 +144,10 @@ void KasPrefsDialog::addLookPage()
 
    customSize->setValue( kasbar->itemExtent() );
 
-   connect( customSize, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( setItemExtent( int ) ) );
-   connect( customSize, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( customSizeChanged( int ) ) );
+   connect( customSize, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( setItemExtent( int ) ) );
+   connect( customSize, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( customSizeChanged( int ) ) );
 
    int sz = kasbar->itemSize();
    itemSizeCombo->setCurrentItem( sz );
@@ -171,7 +171,7 @@ void KasPrefsDialog::addLookPage()
 				   conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11,
 				   10,
 				   maxBoxesBox, "maxboxes" );
-   connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) );
+   connect( maxBoxesSpin, TQ_SIGNAL( valueChanged( int ) ), kasbar, TQ_SLOT( setMaxBoxes( int ) ) );
    maxBoxesLabel->setBuddy( maxBoxesSpin );
 
    //
@@ -183,7 +183,7 @@ void KasPrefsDialog::addLookPage()
 
    detachedCheck->setEnabled( !kasbar->isStandAlone() );
    detachedCheck->setChecked( kasbar->isDetached() );
-   connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) );
+   connect( detachedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setDetached(bool) ) );
 
    (void) new TQWidget( lookPage, "spacer" );
    (void) new TQWidget( lookPage, "spacer" );
@@ -197,31 +197,31 @@ void KasPrefsDialog::addBackgroundPage()
    transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage );
    TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) );
    transCheck->setChecked( kasbar->isTransparent() );
-   connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) );
+   connect( transCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTransparent(bool) ) );
 
    tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage );
    TQWhatsThis::add( tintCheck,
 		    i18n( "Enables tinting the background that shows through in transparent mode." ) );
    tintCheck->setChecked( kasbar->hasTint() );
-   connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) );
+   connect( tintCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTint(bool) ) );
 
    TQHBox *tintColBox = new TQHBox( bgPage );
    TQWhatsThis::add( tintColBox,
 		    i18n( "Specifies the color used for the background tint." ) );
-   connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) );
+   connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintColBox, TQ_SLOT( setEnabled(bool) ) );
    tintColBox->setEnabled( kasbar->hasTint() );
 
    TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox );
 
    tintButton = new KColorButton( kasbar->tintColor(), tintColBox );
-   connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) );
+   connect( tintButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    kasbar, TQ_SLOT( setTintColor( const TQColor & ) ) );
    tintLabel->setBuddy( tintButton );
 
    TQHBox *tintAmtBox = new TQHBox( bgPage );
    TQWhatsThis::add( tintAmtBox,
 		    i18n( "Specifies the strength of the background tint." ) );
-   connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) );
+   connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintAmtBox, TQ_SLOT( setEnabled(bool) ) );
    tintAmtBox->setEnabled( kasbar->hasTint() );
 
    TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox );
@@ -229,8 +229,8 @@ void KasPrefsDialog::addBackgroundPage()
    int percent = (int) (kasbar->tintAmount() * 100.0);
    tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox );
    tintAmount->setTracking( true );
-   connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( setTintAmount( int ) ) );
+   connect( tintAmount, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( setTintAmount( int ) ) );
    tintStrengthLabel->setBuddy( tintAmount );
 
    (void) new TQWidget( bgPage, "spacer" );
@@ -249,11 +249,11 @@ void KasPrefsDialog::addThumbsPage()
 			  "approximate, and may not reflect the current window contents.\n\n"
 			  "Using this option on a slow machine may cause performance problems." ) );
    thumbsCheck->setChecked( kasbar->thumbnailsEnabled() );
-   connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) );
+   connect( thumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setThumbnailsEnabled(bool) ) );
 
    embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage );
    embedThumbsCheck->setChecked( kasbar->embedThumbnails() );
-   connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) );
+   connect( embedThumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setEmbedThumbnails(bool) ) );
 
    TQHBox *thumbSizeBox = new TQHBox( thumbsPage );
    TQWhatsThis::add( thumbSizeBox,
@@ -262,8 +262,8 @@ void KasPrefsDialog::addThumbsPage()
    TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox );
    int percent = (int) (kasbar->thumbnailSize() * 100.0);
    thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox );
-   connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( setThumbnailSize( int ) ) );
+   connect( thumbSizeSlider, TQ_SIGNAL( valueChanged( int ) ),
+	    kasbar, TQ_SLOT( setThumbnailSize( int ) ) );
    thumbSizeLabel->setBuddy( thumbSizeSlider );
 
    TQHBox *thumbUpdateBox = new TQHBox( thumbsPage );
@@ -275,8 +275,8 @@ void KasPrefsDialog::addThumbsPage()
    TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox );
    thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox );
    thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() );
-   connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ),
-   	    kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) );
+   connect( thumbUpdateSpin, TQ_SIGNAL( valueChanged( int ) ),
+   	    kasbar, TQ_SLOT( setThumbnailUpdateDelay( int ) ) );
    (void) new TQLabel( i18n("seconds"), thumbUpdateBox );
    thumbUpdateLabel->setBuddy( thumbUpdateSpin );
 
@@ -293,21 +293,21 @@ void KasPrefsDialog::addBehavePage()
    TQWhatsThis::add( groupWindowsCheck,
 		    i18n( "Enables the grouping together of related windows." ) );
    groupWindowsCheck->setChecked( kasbar->groupWindows() );
-   connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ),
-	    kasbar, TQT_SLOT( setGroupWindows(bool) ) );
+   connect( groupWindowsCheck, TQ_SIGNAL( toggled(bool) ),
+	    kasbar, TQ_SLOT( setGroupWindows(bool) ) );
 
    showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage );
    TQWhatsThis::add( showAllWindowsCheck,
 		    i18n( "Enables the display of all windows, not just those on the current desktop." ) );
    showAllWindowsCheck->setChecked( kasbar->showAllWindows() );
-   connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) );
+   connect( showAllWindowsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAllWindows(bool) ) );
 
    groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage );
    TQWhatsThis::add( groupInactiveCheck,
 		    i18n( "Enables the grouping together of windows that are not on the current desktop." ) );
    groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() );
-   connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ),
-	    kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) );
+   connect( groupInactiveCheck, TQ_SIGNAL( toggled(bool) ),
+	    kasbar, TQ_SLOT( setGroupInactiveDesktops(bool) ) );
 
    onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage );
    TQWhatsThis::add( onlyShowMinimizedCheck,
@@ -315,7 +315,7 @@ void KasPrefsDialog::addBehavePage()
 			  "This gives Kasbar similar behavior to the icon handling in older environments " \
 			  "like CDE or OpenLook." ) );
    onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() );
-   connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) );
+   connect( onlyShowMinimizedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setOnlyShowMinimized(bool) ) );
 
    (void) new TQWidget( behavePage, "spacer" );
    (void) new TQWidget( behavePage, "spacer" );
@@ -331,14 +331,14 @@ void KasPrefsDialog::addColorsPage()
    TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group );
 
    labelPenButton = new KColorButton( res->labelPenColor(), group );
-   connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) );
+   connect( labelPenButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setLabelPenColor( const TQColor & ) ) );
    labelPenLabel->setBuddy( labelPenButton );
 
    TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group );
    labelBackgroundButton = new KColorButton( res->labelBgColor(), group );
-   connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) );
+   connect( labelBackgroundButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setLabelBgColor( const TQColor & ) ) );
    labelBackgroundLabel->setBuddy( labelBackgroundButton );
 
    // Inactive colors
@@ -346,14 +346,14 @@ void KasPrefsDialog::addColorsPage()
 
    TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group );
    inactivePenButton = new KColorButton( res->inactivePenColor(), group );
-   connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) );
+   connect( inactivePenButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setInactivePenColor( const TQColor & ) ) );
    inactivePenLabel->setBuddy( inactivePenButton );
 
    TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group );
    inactiveBgButton = new KColorButton( res->inactiveBgColor(), group );
-   connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) );
+   connect( inactiveBgButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setInactiveBgColor( const TQColor & ) ) );
    inactiveBgLabel->setBuddy( inactiveBgButton );
 
    // Active colors
@@ -361,28 +361,28 @@ void KasPrefsDialog::addColorsPage()
 
    TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group );
    activePenButton = new KColorButton( res->activePenColor(), group );
-   connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setActivePenColor( const TQColor & ) ) );
+   connect( activePenButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setActivePenColor( const TQColor & ) ) );
    activePenLabel->setBuddy( activePenButton );
 
    TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group );
    activeBgButton = new KColorButton( res->activeBgColor(), group );
-   connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) );
+   connect( activeBgButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setActiveBgColor( const TQColor & ) ) );
    activeBgLabel->setBuddy( activeBgButton );
 
    group = new TQGrid( 2, colorsPage );
 
    TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group );
    progressButton = new KColorButton( res->progressColor(), group );
-   connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setProgressColor( const TQColor & ) ) );
+   connect( progressButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setProgressColor( const TQColor & ) ) );
    progressLabel->setBuddy( progressButton );
 
    TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group );
    attentionButton = new KColorButton( res->attentionColor(), group );
-   connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ),
-	    res, TQT_SLOT( setAttentionColor( const TQColor & ) ) );
+   connect( attentionButton, TQ_SIGNAL( changed( const TQColor & ) ),
+	    res, TQ_SLOT( setAttentionColor( const TQColor & ) ) );
    attentionLabel->setBuddy( attentionButton );
 
    (void) new TQWidget( colorsPage, "spacer" );
@@ -406,7 +406,7 @@ void KasPrefsDialog::addAdvancedPage()
 		    i18n( "Enables the display of tasks that are starting but have not yet "
 			  "created a window." ) );
    notifierCheck->setChecked( kasbar->notifierEnabled() );
-   connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) );
+   connect( notifierCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setNotifierEnabled(bool) ) );
 
    // Status advanced
    modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage );
@@ -414,26 +414,26 @@ void KasPrefsDialog::addAdvancedPage()
 		    i18n( "Enables the display of a floppy disk state icon for windows containing "
 			  "a modified document." ) );
    modifiedCheck->setChecked( kasbar->showModified() );
-   connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) );
+   connect( modifiedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowModified(bool) ) );
 
    progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage );
    TQWhatsThis::add( progressCheck,
 		    i18n( "Enables the display of a progress indicator in the label of windows." ) );
    progressCheck->setChecked( kasbar->showProgress() );
-   connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) );
+   connect( progressCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowProgress(bool) ) );
 
    attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage );
    TQWhatsThis::add( attentionCheck,
 		    i18n( "Enables the display of an icon that indicates a window that needs attention." ) );
    attentionCheck->setChecked( kasbar->showAttention() );
-   connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) );
+   connect( attentionCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAttention(bool) ) );
 
    inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage );
    TQWhatsThis::add( inactiveFramesCheck,
 		    i18n( "Enables frames around inactive items, if you want the bar to disappear into " \
 			  "the background you should probably uncheck this option." ) );
    inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() );
-   connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) );
+   connect( inactiveFramesCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setPaintInactiveFrames(bool) ) );
 
    (void) new TQWidget( advancedPage, "spacer" );
    (void) new TQWidget( advancedPage, "spacer" );
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 219c324fb..25b28d5f6 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -48,7 +48,7 @@
 ** SUCH DAMAGE.
 */
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kpixmapeffect.h>
 
 #include "kasbar.h"
diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp
index 2f008d0c5..84e17dd21 100644
--- a/kicker/extensions/kasbar/kasstartupitem.cpp
+++ b/kicker/extensions/kasbar/kasstartupitem.cpp
@@ -80,7 +80,7 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup )
     setAnimation( resources()->startupAnimation() );
 
     aniTimer = new TQTimer( this, "aniTimer" );
-    connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) );
+    connect( aniTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( aniTimerFired() ) );
     aniTimer->start( 100 );
 }
 
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 11185c9e0..3d28a723d 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -102,17 +102,17 @@ KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags
     loadItem(0)
 {
    setAcceptDrops( true );
-   connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr)));
-   connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater()));
-//   connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) );
+   connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), TQ_SLOT(addTask(Task::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), TQ_SLOT(removeTask(Task::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), TQ_SLOT(addStartup(Startup::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), TQ_SLOT(removeStartup(Startup::Ptr)));
+   connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAllLater()));
+//   connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAllLater() ) );
 
-   connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) );
+   connect( this, TQ_SIGNAL( itemSizeChanged( int ) ), TQ_SLOT( refreshAll() ) );
 
-   connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) );
-   connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) );
+   connect( this, TQ_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQ_SLOT( writeLayout() ) );
+   connect( this, TQ_SIGNAL( directionChanged() ), TQ_SLOT( writeLayout() ) );
 }
 
 KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f )
@@ -152,62 +152,62 @@ TDEPopupMenu *KasTasker::contextMenu()
 	menu = new TDEPopupMenu;
 
 	showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(),
-						  TQT_TQOBJECT(this), "toggle_show_all_windows" );
+						  this, "toggle_show_all_windows" );
 	showAllWindowsAction->setChecked( showAllWindows() );
 	showAllWindowsAction->plug( menu );
-	connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
+	connect( showAllWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowAllWindows(bool)) );
+	connect( this, TQ_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQ_SLOT(setChecked(bool)) );
 
 	groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(),
-						TQT_TQOBJECT(this), "toggle_group_windows" );
+						this, "toggle_group_windows" );
 	groupWindowsAction->setChecked( groupWindows() );
 	groupWindowsAction->plug( menu );
-	connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
+	connect( groupWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setGroupWindows(bool)) );
+	connect( this, TQ_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQ_SLOT(setChecked(bool)) );
 
-	showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
+	showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" );
 	showClockAction->setChecked( showClock() );
 	showClockAction->plug( menu );
-	connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
+	connect( showClockAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowClock(bool)) );
+	connect( this, TQ_SIGNAL(showClockChanged(bool)), showClockAction, TQ_SLOT(setChecked(bool)) );
 
-	showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
+	showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" );
 	showLoadAction->setChecked( showLoad() );
 	showLoadAction->plug( menu );
-	connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) );
+	connect( showLoadAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowLoad(bool)) );
+	connect( this, TQ_SIGNAL(showLoadChanged(bool)), showLoadAction, TQ_SLOT(setChecked(bool)) );
 
 	menu->insertSeparator();
 
 	if ( !standalone_ ) {
-	    toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
+	    toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" );
 	    toggleDetachedAction->setChecked( isDetached() );
 	    toggleDetachedAction->plug( menu );
-	    connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) );
-	    connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
+	    connect( toggleDetachedAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDetached(bool)) );
+	    connect( this, TQ_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQ_SLOT(setChecked(bool)) );
 	}
 
 	rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(),
-				       TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ),
-				       TQT_TQOBJECT(this), "rotate_bar" );
+				       this, TQ_SLOT( toggleOrientation() ),
+				       this, "rotate_bar" );
 	rotateBarAction->plug( menu );
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) );
-	connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) );
+	connect( this, TQ_SIGNAL(detachedChanged(bool)), rotateBarAction, TQ_SLOT(setEnabled(bool)) );
+	connect( rotateBarAction, TQ_SIGNAL(activated()), TQ_SLOT(writeConfigLater()) );
 
-	menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) );
+	menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQ_SLOT( refreshAll() ) );
 
 	menu->insertSeparator();
 
-	menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) );
+	menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQ_SLOT( showPreferences() ) );
 
 	// Help menu
 	TDEPopupMenu *help = new TDEPopupMenu;
-	help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) );
+	help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQ_SLOT( showAbout() ) );
 	menu->insertItem( SmallIcon("help"), i18n("&Help"), help );
 
 	if ( standalone_ ) {
 	    menu->insertSeparator();
-	    menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) );
+	    menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQ_SLOT( quit() ) );
 	}
     }
 
@@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t )
   removeTask( t );
   insert( i, gi );
 
-  connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr)));
+  connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), gi, TQ_SLOT(removeTask(Task::Ptr)));
 
   return gi;
 }
@@ -371,7 +371,7 @@ void KasTasker::refreshAll()
 
 void KasTasker::refreshAllLater()
 {
-    TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) );
+    TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQ_SLOT( refreshAll() ) );
 }
 
 void KasTasker::refreshIconGeometry()
@@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable )
       showAllWindows_ = enable;
       refreshAll();
       if ( !showAllWindows_ ) {
-	connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll()));
-//	connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) );
+	connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAll()));
+//	connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAll() ) );
       }
       else {
-	disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll()));
-//	disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) );
+	disconnect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), this, TQ_SLOT(refreshAll()));
+//	disconnect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), this, TQ_SLOT( refreshAll() ) );
       }
 
       emit showAllWindowsChanged( enable );
@@ -551,7 +551,7 @@ void KasTasker::readConfig()
 
 void KasTasker::writeConfigLater()
 {
-   TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) );
+   TQTimer::singleShot( 10, this, TQ_SLOT( writeConfig() ) );
 }
 
 void KasTasker::writeConfig()
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index c05c13bb6..4cb96999f 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -57,7 +57,7 @@
 
 #include "kasbar.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <taskmanager.h>
 
 class TDEConfig;
@@ -80,7 +80,7 @@ class KasGrouper;
  *
  * @author Richard Moore, rich@kde.org
  */
-class KDE_EXPORT KasTasker : public KasBar
+class TDE_EXPORT KasTasker : public KasBar
 {
     TQ_OBJECT
     TQ_PROPERTY( bool isTopLevel READ isTopLevel )
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index 0f57524cc..398be4d53 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -73,7 +73,7 @@
 #include <tdelocale.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
 
@@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task )
     setAttention( task->demandsAttention() );
     updateTask(false);
 
-    connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) );
-    connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) );
-    connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) );
-    connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) );
-    connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) );
+    connect( task, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( updateTask(bool) ) );
+    connect( task, TQ_SIGNAL( activated() ), this, TQ_SLOT( startAutoThumbnail() ) );
+    connect( task, TQ_SIGNAL( deactivated() ), this, TQ_SLOT( stopAutoThumbnail() ) );
+    connect( task, TQ_SIGNAL( iconChanged() ), this, TQ_SLOT( iconChanged() ) );
+    connect( task, TQ_SIGNAL( thumbnailChanged() ), this, TQ_SLOT( iconChanged() ) );
 
-    connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) );
-    connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) );
+    connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(toggleActivateAction()) );
+    connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showWindowMenuAt(TQMouseEvent *) ) );
 
     attentionTimer = new TQTimer( this, "attentionTimer" );
-    connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) );
+    connect( attentionTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAttention() ) );
     attentionTimer->start( CHECK_ATTENTION_DELAY );
 }
 
@@ -295,12 +295,12 @@ void KasTaskItem::startAutoThumbnail()
 
     if ( kasbar()->thumbnailUpdateDelay() > 0 ) {
 	thumbTimer = new TQTimer( this, "thumbTimer" );
-	connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) );
+	connect( thumbTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( refreshThumbnail() ) );
 
 	thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 );
     }
 
-    TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) );
+    TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) );
 }
 
 void KasTaskItem::stopAutoThumbnail()
@@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail()
     // TODO: Check if the popup obscures the window
     KasItem *i = kasbar()->itemUnderMouse();
     if ( i && i->isShowingPopup() ) {
-	TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) );
+	TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) );
 	return;
     }
 
@@ -333,11 +333,11 @@ void KasTaskItem::refreshThumbnail()
 void KasTaskItem::showWindowMenuAt( TQPoint p )
 {
     TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar());
-    tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) );
+    tm->insertItem( i18n("To &Tray" ), this, TQ_SLOT( sendToTray() ) );
     tm->insertSeparator();
     tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() );
     tm->insertSeparator();
-    tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) );
+    tm->insertItem( i18n("&Properties" ), this, TQ_SLOT( showPropertiesDialog() ) );
 
     mouseLeave();
     kasbar()->updateMouseOver();
@@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog()
     tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") );
 
     tabs->addTab( createTaskProps( this, tabs ), i18n("Item") );
-    tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") );
+    tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") );
 
 #if 0
     tabs->addTab( createNETProps( tabs ), i18n("NET") );
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 32ef9de81..8905af37a 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -94,7 +94,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
                              TQt::black, colorGroup().mid(),
                              KPixmapEffect::DiagonalGradient );
 
-    connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );
+    connect( item->task(), TQ_SIGNAL( thumbnailChanged() ), TQ_SLOT( refresh() ) );
 }
 
 KasTaskPopup::~KasTaskPopup()
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 89b0c4028..ae30b6174 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-   KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
+   TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
    {
       TDEGlobal::locale()->insertCatalogue("kickersidebarextension");
       TDEGlobal::locale()->insertCatalogue("konqueror");
@@ -57,15 +57,15 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
 						"konq_sidebar",
                                                  m_sbWrapper,
                                                  "SideBar_View",
-                                                 TQT_TQOBJECT(this),
+                                                 this,
                                                  "Sidebar","universal");
 
     KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p);
     if (be) {
-	connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
-                        this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
-	connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-                        this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+	connect(be,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+                        this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+	connect(be,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+                        this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
 
     }
 
@@ -74,7 +74,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
     m_resizeHandle->setFrameShadow(TQFrame::Raised);
     m_resizeHandle->setFixedWidth(6);
     m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor));
-    connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool)));
+    connect(p->widget(),TQ_SIGNAL(panelHasBeenExpanded(bool)),this,TQ_SLOT(needLayoutUpdate(bool)));
     needLayoutUpdate(false);
     m_resizeHandle->installEventFilter(this);
     m_resizeHandle->setMouseTracking(true);
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index dbb6c4195..4e6740f8a 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <krootpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "global.h"
 #include "kickerSettings.h"
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile )
+    TDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile )
     {
         TDEGlobal::locale()->insertCatalogue( "taskbarextension" );
    	return new TaskBarExtension( configFile, KPanelExtension::Stretch,
@@ -63,17 +63,17 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type,
     positionChange(position());
     layout->addWidget(m_container);
 
-    connect(m_container, TQT_SIGNAL(containerCountChanged()),
-            TQT_SIGNAL(updateLayout()));
+    connect(m_container, TQ_SIGNAL(containerCountChanged()),
+            TQ_SIGNAL(updateLayout()));
 
-    kapp->dcopClient()->setNotifications(true);
+    tdeApp->dcopClient()->setNotifications(true);
     connectDCOPSignal("kicker", "kicker", "configurationChanged()",
                       "configure()", false);
 
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-            TQT_SLOT(setBackgroundTheme()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            TQ_SLOT(setBackgroundTheme()));
 
-    TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme()));
+    TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme()));
 }
 
 TaskBarExtension::~TaskBarExtension()
@@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme()
         {
             m_rootPixmap = new KRootPixmap(this);
             m_rootPixmap->setCustomPainting(true);
-            connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)),
-                    TQT_SLOT(updateBackground(const TQPixmap&)));
+            connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)),
+                    TQ_SLOT(updateBackground(const TQPixmap&)));
         }
         else
         {
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index 71f2d0504..7ab5de6de 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -66,7 +66,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path )
     setPopup(topMenu);
 
     _menuTimer = new TQTimer( this, "_menuTimer" );
-    connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) );
+    connect( _menuTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedPopup()) );
 
     TQToolTip::add(this, i18n("Browse: %1").arg(path));
     setTitle( path );
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index fe70954f9..b548579f6 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -45,8 +45,8 @@ DesktopButton::DesktopButton( TQWidget* parent )
     setTitle(i18n("Desktop Access"));
     setIcon("desktop");
 
-    connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) );
-    connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
+    connect( this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showDesktop(bool)) );
+    connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );
 
     setOn( ShowDesktop::the()->desktopShowing() );
 }
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index adbef9dfc..1e5c2a7f8 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -29,11 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqpainter.h>
 #include <tqcursor.h>
-#include <tqeffects_p.h>
+#include <private/tqeffects_p.h>
 
 #include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -100,7 +100,7 @@ void KNewButton::show()
      KButton::show();
 
      if (KickerSettings::firstRun()) {
-         TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu()));
+         TQTimer::singleShot(0,this,TQ_SLOT(slotExecMenu()));
          KickerSettings::setFirstRun(false);
          KickerSettings::writeConfig();
      }
diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp
index 4f88f2d37..eb4d1396d 100644
--- a/kicker/kicker/buttons/nontdeappbutton.cpp
+++ b/kicker/kicker/buttons/nontdeappbutton.cpp
@@ -25,11 +25,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqdragobject.h>
 
 #include <tdeconfig.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeapplication.h>
 #include <tdeglobal.h>
 #include <krun.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <kiconeffect.h>
@@ -61,7 +61,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name,
     // to the slotExec() slot
     // we do this here instead of in initialize(...) since initialize(...) may
     // get called later, e.g after reconfiguring it
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
 }
 
 // this constructor is used when restoring a button, usually at startup
@@ -77,7 +77,7 @@ NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent
                config.readBoolEntry("RunInTerminal"));
 
     // see comment on connect in above constructor
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
 }
 
 void NonKDEAppButton::initialize(const TQString& name,
@@ -174,11 +174,11 @@ void NonKDEAppButton::dropEvent(TQDropEvent *ev)
              ++it)
         {
             const KURL &url(*it);
-            if (KDesktopFile::isDesktopFile(url.path()))
+            if (TDEDesktopFile::isDesktopFile(url.path()))
             {
                 // this URL is actually a .desktop file, so let's grab
                 // the URL it actually points to ...
-                KDesktopFile deskFile(url.path());
+                TDEDesktopFile deskFile(url.path());
                 deskFile.setDesktopGroup();
 
                 // ... and add it to the exec string
@@ -216,7 +216,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr)
     // since kicker doesn't listen to or use the session manager, we have
     // to make sure that our environment is set up correctly. this is
     // accomlplished by doing:
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     if (term)
     {
@@ -278,8 +278,8 @@ void NonKDEAppButton::properties()
 
     // ... connect the signal it emits when it has data for us to save
     // to our updateSettings slot (see above) ...
-    connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this,
-            TQT_SLOT(updateSettings(PanelExeDialog*)));
+    connect(dlg, TQ_SIGNAL(updateSettings(PanelExeDialog*)), this,
+            TQ_SLOT(updateSettings(PanelExeDialog*)));
 
     // ... and then show it to the user
     dlg->show();
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index 716a750ed..2c392d29e 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqdragobject.h>
 #include <tqtooltip.h>
 
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdelocale.h>
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kpropertiesdialog.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 
 #include "global.h"
@@ -92,7 +92,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
        _id = locate("appdata", id.mid(1));
        if (!_id.isEmpty())
        {
-          KDesktopFile df(_id, true);
+          TDEDesktopFile df(_id, true);
           _service = new KService(&df);
        }
     }
@@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
 void ServiceButton::initialize()
 {
     readDesktopFile();
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
 }
 
 void ServiceButton::readDesktopFile()
@@ -169,7 +169,7 @@ void ServiceButton::dropEvent( TQDropEvent* ev )
 {
     KURL::List uriList;
     if( KURLDrag::decode( ev, uriList ) && _service ) {
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         KRun::run( *_service, uriList );
     }
     PanelButton::dropEvent(ev);
@@ -192,7 +192,7 @@ void ServiceButton::slotExec()
 {
     // this allows the button to return to a non-pressed state
     // before launching
-    TQTimer::singleShot(0, this, TQT_SLOT(performExec()));
+    TQTimer::singleShot(0, this, TQ_SLOT(performExec()));
 }
 
 void ServiceButton::performExec()
@@ -200,7 +200,7 @@ void ServiceButton::performExec()
     if (!_service) return;
 
     KURL::List uriList;
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     KRun::run( *_service, uriList );
 }
 
@@ -223,10 +223,10 @@ void ServiceButton::properties()
     KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0,
                                                       false, false);
     dialog->setFileNameReadOnly(true);
-    connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)),
-            this, TQT_SLOT(slotSaveAs(const KURL &, KURL &)));
-    connect(dialog, TQT_SIGNAL(propertiesClosed()),
-            this, TQT_SLOT(slotUpdate()));
+    connect(dialog, TQ_SIGNAL(saveAs(const KURL &, KURL &)),
+            this, TQ_SLOT(slotSaveAs(const KURL &, KURL &)));
+    connect(dialog, TQ_SIGNAL(propertiesClosed()),
+            this, TQ_SLOT(slotUpdate()));
     dialog->show();
 }
 
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 13ff95323..afdf90fa9 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqfile.h>
 
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdefileitem.h>
 #include <konq_operations.h>
 #include <kicontheme.h>
@@ -71,7 +71,7 @@ void URLButton::initialize( const TQString& _url )
     if (!url.isLocalFile() || !url.path().endsWith(".desktop"))
     {
        TQString file = KickerLib::newDesktopFile(url);
-       KDesktopFile df(file);
+       TDEDesktopFile df(file);
        df.writeEntry("Encoding", "UTF-8");
        df.writeEntry("Type","Link");
        df.writeEntry("Name", url.prettyURL());
@@ -90,7 +90,7 @@ void URLButton::initialize( const TQString& _url )
     }
     fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url );
     setIcon( fileItem->iconName() );
-    connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) );
+    connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()) );
     setToolTip();
 
     if (url.isLocalFile())
@@ -107,9 +107,9 @@ void URLButton::saveConfig( TDEConfigGroup& config ) const
 void URLButton::setToolTip()
 {
     if (fileItem->isLocalFile()
-        && KDesktopFile::isDesktopFile(fileItem->url().path()))
+        && TDEDesktopFile::isDesktopFile(fileItem->url().path()))
     {
-        KDesktopFile df(fileItem->url().path());
+        TDEDesktopFile df(fileItem->url().path());
 
         if (df.readComment().isEmpty())
         {
@@ -140,12 +140,12 @@ void URLButton::dragEnterEvent(TQDragEnterEvent *ev)
 
 void URLButton::dropEvent(TQDropEvent *ev)
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     KURL::List execList;
     if(KURLDrag::decode(ev, execList)){
         KURL url( fileItem->url() );
         if(!execList.isEmpty())  {
-             if (KDesktopFile::isDesktopFile(url.path())){
+             if (TDEDesktopFile::isDesktopFile(url.path())){
                 TDEApplication::startServiceByDesktopPath(url.path(), execList.toStringList(),
                                                         0, 0, 0, "", true);
              }
@@ -165,7 +165,7 @@ void URLButton::startDrag()
 
 void URLButton::slotExec()
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     fileItem->run();
 }
 
@@ -196,6 +196,6 @@ void URLButton::properties()
 
     pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself
     pDlg->setFileNameReadOnly(true);
-    connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL()));
+    connect(pDlg, TQ_SIGNAL(applied()), TQ_SLOT(updateURL()));
     pDlg->show();
 }
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 77c64832d..6299a6650 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -58,14 +58,14 @@ AppletHandle::AppletHandle(AppletContainer* parent)
     m_dragBar->installEventFilter(this);
     m_layout->addWidget(m_dragBar);
 
-    if (kapp->authorizeTDEAction("kicker_rmb"))
+    if (tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         m_menuButton = new AppletHandleButton( this );
         m_menuButton->installEventFilter(this);
         m_layout->addWidget(m_menuButton);
 
-        connect(m_menuButton, TQT_SIGNAL(pressed()),
-                this, TQT_SLOT(menuButtonPressed()));
+        connect(m_menuButton, TQ_SIGNAL(pressed()),
+                this, TQ_SLOT(menuButtonPressed()));
         TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name()));
     }
 
@@ -151,8 +151,8 @@ void AppletHandle::setFadeOutHandle(bool fadeOut)
         if (!m_handleHoverTimer)
         {
             m_handleHoverTimer = new TQTimer(this, "m_handleHoverTimer");
-            connect(m_handleHoverTimer, TQT_SIGNAL(timeout()),
-                    this, TQT_SLOT(checkHandleHover()));
+            connect(m_handleHoverTimer, TQ_SIGNAL(timeout()),
+                    this, TQ_SLOT(checkHandleHover()));
             m_applet->installEventFilter(this);
         }
     }
@@ -252,7 +252,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
 void AppletHandle::menuButtonPressed()
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 81f2139c5..5ba59dfbc 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -39,8 +39,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdemessagebox.h>
 #include <kpanelapplet.h>
 #include <tdepopupmenu.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 
 #include "applethandle.h"
 #include "appletinfo.h"
@@ -92,10 +92,10 @@ AppletContainer::AppletContainer(const AppletInfo& info,
 
     _layout->addSpacing(APPLET_MARGIN);
     _handle = new AppletHandle(this);
-    _layout->addWidget(TQT_TQWIDGET(_handle), 0);
-    connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)),
-            this, TQT_SLOT(moveApplet(const TQPoint&)));
-    connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu()));
+    _layout->addWidget(_handle, 0);
+    connect(_handle, TQ_SIGNAL(moveApplet(const TQPoint&)),
+            this, TQ_SLOT(moveApplet(const TQPoint&)));
+    connect(_handle, TQ_SIGNAL(showAppletMenu()), this, TQ_SLOT(showAppletMenu()));
 
     _layout->addWidget(_appletframe, 1);
     _layout->activate();
@@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info,
 
     setImmutable(immutable);
 
-    connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
-    connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow()));
-    connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool)));
+    connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
+    connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(activateWindow()));
+    connect(_applet, TQ_SIGNAL(requestFocus(bool)), TQ_SLOT(focusRequested(bool)));
 
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            this, TQT_SLOT(slotReconfigure()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            this, TQ_SLOT(slotReconfigure()));
 }
 
 void AppletContainer::configure()
@@ -139,7 +139,7 @@ void AppletContainer::configure()
 
     if (isImmutable() ||
         KickerSettings::hideAppletHandles() ||
-        !kapp->authorizeTDEAction("kicker_rmb"))
+        !tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         if (_handle->isVisibleTo(this))
         {
@@ -216,7 +216,7 @@ void AppletContainer::signalToBeRemoved()
 
 void AppletContainer::showAppletMenu()
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
@@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu()
 
     Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center()));
 
-    switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle))))
+    switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle)))
     {
         case PanelAppletOpMenu::Move:
             moveApplet(_handle->mapToParent(_handle->rect().center()));
@@ -321,8 +321,8 @@ TQPopupMenu* AppletContainer::createOpMenu()
                                                _info.name(), _info.icon(),
                                                this);
 
-    connect(opMenu, TQT_SIGNAL(escapePressed()),
-            _handle, TQT_SLOT(toggleMenuButtonOff()));
+    connect(opMenu, TQ_SIGNAL(escapePressed()),
+            _handle, TQ_SLOT(toggleMenuButtonOff()));
 
     return opMenu;
 }
@@ -461,7 +461,7 @@ void AppletContainer::setImmutable(bool immutable)
     BaseContainer::setImmutable(immutable);
     if (isImmutable() ||
         KickerSettings::hideAppletHandles() ||
-        !kapp->authorizeTDEAction("kicker_rmb"))
+        !tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         if (_handle->isVisibleTo(this))
         {
@@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable)
     }
     else if (!_handle->isVisibleTo(this))
     {
-        TQToolTip::add(TQT_TQWIDGET(_handle), _info.name());
+        TQToolTip::add(_handle, _info.name());
         _handle->show();
         setBackground();
     }
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index da1a5e4c2..c35f54606 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -161,13 +161,13 @@ void ButtonContainer::embedButton(PanelButton* b)
     }
     _layout = vbox;
 
-    connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave()));
-    connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool)));
-    connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested()));
-    connect(_button, TQT_SIGNAL(dragme(const TQPixmap)),
-            TQT_SLOT(dragButton(const TQPixmap)));
-    connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)),
-            TQT_SLOT(dragButton(const KURL::List, const TQPixmap)));
+    connect(_button, TQ_SIGNAL(requestSave()), TQ_SIGNAL(requestSave()));
+    connect(_button, TQ_SIGNAL(hideme(bool)), TQ_SLOT(hideRequested(bool)));
+    connect(_button, TQ_SIGNAL(removeme()), TQ_SLOT(removeRequested()));
+    connect(_button, TQ_SIGNAL(dragme(const TQPixmap)),
+            TQ_SLOT(dragButton(const TQPixmap)));
+    connect(_button, TQ_SIGNAL(dragme(const KURL::List, const TQPixmap)),
+            TQ_SLOT(dragButton(const KURL::List, const TQPixmap)));
 }
 
 TQPopupMenu* ButtonContainer::createOpMenu()
@@ -254,15 +254,15 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 
         case TQt::RightButton:
         {
-            if (!kapp->authorizeTDEAction("kicker_rmb") ||
+            if (!tdeApp->authorizeTDEAction("kicker_rmb") ||
                 isImmutable())
             {
                 break;
             }
 
             TQPopupMenu* menu = opMenu();
-            connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
-            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this),
+            connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) );
+            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
                                                   (orientation() == TQt::Horizontal) ?
                                                    TQPoint(0, 0) : me->pos());
 
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index dff2836e9..a58b006ee 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -40,10 +40,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeglobal.h>
 #include <kicker.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <tdelocale.h>
 #include <tdeglobalsettings.h>
@@ -137,20 +137,20 @@ void ExtensionContainer::init()
     KWin::setState(winId(), NET::Sticky);
     KWin::setOnAllDesktops(winId(), true);
 
-    connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged()));
-    connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-            this, TQT_SLOT( currentDesktopChanged(int)));
+    connect(Kicker::the()->twinModule(), TQ_SIGNAL(strutChanged()), this, TQ_SLOT(strutChanged()));
+    connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+            this, TQ_SLOT( currentDesktopChanged(int)));
 
     setBackgroundOrigin(AncestorOrigin);
     setFrameStyle(NoFrame);
     setLineWidth(0);
     setMargin(0);
 
-    connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)),
-            this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int)));
+    connect(UnhideTrigger::the(), TQ_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)),
+            this, TQ_SLOT(unhideTriggered(UnhideTrigger::Trigger,int)));
 
-    _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) );
-    connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer()));
+    _popupWidgetFilter = new PopupWidgetFilter( this );
+    connect(_popupWidgetFilter, TQ_SIGNAL(popupWidgetHiding()), TQ_SLOT(maybeStartAutoHideTimer()));
 
     // layout
     _layout = new TQGridLayout(this, 3, 3, 0, 0);
@@ -160,15 +160,15 @@ void ExtensionContainer::init()
 
     // instantiate the autohide timer
     _autohideTimer = new TQTimer(this, "_autohideTimer");
-    connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout()));
+    connect(_autohideTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoHideTimeout()));
 
     // instantiate the updateLayout event compressor timer
     _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer");
-    connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout()));
+    connect(_updateLayoutTimer, TQ_SIGNAL(timeout()), TQ_SLOT(actuallyUpdateLayout()));
 
     installEventFilter(this); // for mouse event handling
 
-    connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor()));
+    connect(Kicker::the(), TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(updateHighlightColor()));
     updateHighlightColor();
 
     // if we were hidden when kicker quit, let's start out hidden as well!
@@ -207,9 +207,9 @@ void ExtensionContainer::init()
             item->setDefaultValue(m_extension->customSize());
         }
 
-        connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout()));
-        connect(m_extension, TQT_SIGNAL(maintainFocus(bool)),
-                TQT_SLOT(maintainFocus(bool)));
+        connect(m_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(updateLayout()));
+        connect(m_extension, TQ_SIGNAL(maintainFocus(bool)),
+                TQ_SLOT(maintainFocus(bool)));
 
         _layout->addWidget(m_extension, 1, 1);
     }
@@ -371,7 +371,7 @@ void ExtensionContainer::writeConfig()
 
 void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
     {
         return;
     }
@@ -387,7 +387,7 @@ void ExtensionContainer::showPanelMenu( const TQPoint& globalPos )
 
     if (!_opMnu)
     {
-        KDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile()));
+        TDEDesktopFile f(TDEGlobal::dirs()->findResource("extensions", _info.desktopFile()));
         _opMnu = new PanelExtensionOpMenu(f.readName(),
                                           m_extension ? m_extension->actions() : 0,
                                           this);
@@ -484,7 +484,7 @@ void ExtensionContainer::moveMe()
 
     if (screen < 0)
     {
-        screen = kapp->desktop()->screenNumber(this);
+        screen = tdeApp->desktop()->screenNumber(this);
     }
 
     if (screen < 0)
@@ -733,7 +733,7 @@ void ExtensionContainer::autoHideTimeout()
 {
 //    kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl;
     // Hack: If there is a popup open, don't autohide until it closes.
-    TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget());
+    TQWidget* popup = TQApplication::activePopupWidget();
     if (popup)
     {
 
@@ -885,7 +885,7 @@ void ExtensionContainer::autoHide(bool hide)
 
     _in_autohide = false;
 
-    TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
+    TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects()));
 }
 
 void ExtensionContainer::animatedHide(bool left)
@@ -925,7 +925,7 @@ void ExtensionContainer::animatedHide(bool left)
                 !TQApplication::desktop()->screenGeometry(s).intersects(geometry()))
             {
                 blockUserInput(false);
-                TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
+                TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects()));
                 return;
             }
         }
@@ -988,7 +988,7 @@ void ExtensionContainer::animatedHide(bool left)
     config->setGroup(extensionId());
     config->writeEntry("UserHidden", userHidden());
 
-    TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
+    TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects()));
 }
 
 bool ExtensionContainer::reserveStrut() const
@@ -1260,7 +1260,7 @@ int ExtensionContainer::arrangeHideButtons()
             _ltHB->setMaximumHeight(maxHeight);
             _ltHB->setMaximumWidth(14);
             _layout->remove(_ltHB);
-            if (kapp->reverseLayout())
+            if (tdeApp->reverseLayout())
             {
                 _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
             }
@@ -1275,7 +1275,7 @@ int ExtensionContainer::arrangeHideButtons()
             _rbHB->setMaximumHeight(maxHeight);
             _rbHB->setMaximumWidth(14);
             _layout->remove(_rbHB);
-            if (kapp->reverseLayout())
+            if (tdeApp->reverseLayout())
             {
                 _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
             }
@@ -1486,7 +1486,7 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS)
     {
         autoHide(false);
         TQTimer::singleShot(showForAtLeastHowManyMS,
-                           this, TQT_SLOT(maybeStartAutoHideTimer()));
+                           this, TQ_SLOT(maybeStartAutoHideTimer()));
         return;
     }
 
@@ -1627,7 +1627,7 @@ void ExtensionContainer::resetLayout()
             _ltHB = new HideButton(this);
             _ltHB->installEventFilter(this);
             _ltHB->setEnabled(true);
-            connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft()));
+            connect(_ltHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideLeft()));
             haveToArrangeButtons = true;
         }
 
@@ -1658,7 +1658,7 @@ void ExtensionContainer::resetLayout()
             _rbHB = new HideButton(this);
             _rbHB->installEventFilter(this);
             _rbHB->setEnabled(true);
-            connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight()));
+            connect(_rbHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideRight()));
             haveToArrangeButtons = true;
         }
 
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index f0e6ca422..cb61b16e8 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tdeapplication.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <krootpixmap.h>
 #include <kpixmap.h>
 #include <tdelocale.h>
@@ -103,11 +103,11 @@ ContainerArea::ContainerArea(TDEConfig* _c,
 
     setBackground();
 
-    connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll()));
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground()));
-    connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)),
-            TQT_SLOT(immutabilityChanged(bool)));
-    connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));
+    connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground()));
+    connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)),
+            TQ_SLOT(immutabilityChanged(bool)));
+    connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground()));
 }
 
 ContainerArea::~ContainerArea()
@@ -142,7 +142,7 @@ void ContainerArea::initialize(bool useDefaultConfig)
     }
 
     setAcceptDrops(!isImmutable());
-    TQTimer::singleShot(0, this, TQT_SLOT(resizeContents()));
+    TQTimer::singleShot(0, this, TQ_SLOT(resizeContents()));
 }
 
 void ContainerArea::defaultContainerConfig()
@@ -325,7 +325,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
             a = new DesktopButtonContainer(group, m_opMenu, m_contents);
         else if (appletType == "WindowListButton")
             a = new WindowListButtonContainer(group, m_opMenu, m_contents);
-        else if ((appletType == "BookmarksButton") && kapp->authorizeTDEAction("bookmarks"))
+        else if ((appletType == "BookmarksButton") && tdeApp->authorizeTDEAction("bookmarks"))
             a = new BookmarksButtonContainer(group, m_opMenu, m_contents);
         else if (appletType == "ServiceButton")
             a = new ServiceButtonContainer(group, m_opMenu, m_contents);
@@ -377,7 +377,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
     // it gets executed too soon. we need to wait until the containers are
     // actually resized, but we enter the event loop prior to that happening
     // above.
-    TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
+    TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground()));
 }
 
 void ContainerArea::saveContainerConfig(bool layoutOnly)
@@ -438,7 +438,7 @@ const TQWidget* ContainerArea::addButton(const AppletInfo& info)
 
     if (buttonType == "BookmarksButton")
     {
-        if (kapp->authorizeTDEAction("bookmarks"))
+        if (tdeApp->authorizeTDEAction("bookmarks"))
         {
             return addBookmarksButton();
         }
@@ -728,20 +728,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index)
         m_layout->add(a);
     }
 
-    connect(a, TQT_SIGNAL(moveme(BaseContainer*)),
-            TQT_SLOT(startContainerMove(BaseContainer*)));
-    connect(a, TQT_SIGNAL(removeme(BaseContainer*)),
-            TQT_SLOT(removeContainer(BaseContainer*)));
-    connect(a, TQT_SIGNAL(takeme(BaseContainer*)),
-            TQT_SLOT(takeContainer(BaseContainer*)));
-    connect(a, TQT_SIGNAL(requestSave()),
-            TQT_SLOT(slotSaveContainerConfig()));
-    connect(a, TQT_SIGNAL(maintainFocus(bool)),
-            this, TQT_SIGNAL(maintainFocus(bool)));
+    connect(a, TQ_SIGNAL(moveme(BaseContainer*)),
+            TQ_SLOT(startContainerMove(BaseContainer*)));
+    connect(a, TQ_SIGNAL(removeme(BaseContainer*)),
+            TQ_SLOT(removeContainer(BaseContainer*)));
+    connect(a, TQ_SIGNAL(takeme(BaseContainer*)),
+            TQ_SLOT(takeContainer(BaseContainer*)));
+    connect(a, TQ_SIGNAL(requestSave()),
+            TQ_SLOT(slotSaveContainerConfig()));
+    connect(a, TQ_SIGNAL(maintainFocus(bool)),
+            this, TQ_SIGNAL(maintainFocus(bool)));
 
     if (dynamic_cast<AppletContainer*>(a))
     {
-        connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents()));
+        connect(a, TQ_SIGNAL(updateLayout()), TQ_SLOT(resizeContents()));
     }
 
     a->configure(orientation(), popupDirection());
@@ -824,16 +824,16 @@ void ContainerArea::takeContainer(BaseContainer* a)
         return;
     }
 
-    disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)),
-               this, TQT_SLOT(startContainerMove(BaseContainer*)));
-    disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)),
-               this, TQT_SLOT(removeContainer(BaseContainer*)));
-    disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)),
-               this, TQT_SLOT(takeContainer(BaseContainer*)));
-    disconnect(a, TQT_SIGNAL(requestSave()),
-               this, TQT_SLOT(slotSaveContainerConfig()));
-    disconnect(a, TQT_SIGNAL(maintainFocus(bool)),
-               this, TQT_SIGNAL(maintainFocus(bool)));
+    disconnect(a, TQ_SIGNAL(moveme(BaseContainer*)),
+               this, TQ_SLOT(startContainerMove(BaseContainer*)));
+    disconnect(a, TQ_SIGNAL(removeme(BaseContainer*)),
+               this, TQ_SLOT(removeContainer(BaseContainer*)));
+    disconnect(a, TQ_SIGNAL(takeme(BaseContainer*)),
+               this, TQ_SLOT(takeContainer(BaseContainer*)));
+    disconnect(a, TQ_SIGNAL(requestSave()),
+               this, TQ_SLOT(slotSaveContainerConfig()));
+    disconnect(a, TQ_SIGNAL(maintainFocus(bool)),
+               this, TQ_SIGNAL(maintainFocus(bool)));
 
     // Just remove the group from our own config file. Leave separate config
     // files untouched.
@@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         saveContainerConfig(true);
 
         PanelDrag *dd = new PanelDrag(_moveAC, this);
-        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
+        dd->setPixmap(tdeApp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
         grabKeyboard();
         dd->drag();
         releaseKeyboard();
@@ -1322,7 +1322,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
             {
                 // a local desktop file being dragged from an external program.
                 // Make a copy first.
-                KDesktopFile df(url.path());
+                TDEDesktopFile df(url.path());
                 KURL newUrl;
                 newUrl.setPath(KickerLib::copyDesktopFile(url));
                 if (df.readType() == "Link")
@@ -1436,8 +1436,8 @@ void ContainerArea::setBackground()
         {
             _rootPixmap = new KRootPixmap(this);
             _rootPixmap->setCustomPainting(true);
-            connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)),
-                    TQT_SLOT(updateBackground(const TQPixmap&)));
+            connect(_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)),
+                    TQ_SLOT(updateBackground(const TQPixmap&)));
         }
         else
         {
@@ -1446,12 +1446,7 @@ void ContainerArea::setBackground()
 
         double tint = double(KickerSettings::tintValue()) / 100;
         _rootPixmap->setFadeEffect(tint, KickerSettings::tintColor());
-        if (KickerSettings::menubarPanelBlurred()) {
-            _rootPixmap->setBlurEffect(0.0, 4.0);
-        }
-        else {
-            _rootPixmap->setBlurEffect(0.0, 0.0);
-        }
+        _rootPixmap->setBlurEffect(0.0, KickerSettings::blurValue());
         _rootPixmap->start();
         _bgSet = true;
         return;
@@ -1516,7 +1511,7 @@ void ContainerArea::setBackground()
                 KickerLib::colorize(bgImage);
             }
             setPaletteBackgroundPixmap(TQPixmap(bgImage));
-            TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
+            TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground()));
         }
     }
 
@@ -1538,7 +1533,7 @@ void ContainerArea::immutabilityChanged(bool immutable)
     }
 
     setAcceptDrops(!isImmutable());
-    TQTimer::singleShot(0, this, TQT_SLOT(setBackground()));
+    TQTimer::singleShot(0, this, TQ_SLOT(setBackground()));
 }
 
 TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
@@ -1640,7 +1635,7 @@ void ContainerArea::moveDragIndicator(int pos)
 void ContainerArea::updateBackground( const TQPixmap& pm )
 {
     TQBrush bgBrush(colorGroup().background(), pm);
-    TQPalette pal = kapp->palette();
+    TQPalette pal = tdeApp->palette();
     pal.setBrush(TQColorGroup::Background, bgBrush);
     setPalette(pal);
 
@@ -1663,7 +1658,7 @@ void ContainerArea::resizeContents(int w, int h)
     if (!m_updateBackgroundsCalled)
     {
         m_updateBackgroundsCalled = true;
-        TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
+        TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground()));
     }
 }
 
@@ -1793,7 +1788,7 @@ void ContainerArea::updateContainersBackground()
         if( !m_cachedGeometry.contains( *it ))
         {
             m_cachedGeometry[ *it ] = TQRect();
-            connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry()));
+            connect( *it, TQ_SIGNAL( destroyed()), TQ_SLOT( destroyCachedGeometry()));
         }
         if( m_cachedGeometry[ *it ] != (*it)->geometry())
         {
@@ -1910,7 +1905,7 @@ void ContainerArea::showAddAppletDialog()
     if (!m_addAppletDialog)
     {
         m_addAppletDialog = new AddAppletDialog(this, this, 0);
-        connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone()));
+        connect(m_addAppletDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(addAppletDialogDone()));
     }
     else
     {
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 796b98125..bf22f3b70 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <tdemenubar.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twinmodule.h>
 #include <dcopref.h>
 
@@ -111,7 +111,7 @@ void ExtensionManager::initialize()
         m_mainPanel = pm->createExtensionContainer(
                             "childpanelextension.desktop",
                             true,
-                            TQString(kapp->aboutData()->appName()) + "rc",
+                            TQString(tdeApp->aboutData()->appName()) + "rc",
                             "Main Panel");
     }
 
@@ -129,7 +129,7 @@ void ExtensionManager::initialize()
 
     m_mainPanel->readConfig();
     m_mainPanel->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // read extension list
     config->setGroup("General");
@@ -173,13 +173,13 @@ void ExtensionManager::initialize()
             addContainer(e);
             e->readConfig();
             e->show();
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }
     m_loadingContainers = false;
 
     pm->clearUntrustedLists();
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), TQ_SLOT(configurationChanged()));
     DCOPRef r( "ksmserver", "ksmserver" );
     r.send( "resumeStartup", TQCString( "kicker" ));
 }
@@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit)
         updateMenubar();
 
         m_menubarPanel->show();
-        connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar()));
+        connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar()));
     }
     else if (m_menubarPanel)
     {
@@ -437,8 +437,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e)
 
     _containers.append(e);
 
-    connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)),
-            this, TQT_SLOT(removeContainer(ExtensionContainer*)));
+    connect(e, TQ_SIGNAL(removeme(ExtensionContainer*)),
+            this, TQ_SLOT(removeContainer(ExtensionContainer*)));
 
     if (!m_loadingContainers) {
         emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()),
@@ -692,7 +692,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer*
     }
 
     TQRect workArea;
-    if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2))
+    if ((XineramaScreen == XineramaAllScreens) || (tdeApp->desktop()->numScreens() < 2))
     {
          /* special value for all screens */
          workArea = Kicker::the()->twinModule()->workArea(list);
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 94517607e..21ff97684 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -32,16 +32,16 @@
 #include <tdeconfig.h>
 #include <tdecmdlineargs.h>
 #include <kcmultidialog.h>
-#include <kcrash.h>
+#include <tdecrash.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <tdeglobal.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <twinmodule.h>
 
@@ -59,10 +59,10 @@
 
 #include "kicker.moc"
 
-Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); }
+Kicker* Kicker::the() { return static_cast<Kicker*>(tdeApp); }
 
 Kicker::Kicker()
-    : KUniqueApplication(),
+    : TDEUniqueApplication(),
       keys(0),
       m_twinModule(0),
       m_configDialog(0),
@@ -77,7 +77,7 @@ Kicker::Kicker()
         // this means we've most likely crashed once. so let's see if we
         // stay up for more than 2 minutes time, and if so reset the
         // crash handler since the crash isn't a frequent offender
-        TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler()));
+        TQTimer::singleShot(120000, this, TQ_SLOT(setCrashHandler()));
     }
     else
     {
@@ -88,7 +88,7 @@ Kicker::Kicker()
     }
 
     // Make kicker immutable if configuration modules have been marked immutable
-    if (isKioskImmutable() && kapp->authorizeControlModules(Kicker::configModules(true)).isEmpty())
+    if (isKioskImmutable() && tdeApp->authorizeControlModules(Kicker::configModules(true)).isEmpty())
     {
         config()->setReadOnly(true);
         config()->reparseConfiguration();
@@ -116,7 +116,7 @@ Kicker::Kicker()
 
     // initialize our keys
     // note that this creates the KMenu by calling MenuManager::the()
-    keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+    keys = new TDEGlobalAccel( this );
 #define KICKER_ALL_BINDINGS
 #include "kickerbindings.cpp"
     keys->readSettings();
@@ -125,19 +125,19 @@ Kicker::Kicker()
     // set up our global settings
     configure();
 
-    connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
-    connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
+    connect(this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(this, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
+    connect(this, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged()));
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-    connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized()));
+    connect(desktop(), TQ_SIGNAL(resized(int)), TQ_SLOT(slotDesktopResized()));
 #endif
 
     // the panels, aka extensions
-    TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize()));
+    TQTimer::singleShot(0, ExtensionManager::the(), TQ_SLOT(initialize()));
 
-    connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)),
-            this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int)));
+    connect(ExtensionManager::the(), TQ_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)),
+            this, TQ_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int)));
 }
 
 Kicker::~Kicker()
@@ -258,7 +258,7 @@ void Kicker::quit()
 void Kicker::restart()
 {
     // do this on a timer to give us time to return true
-    TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotRestart()));
 }
 
 void Kicker::slotRestart()
@@ -352,7 +352,7 @@ void Kicker::showConfig(const TQString& configPath, const TQString& configFile,
             moduleNumber++;
          }
 
-         connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished()));
+         connect(m_configDialog, TQ_SIGNAL(finished()), TQ_SLOT(configDialogFinished()));
     }
 
     if (!configPath.isEmpty())
@@ -413,7 +413,7 @@ void Kicker::configDialogFinished()
     if (m_reloadingConfigDialog) {
         TQByteArray data;
         m_reloadingConfigDialog = false;
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
     }
 }
 
diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h
index 1868c0bbe..5a76570a5 100644
--- a/kicker/kicker/core/kicker.h
+++ b/kicker/kicker/core/kicker.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqcolor.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <kicontheme.h>
 
 class KCMultiDialog;
@@ -36,7 +36,7 @@ class KWinModule;
 class PanelKMenu;
 class PanelPopupButton;
 
-class Kicker : public KUniqueApplication
+class Kicker : public TDEUniqueApplication
 {
     TQ_OBJECT
     K_DCOP
diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp
index b8d774fdb..e8999a22d 100644
--- a/kicker/kicker/core/kickerbindings.cpp
+++ b/kicker/kicker/core/kickerbindings.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, target, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, target, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, target, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 23cefb044..02941c127 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -54,7 +54,7 @@ static void sighandler(int)
     TQApplication::exit();
 }
 
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
 {
     {
         TQCString multiHead = getenv("TDE_MULTIHEAD");
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index a7326844e..4e4de2f56 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -70,9 +70,9 @@ MenuManager::MenuManager(TQObject *parent)
     else
 	m_kmenu = new KMenuStub(new KMenu);
 
-    kapp->dcopClient()->setNotifications(true);
-    connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-            this, TQT_SLOT(applicationRemoved(const TQCString&)));
+    tdeApp->dcopClient()->setNotifications(true);
+    connect(tdeApp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+            this, TQ_SLOT(applicationRemoved(const TQCString&)));
 }
 
 MenuManager::~MenuManager()
@@ -164,7 +164,7 @@ void MenuManager::kmenuAccelActivated()
         // the item under the cursor gets selected. The single shot
         // avoids this from happening by allowing the item to be selected
         // when the event loop is enterred, and then resetting it.
-        TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotSetKMenuItemActive()));
     }
     else
     {
@@ -210,7 +210,7 @@ TQCString MenuManager::createMenu(TQPixmap icon, TQString text)
     p->text = text;
     p->icon = icon;
     p->idInParentMenu = m_kmenu->insertClientMenu( p );
-    p->createdBy = kapp->dcopClient()->senderId();
+    p->createdBy = tdeApp->dcopClient()->senderId();
     m_kmenu->adjustSize();
     return name;
 }
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 9e8d7130a..b3160aed5 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -71,7 +71,7 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con
 
     // container area
     _containerArea = new ContainerArea( config(), this, opMenu() );
-    connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool)));
+    connect(_containerArea, TQ_SIGNAL(maintainFocus(bool)), this, TQ_SIGNAL(maintainFocus(bool)));
     _layout->addWidget(_containerArea);
 
     _containerArea->viewport()->installEventFilter(this);
@@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con
     // beginning.
     positionChange(position());
 
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            TQT_SLOT(configurationChanged()));
-    connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)),
-            TQT_SLOT(immutabilityChanged(bool)));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            TQ_SLOT(configurationChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)),
+            TQ_SLOT(immutabilityChanged(bool)));
 
     // we wait to get back to the event loop to start up the container area so that
     // the main panel in ExtensionManager will be assigned and we can tell in a
     // relatively non-hackish way that we are (or aren't) the "main panel"
-    TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea()));
+    TQTimer::singleShot(0, this, TQ_SLOT(populateContainerArea()));
 }
 
 PanelExtension::~PanelExtension()
@@ -129,7 +129,7 @@ TQPopupMenu* PanelExtension::opMenu()
     }
 
     _opMnu = new TQPopupMenu(this);
-    connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu()));
+    connect(_opMnu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBuildOpMenu()));
 
     return _opMnu;
 }
@@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e)
     if ( e->type() == TQEvent::MouseButtonPress )
     {
         TQMouseEvent* me = (TQMouseEvent*) e;
-        if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb"))
+        if ( me->button() == TQt::RightButton && tdeApp->authorize("action/kicker_rmb"))
         {
             Kicker::the()->setInsertionPoint(me->globalPos());
             opMenu()->exec(me->globalPos());
@@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu()
         {
             _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...")
                                          : i18n("Add &Applet to Panel..."),
-                               _containerArea, TQT_SLOT(showAddAppletDialog()));
+                               _containerArea, TQ_SLOT(showAddAppletDialog()));
             m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this);
             _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar")
                                          : i18n("Add Appli&cation to Panel"),
@@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu()
         }
 
         _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"),
-                Kicker::the(), TQT_SLOT(toggleLock()));
+                Kicker::the(), TQ_SLOT(toggleLock()));
     }
     else if (!Kicker::the()->isKioskImmutable())
     {
@@ -370,23 +370,23 @@ void PanelExtension::slotBuildOpMenu()
                                             SmallIconSet("system-lock-screen"),
                            kickerImmutable ? i18n("Un&lock Panels") :
                                              i18n("&Lock Panels"),
-                           Kicker::the(), TQT_SLOT(toggleLock()));
+                           Kicker::the(), TQ_SLOT(toggleLock()));
     }
 
     if (!isMenuBar && !Kicker::the()->isKioskImmutable())
     {
         _opMnu->insertItem(SmallIconSet("configure"),
                             i18n("&Configure Panel..."),
-                            this, TQT_SLOT(showConfig()));
+                            this, TQ_SLOT(showConfig()));
         _opMnu->insertSeparator();
     }
 
     _opMnu->insertItem(SmallIconSet("fork"),
                             i18n("&Launch Process Manager..."),
-                            this, TQT_SLOT(showProcessManager()));
+                            this, TQ_SLOT(showProcessManager()));
     _opMnu->insertSeparator();
 
-    if (kapp->authorize("action/help"))
+    if (tdeApp->authorize("action/help"))
     {
         KHelpMenu* help = new KHelpMenu( this, TDEGlobal::instance()->aboutData(), false);
         _opMnu->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), help->menu());
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index a8b79877a..bb7044aec 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klibloader.h>
 #include <kpanelapplet.h>
 #include <kpanelextension.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstaticdeleter.h>
 
 #include "appletinfo.h"
@@ -123,8 +123,8 @@ PluginManager::~PluginManager()
     AppletInfo::Dict::const_iterator it = _dict.constBegin();
     for (; it != _dict.constEnd(); ++it)
     {
-        disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)),
-                   this, TQT_SLOT(slotPluginDestroyed(TQObject*)));
+        disconnect(it.key(), TQ_SIGNAL(destroyed( TQObject*)),
+                   this, TQ_SLOT(slotPluginDestroyed(TQObject*)));
         delete it.data();
     }
 
@@ -159,9 +159,9 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info,
 
     if (applet)
     {
-        _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) );
-        connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ),
-                 TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
+        _dict.insert( applet, new AppletInfo( info ) );
+        connect( applet, TQ_SIGNAL( destroyed( TQObject* ) ),
+                 TQ_SLOT( slotPluginDestroyed( TQObject* ) ) );
     }
 
     return applet;
@@ -197,9 +197,9 @@ KPanelExtension* PluginManager::loadExtension(
     KPanelExtension* extension = init_ptr( parent, info.configFile() );
 
     if( extension ) {
-        _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) );
-        connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ),
-                 TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
+        _dict.insert( extension, new AppletInfo( info ) );
+        connect( extension, TQ_SIGNAL( destroyed( TQObject* ) ),
+                 TQ_SLOT( slotPluginDestroyed( TQObject* ) ) );
     }
 
     return extension;
@@ -360,12 +360,12 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent )
 {
     // NOTE: this doesn't work on kicker shutdown because the timer never gets
     //       fired.
-    TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( unload() ) );
 }
 
 void LibUnloader::unload( const TQString &libName )
 {
-    (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) );
+    (void)new LibUnloader( libName, tdeApp );
 }
 
 void LibUnloader::unload()
diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h
index d78d1b07a..ea7730387 100644
--- a/kicker/kicker/core/pluginmanager.h
+++ b/kicker/kicker/core/pluginmanager.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqmap.h>
 #include <tqobject.h>
 #include <tqstringlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kstaticdeleter.h>
 
 #include "appletinfo.h"
@@ -38,7 +38,7 @@ class KPanelApplet;
 class KPanelExtension;
 class TQPopupMenu;
 
-class KDE_EXPORT PluginManager : public TQObject
+class TDE_EXPORT PluginManager : public TQObject
 {
     TQ_OBJECT
 
diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp
index 4a6639574..0a1e2907c 100644
--- a/kicker/kicker/core/showdesktop.cpp
+++ b/kicker/kicker/core/showdesktop.cpp
@@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop()
     m_wmSupport = i.isSupported( NET::WM2ShowingDesktop );
     if( m_wmSupport )
     {
-        connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )),
-            TQT_SLOT( showingDesktopChanged( bool )));
+        connect( Kicker::the()->twinModule(), TQ_SIGNAL( showingDesktopChanged( bool )),
+            TQ_SLOT( showingDesktopChanged( bool )));
         showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop());
     }
 }
@@ -161,21 +161,21 @@ void ShowDesktop::showDesktop( bool b )
         }
 
         // on desktop changes or when a window is deiconified, we abort the show desktop mode
-        connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                TQT_SLOT(slotCurrentDesktopChanged(int)));
-        connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                TQT_SLOT(slotWindowAdded(WId)));
+        connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                TQ_SLOT(slotCurrentDesktopChanged(int)));
+        connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                TQ_SLOT(slotWindowAdded(WId)));
     }
     else
     {
-        disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
-                   this, TQT_SLOT(slotCurrentDesktopChanged(int)));
-        disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
-                   this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
-        disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)),
-                   this, TQT_SLOT(slotWindowAdded(WId)));
+        disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+                   this, TQ_SLOT(slotCurrentDesktopChanged(int)));
+        disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+                   this, TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+        disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)),
+                   this, TQ_SLOT(slotWindowAdded(WId)));
 
         for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
              it != m_iconifiedList.end();
diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp
index 0a5093a61..1acc182f6 100644
--- a/kicker/kicker/core/unhidetrigger.cpp
+++ b/kicker/kicker/core/unhidetrigger.cpp
@@ -40,7 +40,7 @@ UnhideTrigger::UnhideTrigger()
 	, enabledCount( 0 )
 {
 	_timer = new TQTimer( this, "UnhideTrigger" );
-	connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) );
+	connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(pollMouse()) );
 }
 
 void UnhideTrigger::setEnabled( bool enable )
diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp
index 654114d90..3119d8354 100644
--- a/kicker/kicker/core/usersizesel.cpp
+++ b/kicker/kicker/core/usersizesel.cpp
@@ -99,7 +99,7 @@ void UserSizeSel::mouseMoveEvent(TQMouseEvent * e)
 //     int screen = xineramaScreen();
 //     if (screen < 0)
 //     {
-//         screen = kapp->desktop()->screenNumber(this);
+//         screen = tdeApp->desktop()->screenNumber(this);
 //     }
 //     TQRect desktopGeom = TQApplication::desktop()->screenGeometry(screen);
     if (newSize < PANEL_MINIMUM_HEIGHT)
diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h
index fc733f207..441d71200 100644
--- a/kicker/kicker/interfaces/kickoff-search-plugin.h
+++ b/kicker/kicker/interfaces/kickoff-search-plugin.h
@@ -26,7 +26,7 @@
 #include <tqobject.h>
 #include <kurl.h>
 #include <kservice.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 typedef enum {
     ACTIONS = 0,
@@ -89,7 +89,7 @@ public:
 
 namespace KickoffSearch {
 
-    class KDE_EXPORT Plugin : public TQObject
+    class TDE_EXPORT Plugin : public TQObject
     {
         TQ_OBJECT
 
diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.cpp b/kicker/kicker/interfaces/kickoffsearchinterface.cpp
index 66b1add77..7c77cff0c 100644
--- a/kicker/kicker/interfaces/kickoffsearchinterface.cpp
+++ b/kicker/kicker/interfaces/kickoffsearchinterface.cpp
@@ -19,7 +19,7 @@
 
 #include "kickoffsearchinterface.h"
 
-KDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name )
+TDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name )
     :TQObject( parent, name )
 {
 }
diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h
index b8a866c7b..89768d8ce 100644
--- a/kicker/kicker/interfaces/kickoffsearchinterface.h
+++ b/kicker/kicker/interfaces/kickoffsearchinterface.h
@@ -22,13 +22,13 @@
 
 #include <tqobject.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class HitMenuItem;
 
 namespace KickoffSearch
 {
-    class KDE_EXPORT KickoffSearchInterface :public TQObject
+    class TDE_EXPORT KickoffSearchInterface :public TQObject
     {
         TQ_OBJECT
 
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index 9d530f236..d9beb5663 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -8,7 +8,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdetempfile.h>
 
 struct AppletInfo
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 26cddaf7b..f3b864ed8 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
 #include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdguiitem.h>
 
 #include <paneldrag.h>
@@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea,
     m_mainWidget->appletInstall->setGuiItem(addGuiItem);
     m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close());
 
-    connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch()));
-    connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search()));
-    connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int)));
-    connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet()));
-    connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()));
+    connect(m_mainWidget->appletSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(delayedSearch()));
+    connect(m_searchDelay, TQ_SIGNAL(timeout()), this, TQ_SLOT(search()));
+    connect(m_mainWidget->appletFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(filter(int)));
+    connect(m_mainWidget->appletInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCurrentApplet()));
+    connect(m_mainWidget->closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()));
 
     m_selectedType = AppletInfo::Undefined;
     m_appletBox = 0;
 
-    TQTimer::singleShot(0, this, TQT_SLOT(populateApplets()));
+    TQTimer::singleShot(0, this, TQ_SLOT(populateApplets()));
 }
 
 void AddAppletDialog::updateInsertionPoint()
@@ -303,9 +303,9 @@ void AddAppletDialog::resizeAppletView()
 bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
 {
     if (e->type() == TQEvent::Resize)
-        TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
+        TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView()));
     
-    return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e);
+    return this->TQObject::eventFilter(o, e);
 }
 
 void AddAppletDialog::populateApplets()
@@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets()
         setTabOrder(prevTabWidget, itemWidget);
         prevTabWidget = itemWidget;
 
-        connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)),
-                this, TQT_SLOT(selectApplet(AppletWidget*)));
-        connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)),
-                this, TQT_SLOT(addApplet(AppletWidget*)));
+        connect(itemWidget, TQ_SIGNAL(clicked(AppletWidget*)),
+                this, TQ_SLOT(selectApplet(AppletWidget*)));
+        connect(itemWidget, TQ_SIGNAL(doubleClicked(AppletWidget*)),
+                this, TQ_SLOT(addApplet(AppletWidget*)));
 
         if (m_closing)
         {
@@ -518,7 +518,7 @@ void AddAppletDialog::search()
         }
     }
     
-    TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
+    TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView()));
 }
 
 void AddAppletDialog::filter(int i)
diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp
index 6d5c4482f..f68159b98 100644
--- a/kicker/kicker/ui/addapplet_mnu.cpp
+++ b/kicker/kicker/ui/addapplet_mnu.cpp
@@ -33,8 +33,8 @@ PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, c
     : TQPopupMenu(parent, name), containerArea(cArea)
 {
     setCheckable(true);
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelAddAppletMenu::slotAboutToShow()
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 1226c9b37..dd6f04135 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -56,7 +56,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
 {
     setFocusPolicy(TQWidget::NoFocus);
     setBackgroundMode(NoBackground);
-    connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser()));
+    connect(&m_moveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(swoopCloser()));
 
     TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name());
 
@@ -218,7 +218,7 @@ void AddAppletVisualFeedback::swoopCloser()
     {
         m_moveTimer.stop();
         displayInternal();
-        TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater()));
+        TQTimer::singleShot(2000, this, TQ_SLOT(deleteLater()));
     }
 }
 
diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp
index a544d0f74..a70a9cfd6 100644
--- a/kicker/kicker/ui/addbutton_mnu.cpp
+++ b/kicker/kicker/ui/addbutton_mnu.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 
 #include "addbutton_mnu.h"
diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp
index b22187443..c0eda09ab 100644
--- a/kicker/kicker/ui/addextension_mnu.cpp
+++ b/kicker/kicker/ui/addextension_mnu.cpp
@@ -31,8 +31,8 @@ PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name)
     : TQPopupMenu(parent, name)
 {
     setCheckable(true);
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelAddExtensionMenu::slotAboutToShow()
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index f1aa98023..b38ca9fae 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -99,7 +99,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
             insertSeparator();
         }
 
-        TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
+        TQPixmap iconPix(tdeApp->iconLoader()->loadIcon(icon,
                                                      TDEIcon::Small, 0,
                                                      TDEIcon::DefaultState,
                                                      0, true));
@@ -169,13 +169,13 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
         }
 
         if (KickerSettings::legacyKMenu()) 
-//          insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy()));
-          insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy()));
+//          insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy()));
+          insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy()));
         else
-          insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy()));
+          insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy()));
     }
 
-    if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit"))
+    if ((actions & PanelAppletOpMenu::KMenuEditor) && tdeApp->authorizeTDEAction("menuedit"))
     {
         if (needSeparator)
         {
@@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
     }
 
     if ((actions & PanelAppletOpMenu::BookmarkEditor) &&
-        kapp->authorizeTDEAction("edit_bookmarks"))
+        tdeApp->authorizeTDEAction("edit_bookmarks"))
     {
         if (needSeparator)
         {
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp
index 0e98054d8..27eb0def5 100644
--- a/kicker/kicker/ui/browser_dlg.cpp
+++ b/kicker/kicker/ui/browser_dlg.cpp
@@ -55,7 +55,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
     hbox1->setSpacing( KDialog::spacingHint() );
     TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 );
     pathInput = new KLineEdit( hbox1 );
-    connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & )));
+    connect( pathInput, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotPathChanged( const TQString & )));
 
     pathInput->setText( path );
     pathInput->setFocus();
@@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
     else
         iconBtn->setIcon( icon );
 
-    connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) );
+    connect( browseBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( browse() ) );
 }
 
 PanelBrowserDialog::~PanelBrowserDialog()
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 2082c4bb5..a3dad738d 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdirwatch.h>
 #include <tdefileitem.h>
 #include <tdeglobal.h>
@@ -37,9 +37,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <kmimetype.h>
 #include <konq_operations.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <krun.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
 
@@ -64,12 +64,12 @@ PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char *
 
     // we are not interested for dirty events on files inside the
     // directory (see slotClearIfNeeded)
-    connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)),
-             this, TQT_SLOT(slotClearIfNeeded(const TQString&)) );
-    connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)),
-             this, TQT_SLOT(slotClear()) );
-    connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)),
-             this, TQT_SLOT(slotClear()) );
+    connect( &_dirWatch, TQ_SIGNAL(dirty(const TQString&)),
+             this, TQ_SLOT(slotClearIfNeeded(const TQString&)) );
+    connect( &_dirWatch, TQ_SIGNAL(created(const TQString&)),
+             this, TQ_SLOT(slotClear()) );
+    connect( &_dirWatch, TQ_SIGNAL(deleted(const TQString&)),
+             this, TQ_SLOT(slotClear()) );
 
     kdDebug() << "PanelBrowserMenu Constructor " << path << endl;
 }
@@ -139,7 +139,7 @@ void PanelBrowserMenu::initialize()
 
     KURL url;
     url.setPath(path());
-    if (!kapp->authorizeURLAction("list", KURL(), url))
+    if (!tdeApp->authorizeURLAction("list", KURL(), url))
     {
         insertItem(i18n("Not Authorized to Read Folder"));
         return;
@@ -151,9 +151,9 @@ void PanelBrowserMenu::initialize()
        insertTitle(path());
        TDEConfig *c = TDEGlobal::config();
        c->setGroup("menus");
-       insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
-	if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
-	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal()));
+       insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager()));
+	if (tdeApp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
+	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal()));
     	insertSeparator();
     }
 
@@ -189,7 +189,7 @@ void PanelBrowserMenu::initialize()
             // parse .directory if it does exist
             if (TQFile::exists(path + "/.directory")) {
 
-                KSimpleConfig c(path + "/.directory", true);
+                TDESimpleConfig c(path + "/.directory", true);
                 c.setDesktopGroup();
                 TQString iconPath = c.readEntry("Icon");
 
@@ -237,9 +237,9 @@ void PanelBrowserMenu::initialize()
             bool mimecheck = false;
 
             // .desktop files
-            if(KDesktopFile::isDesktopFile(path))
+            if(TDEDesktopFile::isDesktopFile(path))
             {
-                KSimpleConfig c(path, true);
+                TDESimpleConfig c(path, true);
                 c.setDesktopGroup();
                 title = c.readEntry("Name", title);
 
@@ -334,7 +334,7 @@ void PanelBrowserMenu::initialize()
         if(!_mimecheckTimer)
             _mimecheckTimer = new TQTimer(this, "_mimecheckTimer");
 
-        connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck()));
+        connect(_mimecheckTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMimeCheck()));
         _mimecheckTimer->start(0);
     }
 }
@@ -398,7 +398,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
     url.setPath(path() + "/" + _filemap[id]);
     KURL::List files(url);
     KURLDrag *d = new KURLDrag(files, this);
-    connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed()));
+    connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed()));
     d->setPixmap(iconSet(id)->pixmap());
     d->drag();
 }
@@ -437,7 +437,7 @@ void PanelBrowserMenu::dropEvent( TQDropEvent *ev )
 
 void PanelBrowserMenu::slotExec(int id)
 {
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     if(!_filemap.contains(id)) return;
 
@@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id)
 
 void PanelBrowserMenu::slotOpenTerminal()
 {
-    TDEConfig * config = kapp->config();
+    TDEConfig * config = tdeApp->config();
     config->setGroup("General");
     TQString term = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h
index 22dc8f904..d6dbcc4f1 100644
--- a/kicker/kicker/ui/clicklineedit.h
+++ b/kicker/kicker/ui/clicklineedit.h
@@ -33,7 +33,7 @@ namespace KPIM {
   @short LineEdit with customizable "Click here" text
   @author Daniel Molkentin
 */
-class KDE_EXPORT ClickLineEdit : public KLineEdit
+class TDE_EXPORT ClickLineEdit : public KLineEdit
 {
   TQ_OBJECT
   public:
diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp
index 0ad2107d1..72cc6b279 100644
--- a/kicker/kicker/ui/client_mnu.cpp
+++ b/kicker/kicker/ui/client_mnu.cpp
@@ -46,13 +46,13 @@ void KickerClientMenu::clear()
 
 void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id )
 {
-    int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) );
+    int globalid = TQPopupMenu::insertItem( icon, text, this, TQ_SLOT( slotActivated(int) ) );
     setItemParameter( globalid, id );
 }
 
 void KickerClientMenu::insertItem( TQString text, int id )
 {
-    int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) );
+    int globalid = TQPopupMenu::insertItem( text, this, TQ_SLOT( slotActivated(int) ) );
     setItemParameter( globalid, id );
 }
 
@@ -134,6 +134,6 @@ void KickerClientMenu::slotActivated(int id)
 	TQByteArray data;
 	TQDataStream dataStream( data, IO_WriteOnly );
 	dataStream << id;
-	kapp->dcopClient()->send( app, obj, "activated(int)", data );
+	tdeApp->dcopClient()->send( app, obj, "activated(int)", data );
     }
 }
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 07caa2b55..a0c572685 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kicondialog.h>
 #include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
 #include <kurl.h>
@@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
 
     updateIcon();
 
-    connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)),
-            this, TQT_SLOT(slotSelect(const TQString &)));
-    connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)),
-            this, TQT_SLOT(slotTextChanged(const TQString &)));
-    connect(ui->m_exec, TQT_SIGNAL(returnPressed()),
-            this, TQT_SLOT(slotReturnPressed()));
-    connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)),
-            this, TQT_SLOT(slotIconChanged(TQString)));
+    connect(ui->m_exec, TQ_SIGNAL(urlSelected(const TQString &)),
+            this, TQ_SLOT(slotSelect(const TQString &)));
+    connect(ui->m_exec, TQ_SIGNAL(textChanged(const TQString &)),
+            this, TQ_SLOT(slotTextChanged(const TQString &)));
+    connect(ui->m_exec, TQ_SIGNAL(returnPressed()),
+            this, TQ_SLOT(slotReturnPressed()));
+    connect(ui->m_icon, TQ_SIGNAL(iconChanged(TQString)),
+            this, TQ_SLOT(slotIconChanged(TQString)));
 
     // leave decent space for the commandline
     resize(sizeHint().width() > 300 ? sizeHint().width() : 300,
diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp
index ae96ebcaa..e2e19d406 100644
--- a/kicker/kicker/ui/flipscrollview.cpp
+++ b/kicker/kicker/ui/flipscrollview.cpp
@@ -101,20 +101,20 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name )
     addChild( mRightView );
 
     mTimer = new TQTimer( this, "mTimer" );
-    connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) );
-
-    connect( mLeftView, TQT_SIGNAL( startService(KService::Ptr) ),
-             TQT_SIGNAL( startService(KService::Ptr) ) );
-    connect( mLeftView, TQT_SIGNAL( startURL(const TQString& ) ),
-             TQT_SIGNAL( startURL(const TQString& ) ) );
-    connect( mLeftView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
-             TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
-    connect( mRightView, TQT_SIGNAL( startService(KService::Ptr) ),
-             TQT_SIGNAL( startService(KService::Ptr) ) );
-    connect( mRightView, TQT_SIGNAL( startURL(const TQString& ) ),
-             TQT_SIGNAL( startURL(const TQString& ) ) );
-    connect( mRightView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
-             TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
+    connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) );
+
+    connect( mLeftView, TQ_SIGNAL( startService(KService::Ptr) ),
+             TQ_SIGNAL( startService(KService::Ptr) ) );
+    connect( mLeftView, TQ_SIGNAL( startURL(const TQString& ) ),
+             TQ_SIGNAL( startURL(const TQString& ) ) );
+    connect( mLeftView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
+             TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
+    connect( mRightView, TQ_SIGNAL( startService(KService::Ptr) ),
+             TQ_SIGNAL( startService(KService::Ptr) ) );
+    connect( mRightView, TQ_SIGNAL( startURL(const TQString& ) ),
+             TQ_SIGNAL( startURL(const TQString& ) ) );
+    connect( mRightView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ),
+             TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) );
 
     // wild hack to make sure it has correct width
     mLeftView->setVScrollBarMode( TQScrollView::AlwaysOn );
@@ -124,7 +124,7 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name )
 
     mBackrow = new BackFrame( this );
     mBackrow->resize( 24, 100 );
-    connect( mBackrow, TQT_SIGNAL( clicked() ), TQT_SIGNAL( backButtonClicked() ) );
+    connect( mBackrow, TQ_SIGNAL( clicked() ), TQ_SIGNAL( backButtonClicked() ) );
 }
 
 ItemView* FlipScrollView::prepareRightMove()
diff --git a/kicker/kicker/ui/flipscrollview.h b/kicker/kicker/ui/flipscrollview.h
index 6ba2615b3..7c761b5ac 100644
--- a/kicker/kicker/ui/flipscrollview.h
+++ b/kicker/kicker/ui/flipscrollview.h
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqframe.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include "service_mnu.h"
 
 class ItemView;
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 795535976..f7637a100 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 HideButton::HideButton(TQWidget *parent, const char *name)
     : TQButton(parent, name),
@@ -38,11 +38,11 @@ HideButton::HideButton(TQWidget *parent, const char *name)
 {
     setBackgroundOrigin(AncestorOrigin);
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)));
 
-    kapp->addKipcEventMask(KIPC::SettingsChanged);
-    kapp->addKipcEventMask(KIPC::IconChanged);
+    tdeApp->addKipcEventMask(KIPC::SettingsChanged);
+    tdeApp->addKipcEventMask(KIPC::IconChanged);
 
     slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
 }
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 4ab68eb55..873fbaa9f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kcombobox.h>
 #include <twin.h>
 #include <kdebug.h>
@@ -640,11 +640,11 @@ ItemView::ItemView(TQWidget* parent, const char* name)
     m_lastOne = 0;
     m_old_contentY = -1;
 
-    connect(this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )),
-                  TQT_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int)));
+    connect(this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )),
+                  TQ_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int)));
 
-    connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*)));
-    connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*)));
+    connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
+    connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
 
     new ItemViewTip( viewport(), this );
 }
@@ -837,7 +837,7 @@ KMenuItem* ItemView::insertDocumentItem(const TQString& s, int nId, int nIndex,
 
 KMenuItem* ItemView::insertRecentlyItem(const TQString& s, int nId, int nIndex)
 {
-    KDesktopFile f(s, true /* read only */);
+    TDEDesktopFile f(s, true /* read only */);
 
     KMenuItem* newItem = findItem(nId);
 
@@ -1056,7 +1056,7 @@ TQDragObject * ItemView::dragObject()
          TQString uri = kitem->path();
 
          if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
-             KDesktopFile df(uri,true);
+             TDEDesktopFile df(uri,true);
              uri=df.readURL();
          }
 
@@ -1153,9 +1153,9 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item)
                 TQString url = *it;
                 kdDebug () << "Url " << url << endl;
                 item.m_path = KURL( url ).path();
-                if ( KDesktopFile::isDesktopFile( item.m_path ) )
+                if ( TDEDesktopFile::isDesktopFile( item.m_path ) )
                 {
-                    KDesktopFile df( item.m_path, true );
+                    TDEDesktopFile df( item.m_path, true );
                     item.m_description = df.readGenericName();
                     item.m_icon = df.readIcon();
                     item.m_title = df.readName();
@@ -1215,13 +1215,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
             TQString uri = item.m_path;
 
             if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
-               KDesktopFile df(uri,true);
+               TDEDesktopFile df(uri,true);
                uri=df.readURL();
             }
 
             for (it = favs.begin(); it != favs.end(); ++it) {
                 if ((*it)[0]=='/') {
-                    KDesktopFile df((*it),true);
+                    TDEDesktopFile df((*it),true);
                     if (df.readURL().replace("file://",TQString())==uri)
                         break;
                 }
@@ -1243,7 +1243,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
             TQStringList::Iterator it;
             for (it = favs.begin(); it != favs.end(); ++it) {
                 if ((*it)[0]=='/') {
-                    KDesktopFile df((*it),true);
+                    TDEDesktopFile df((*it),true);
                     if (df.readURL().replace("file://",TQString())==text)
                         break;
                 }
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 79ba8826f..189e7e03e 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetoolbarbutton.h>
 #include <twin.h>
 #include <popupmenutop.h>
@@ -77,7 +77,7 @@ PanelKMenu::PanelKMenu()
   : PanelServiceMenu(TQString::null, TQString::null, 0, "KMenu")
   , bookmarkMenu(0)
   , bookmarkOwner(0)
-  , displayRepaired(FALSE)
+  , displayRepaired(false)
 {
     static const TQCString dcopObjId("KMenu");
     DCOPObject::setObjId(dcopObjId);
@@ -87,8 +87,8 @@ PanelKMenu::PanelKMenu()
     disableAutoClear();
     actionCollection = new TDEActionCollection(this);
     setCaption(i18n("TDE Menu"));
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            this, TQT_SLOT(configChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            this, TQ_SLOT(configChanged()));
     DCOPClient *dcopClient = TDEApplication::dcopClient();
     dcopClient->connectDCOPSignal(0, "appLauncher",
         "serviceStartedByStorageId(TQString,TQString)",
@@ -96,7 +96,7 @@ PanelKMenu::PanelKMenu()
         "slotServiceStartedByStorageId(TQString,TQString)",
         false);
     displayRepairTimer = new TQTimer( this );
-    connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) );
+    connect( displayRepairTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repairDisplay()) );
 }
 
 PanelKMenu::~PanelKMenu()
@@ -125,13 +125,13 @@ void PanelKMenu::hideMenu()
     // Try to redraw the area under the menu
     // Qt makes this surprisingly difficult to do in a timely fashion!
     while (isShown() == true)
-        kapp->eventLoop()->processEvents(1000);
+        tdeApp->eventLoop()->processEvents(1000);
     TQTimer *windowtimer = new TQTimer( this );
-    connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) );
+    connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) );
     windowTimerTimedOut = false;
-    windowtimer->start( 0, TRUE );	// Wait for all window system events to be processed
+    windowtimer->start( 0, true );	// Wait for all window system events to be processed
     while (windowTimerTimedOut == false)
-        kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
+        tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
 
     // HACK
     // The TDE Menu takes an unknown amount of time to disappear, and redrawing
@@ -140,11 +140,11 @@ void PanelKMenu::hideMenu()
     // thereby removing a bad shutdown screen artifact while still providing
     // a somewhat snappy user interface.
     TQTimer *delaytimer = new TQTimer( this );
-    connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) );
+    connect( delaytimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) );
     windowTimerTimedOut = false;
-    delaytimer->start( 100, TRUE );	// Wait for 100 milliseconds
+    delaytimer->start( 100, true );	// Wait for 100 milliseconds
     while (windowTimerTimedOut == false)
-        kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
+        tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
 }
 
 void PanelKMenu::windowClearTimeout()
@@ -247,10 +247,10 @@ void PanelKMenu::initialize()
     if (loadSidePixmap())
     {
         // in case we've been through here before, let's disconnect
-        disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-                   this, TQT_SLOT(paletteChanged()));
-        connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-                this, TQT_SLOT(paletteChanged()));
+        disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+                   this, TQ_SLOT(paletteChanged()));
+        connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+                this, TQ_SLOT(paletteChanged()));
     }
     else
     {
@@ -286,13 +286,13 @@ void PanelKMenu::initialize()
         hbox->setFocusPolicy(TQWidget::StrongFocus);
         hbox->setFocusProxy(searchEdit);
         hbox->setSpacing( 3 );
-        connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear()));
-        connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch()));
-        connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            this, TQT_SLOT( slotUpdateSearch( const TQString&)));
+        connect(clearButton, TQ_SIGNAL(clicked()), searchEdit, TQ_SLOT(clear()));
+        connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClearSearch()));
+        connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            this, TQ_SLOT( slotUpdateSearch( const TQString&)));
 	accel->insert("search", i18n("Search"), i18n("TDE Menu search"),
 		      TDEShortcut(KickerSettings::searchShortcut()),
-		      this, TQT_SLOT(slotFocusSearch()));
+		      this, TQ_SLOT(slotFocusSearch()));
 		      
         insertItem(hbox, searchLineID, 0);
     } else {
@@ -317,7 +317,7 @@ void PanelKMenu::initialize()
     bool need_separator = false;
 
     // insert bookmarks
-    if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks"))
+    if (KickerSettings::useBookmarks() && tdeApp->authorizeTDEAction("bookmarks"))
     {
         // Need to create a new popup each time, it's deleted by subMenus.clear()
         TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" );
@@ -385,21 +385,21 @@ void PanelKMenu::initialize()
     }
 
     // run command
-    if (kapp->authorize("run_command"))
+    if (tdeApp->authorize("run_command"))
     {
         insertItem(KickerLib::menuIconSet("system-run"),
                    i18n("Run Command..."),
                    this,
-                   TQT_SLOT( slotRunCommand()));
+                   TQ_SLOT( slotRunCommand()));
         insertSeparator();
     }
 
-    if (DM().isSwitchable() && kapp->authorize("switch_user"))
+    if (DM().isSwitchable() && tdeApp->authorize("switch_user"))
     {
         sessionsMenu = new TQPopupMenu( this );
         insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu);
-        connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) );
-        connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) );
+        connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) );
+        connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) );
     }
 
     /*
@@ -409,17 +409,17 @@ void PanelKMenu::initialize()
     ksmserver.setGroup("General");
     if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession")
     {
-        insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession()));
+        insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession()));
     }
 
-    if (kapp->authorize("lock_screen"))
+    if (tdeApp->authorize("lock_screen"))
     {
-        insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQT_SLOT(slotLock()));
+        insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock()));
     }
 
-    if (kapp->authorize("logout"))
+    if (tdeApp->authorize("logout"))
     {
-        insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQT_SLOT(slotLogout()));
+        insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout()));
     }
 
 #if 0
@@ -430,9 +430,9 @@ void PanelKMenu::initialize()
       insertTearOffHandle();
 #endif
 
-    if (displayRepaired == FALSE) {
-        displayRepairTimer->start(5, FALSE);
-        displayRepaired = TRUE;
+    if (displayRepaired == false) {
+        displayRepairTimer->start(5, false);
+        displayRepaired = true;
     }
 
     setInitialized(true);
@@ -445,7 +445,7 @@ void PanelKMenu::repairDisplay(void) {
         // Now do a nasty hack to prevent search bar merging into the side image
         // This forces a layout/repaint of the qpopupmenu
         repaint();			// This ensures that the side bar image was applied
-        styleChange(style());		// This forces a call to the private function updateSize(TRUE) inside the qpopupmenu.
+        styleChange(style());		// This forces a call to the private function updateSize(true) inside the qpopupmenu.
         update();			// This repaints the entire popup menu to apply the widget size/alignment changes made above
     }
 }
@@ -477,13 +477,13 @@ void PanelKMenu::slotLock()
     TQByteArray replyData;
     // Block here until lock is complete
     // If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages!
-    kapp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
+    tdeApp->dcopClient()->call(appname, "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
 }
 
 void PanelKMenu::slotLogout()
 {
     hide();
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 void PanelKMenu::slotPopulateSessions()
@@ -492,9 +492,9 @@ void PanelKMenu::slotPopulateSessions()
     DM dm;
 
     sessionsMenu->clear();
-    if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
+    if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
     {
-        if (kapp->authorize("lock_screen")) {
+        if (tdeApp->authorize("lock_screen")) {
             sessionsMenu->insertItem(SmallIconSet("system-lock-screen"), i18n("Lock Current && Start New Session"), 100 );
         }
         sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 );
@@ -528,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent )
 void PanelKMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
+        tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -558,7 +558,7 @@ void PanelKMenu::doNewSession( bool lock )
 void PanelKMenu::slotSaveSession()
 {
     TQByteArray data;
-    kapp->dcopClient()->send( "ksmserver", "default",
+    tdeApp->dcopClient()->send( "ksmserver", "default",
                               "saveCurrentSession()", data );
 }
 
@@ -569,8 +569,8 @@ void PanelKMenu::slotRunCommand()
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
 
-    kapp->updateRemoteUserTimestamp( appname );
-    kapp->dcopClient()->send( appname, "KDesktopIface",
+    tdeApp->updateRemoteUserTimestamp( appname );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
 
@@ -726,7 +726,7 @@ void PanelKMenu::slotUpdateSearch(const TQString& searchString)
 void PanelKMenu::slotClearSearch()
 {
     if (searchEdit && searchEdit->text().isEmpty() == false) {
-        TQTimer::singleShot(0, searchEdit, TQT_SLOT(clear()));
+        TQTimer::singleShot(0, searchEdit, TQ_SLOT(clear()));
     }
 }
 
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 439dce8df..324c46f0e 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -68,7 +68,7 @@
 #include <klineedit.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kcombobox.h>
 #include <twin.h>
 #include <kdebug.h>
@@ -81,7 +81,7 @@
 #include <kurifilter.h>
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeio/jobclasses.h>
 #include <tdeio/job.h>
 #include <dcopref.h>
@@ -206,15 +206,15 @@ KMenu::KMenu()
     m_iconName(TQString()),  m_orientation(UnDetermined), m_search_plugin( 0 )
 {
     setMouseTracking(true);
-    connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout()));
+    connect(&m_sloppyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotSloppyTimeout()));
 
     // set the first client id to some arbitrarily large value.
     client_id = 10000;
     // Don't automatically clear the main menu.
     actionCollection = new TDEActionCollection(this);
 
-    connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
-            this, TQT_SLOT(configChanged()));
+    connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+            this, TQ_SLOT(configChanged()));
 
     KUser * user = new KUser();
 
@@ -236,7 +236,7 @@ KMenu::KMenu()
     m_userInfo->setPaletteForegroundColor( userInfoColor );
 
     m_tabBar = new KickoffTabBar(this, "m_tabBar");
-    connect(m_tabBar, TQT_SIGNAL(tabClicked(TQTab*)), TQT_SLOT(tabClicked(TQTab*)));
+    connect(m_tabBar, TQ_SIGNAL(tabClicked(TQTab*)), TQ_SLOT(tabClicked(TQTab*)));
 
     const int tab_icon_size = 32;
 
@@ -284,8 +284,8 @@ KMenu::KMenu()
 	m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size));
     }
 
-    connect(m_tabBar, TQT_SIGNAL(selected(int)), m_stacker, TQT_SLOT(raiseWidget(int)));
-    connect(m_stacker, TQT_SIGNAL(aboutToShow(int)), m_tabBar, TQT_SLOT(setCurrentTab(int)));
+    connect(m_tabBar, TQ_SIGNAL(selected(int)), m_stacker, TQ_SLOT(raiseWidget(int)));
+    connect(m_stacker, TQ_SIGNAL(aboutToShow(int)), m_tabBar, TQ_SLOT(setCurrentTab(int)));
 
     m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView");
     m_favoriteView->setAcceptDrops(true);
@@ -300,11 +300,11 @@ KMenu::KMenu()
 
     m_browserView = new FlipScrollView(m_stacker, "m_browserView");
     m_stacker->addWidget(m_browserView, ApplicationsTab);
-    connect( m_browserView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoBack() ) );
+    connect( m_browserView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoBack() ) );
 
     m_exitView = new FlipScrollView(m_stacker, "m_exitView");
     m_stacker->addWidget(m_exitView, LeaveTab);
-    connect( m_exitView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoExitMainMenu() ) );
+    connect( m_exitView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoExitMainMenu() ) );
 
     m_searchWidget = new TQVBox (m_stacker, "m_searchWidget");
     m_searchWidget->setSpacing(0);
@@ -341,40 +341,40 @@ KMenu::KMenu()
 
     m_searchActions->setMaximumHeight(5+m_searchInternet->height());
 
-    connect(m_searchActions, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
-    connect(m_searchActions, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
-    connect(m_searchActions, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
+    connect(m_searchActions, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
+    connect(m_searchActions, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
+    connect(m_searchActions, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
 
-    connect(m_searchResultsWidget, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_searchResultsWidget, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_searchResultsWidget, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_searchResultsWidget, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_searchResultsWidget, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_searchResultsWidget, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_recentlyView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_recentlyView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_recentlyView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_recentlyView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_recentlyView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_recentlyView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_favoriteView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_favoriteView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_favoriteView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
-    connect(m_favoriteView, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
+    connect(m_favoriteView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_favoriteView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_favoriteView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int  )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_favoriteView, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQ_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
 
-    connect(m_systemView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_systemView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_systemView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_systemView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_systemView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_systemView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_browserView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotGoSubMenu(const TQString&)));
-    connect(m_browserView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
-    connect(m_browserView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_browserView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotGoSubMenu(const TQString&)));
+    connect(m_browserView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+    connect(m_browserView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
-    connect(m_exitView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
-    connect(m_exitView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+    connect(m_exitView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+    connect(m_exitView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
 
     m_kcommand->setDuplicatesEnabled( false );
     m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit"));
     m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto );
-    connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory()));
-    connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept()));
-    connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));
+    connect(m_kcommand, TQ_SIGNAL(cleared()), TQ_SLOT(clearedHistory()));
+    connect(m_kcommand->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(searchAccept()));
+    connect(m_kcommand->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(searchChanged(const TQString &)));
 
     // URI Filter meta object...
     m_filterData = new KURIFilterData();
@@ -383,14 +383,14 @@ KMenu::KMenu()
     categorised_hit_total = new int [num_categories];
 
     input_timer = new TQTimer (this, "input_timer");
-    connect( input_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doQuery()) );
+    connect( input_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doQuery()) );
 
     init_search_timer = new TQTimer (this, "init_search_timer");
-    connect( init_search_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initSearch()) );
+    connect( init_search_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initSearch()) );
     init_search_timer->start(2000, true);
 
-    connect( m_favoriteView, TQT_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ),
-             TQT_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) );
+    connect( m_favoriteView, TQ_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ),
+             TQ_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) );
 
     this->installEventFilter(this);
     m_tabBar->installEventFilter(this);
@@ -453,7 +453,7 @@ void KMenu::setupUi()
    // m_stacker->setFocusPolicy( TQWidget::StrongFocus );
     m_stacker->setLineWidth( 0 );
     m_stacker->setFocusPolicy(TQWidget::NoFocus);
-    connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*)));
+    connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*)));
 
     m_kcommand->setName("m_kcommand");
 }
@@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
             if(raiseWidget)
                 break;
             if(receiver->isWidgetType())
-                receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));
+                receiver = static_cast<TQWidget*>(receiver)->parentWidget(true);
             else
                 break;
         }
@@ -533,7 +533,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
                     TQWidget::StrongFocus : TQWidget::NoFocus);
             setTabOrder(raiseWidget, m_searchResultsWidget);
             if (raiseWidget != m_stacker->visibleWidget()
-                && TQT_TQWIDGET(receiver)->focusPolicy() == TQWidget::NoFocus
+                && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus
                 && m_stacker->id(raiseWidget) >= 0) {
 
                 m_stacker->raiseWidget(raiseWidget);
@@ -562,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
     }
 
     if(e->type() == TQEvent::Enter && receiver->isWidgetType()) {
-	TQT_TQWIDGET(receiver)->setMouseTracking(true);
+	static_cast<TQWidget*>(receiver)->setMouseTracking(true);
         TQToolTip::hide();
     }
 
@@ -1225,18 +1225,18 @@ void KMenu::initialize()
     kdDebug(1210) << "KMenu::initialize()" << endl;
 
     // in case we've been through here before, let's disconnect
-    disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-            this, TQT_SLOT(paletteChanged()));
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-            this, TQT_SLOT(paletteChanged()));
+    disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            this, TQ_SLOT(paletteChanged()));
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            this, TQ_SLOT(paletteChanged()));
 
    /*
        If  the user configured ksmserver to
      */
     TDEConfig ksmserver("ksmserverrc", false, false);
     ksmserver.setGroup("General");
-    connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage()));
-    m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout"));
+    connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage()));
+    m_tabBar->setTabEnabled(LeaveTab, tdeApp->authorize("logout"));
 
     // load search field history
     TQStringList histList = KickerSettings::history();
@@ -1284,7 +1284,7 @@ void KMenu::initialize()
     for (TQStringList::ConstIterator it = favs.begin(); it != favs.end(); ++it)
     {
        if ((*it)[0]=='/') {
-          KDesktopFile df((*it),true);
+          TDEDesktopFile df((*it),true);
           TQString url = df.readURL();
           if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString())))
             m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++);
@@ -1309,10 +1309,10 @@ void KMenu::insertStaticExitItems()
     int index = 1;
 
     m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ );
-    if (kapp->authorize("logout"))
+    if (tdeApp->authorize("logout"))
        m_exitView->leftView()->insertItem( "edit-undo", i18n( "Log out" ),
                                    i18n( "End current session" ), "kicker:/logout", nId++, index++ );
-    if (kapp->authorize("lock_screen"))
+    if (tdeApp->authorize("lock_screen"))
        m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ),
                                    i18n( "Lock computer screen" ), "kicker:/lock", nId++, index++ );
 
@@ -1324,7 +1324,7 @@ void KMenu::insertStaticExitItems()
                                i18n("Save current Session for next login"),
                                "kicker:/savesession", nId++, index++ );
     }
-    if (DM().isSwitchable() && kapp->authorize("switch_user"))
+    if (DM().isSwitchable() && tdeApp->authorize("switch_user"))
     {
         KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ),
                                                                     i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ );
@@ -1386,7 +1386,7 @@ void KMenu::insertStaticItems()
     m_systemView->insertMenuItem(p, nId++, index++);
 
     // run command
-    if (kapp->authorize("run_command"))
+    if (tdeApp->authorize("run_command"))
     {
         m_systemView->insertItem( "system-run", i18n("Run Command..."),
                    "", "kicker:/runusercommand", nId++, index++ );
@@ -1445,11 +1445,11 @@ void KMenu::insertStaticItems()
     m_systemView->insertItem( "network", i18n( "Network Folders" ),
                               "remote:/", "remote:/", nId++, index++ );
 
-    m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) );
-    connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) );
+    m_mediaWatcher = new MediaWatcher( this );
+    connect( m_mediaWatcher, TQ_SIGNAL( mediumChanged() ), TQ_SLOT( updateMedia() ) );
     m_media_id = 0;
 
-    connect(&m_mediaFreeTimer, TQT_SIGNAL(timeout()), TQT_SLOT( updateMedia()));
+    connect(&m_mediaFreeTimer, TQ_SIGNAL(timeout()), TQ_SLOT( updateMedia()));
 }
 
 int KMenu::insertClientMenu(KickerClientMenu *)
@@ -1479,18 +1479,18 @@ void KMenu::slotLock()
     TQCString appname( "kdesktop" );
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+    tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
 }
 
 void KMenu::slotOpenHomepage()
 {
     accept();
-    kapp->invokeBrowser("http://www.trinitydesktop.org");
+    tdeApp->invokeBrowser("http://www.trinitydesktop.org");
 }
 
 void KMenu::slotLogout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 void KMenu::slotPopulateSessions()
@@ -1499,9 +1499,9 @@ void KMenu::slotPopulateSessions()
     DM dm;
 
     sessionsMenu->clear();
-    if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
+    if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
     {
-        if (kapp->authorize("lock_screen"))
+        if (tdeApp->authorize("lock_screen"))
 	  sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 );
         sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 );
         if (!p) {
@@ -1534,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent )
 void KMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
+        tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -1583,8 +1583,8 @@ void KMenu::searchAccept()
 
     if ( logout )
     {
-        kapp->propagateSessionManager();
-        kapp->requestShutDown();
+        tdeApp->propagateSessionManager();
+        tdeApp->requestShutDown();
     }
     if ( lock )
     {
@@ -1592,7 +1592,7 @@ void KMenu::searchAccept()
         int kicker_screen_number = tqt_xscreen();
         if ( kicker_screen_number )
             appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-        kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+        tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
     }
 }
 
@@ -1656,7 +1656,7 @@ bool KMenu::runCommand()
       // fall-through to shell case
       case KURIFilterData::SHELL:
       {
-        if (kapp->authorize("shell_access"))
+        if (tdeApp->authorize("shell_access"))
         {
           exec = cmd;
 
@@ -1974,7 +1974,7 @@ void KMenu::searchChanged(const TQString & text)
 
   if (input_timer->isActive ())
     input_timer->stop ();
-  input_timer->start (WAIT_BEFORE_QUERYING, TRUE);
+  input_timer->start (WAIT_BEFORE_QUERYING, true);
 }
 
 bool KMenu::dontQueryNow (const TQString& str)
@@ -2419,7 +2419,7 @@ void KMenu::doQuery (bool return_pressed)
 #endif
                 )
                 exe = TQString();
-            else if (kapp->authorize("shell_access"))
+            else if (tdeApp->authorize("shell_access"))
             {
                 if( filterData.hasArgsAndOptions() )
                     exe += filterData.argsAndOptions();
@@ -2619,7 +2619,7 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item)
         return (mimetype_iconstore [hit_item->mimetype]);
     else {
         KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype);
-        TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE);
+        TQString mimetype_icon = mimetype_ptr->icon(TQString(), false);
         mimetype_iconstore [hit_item->mimetype] = mimetype_icon;
         return mimetype_icon;
     }
@@ -2660,7 +2660,7 @@ void KMenu::slotStartURL(const TQString& u)
         TQDataStream stream(params, IO_WriteOnly);
         stream << 0 << -1 << "";
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
     else if ( u == "kicker:/runcommand" )
     {
@@ -2675,14 +2675,14 @@ void KMenu::slotStartURL(const TQString& u)
         TQDataStream stream(params, IO_WriteOnly);
         stream << 2 << -1 << "";
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
     else if ( u == "kicker:/restart" ) {
         TQByteArray params;
         TQDataStream stream(params, IO_WriteOnly);
         stream << 1 << -1 << TQString();
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
     else if ( u == "kicker:/suspend_freeze" ) {
         slotSuspend( SuspendType::Freeze );
@@ -2701,7 +2701,7 @@ void KMenu::slotStartURL(const TQString& u)
     }
     else if ( u == "kicker:/savesession" ) {
         TQByteArray data;
-        kapp->dcopClient()->send( "ksmserver", "default",
+        tdeApp->dcopClient()->send( "ksmserver", "default",
                 "saveCurrentSession()", data );
     }
     else if ( u == "kicker:/switchuser" ) {
@@ -2722,7 +2722,7 @@ void KMenu::slotStartURL(const TQString& u)
         TQDataStream stream(params, IO_WriteOnly);
         stream << 1 << -1 << rebootOptions[u.mid(16).toInt()];
 
-        kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+        tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
     }
 #warning restart entry not supported
 #if 0
@@ -2753,12 +2753,12 @@ void KMenu::slotStartURL(const TQString& u)
                 TQDataStream arg(data, IO_WriteOnly);
                 arg << u.mid(9,22);
 
-                kapp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
+                tdeApp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
             }
             return;
         }
 
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         (void) new KRun( u, parentWidget());
     }
 }
@@ -2789,13 +2789,13 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         m_popupPath.icon = kitem->icon();
 
         if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
-               KDesktopFile df(m_popupPath.path,true);
+               TDEDesktopFile df(m_popupPath.path,true);
                m_popupPath.path=df.readURL();
         }
     }
 
     m_popupMenu = new TDEPopupMenu(this);
-    connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
+    connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int)));
     bool hasEntries = false;
 
     m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title());
@@ -2822,7 +2822,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
             {
                 if ((*it)[0]=='/')
                 {
-                    KDesktopFile df((*it),true);
+                    TDEDesktopFile df((*it),true);
                     if (df.readURL().replace("file://",TQString())==m_popupPath.path)
                         break;
                 }
@@ -2837,7 +2837,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
             if (hasEntries)
                 m_popupMenu->insertSeparator();
 
-            if (kapp->authorize("editable_desktop_icons") )
+            if (tdeApp->authorize("editable_desktop_icons") )
             {
                 hasEntries = true;
                 if (m_popupPath.menuPath.endsWith("/"))
@@ -2847,7 +2847,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                   m_popupMenu->insertItem(SmallIconSet("desktop"),
                       i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 if (m_popupPath.menuPath.endsWith("/"))
@@ -2857,7 +2857,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                    m_popupMenu->insertItem(SmallIconSet("kicker"),
                       i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
+            if (tdeApp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
             {
                 hasEntries = true;
                 if (kitem->menuPath().endsWith("/"))
@@ -2865,7 +2865,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                 else
                   m_popupMenu->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem);
             }
-            if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
+            if (tdeApp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
             {
                hasEntries = true;
                m_popupMenu->insertItem(SmallIconSet("system-run"),
@@ -2954,7 +2954,7 @@ void KMenu::slotContextMenu(int selected)
                 job->setDefaultPermissions( true );
  	    }
             else {
-		KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) );
+		TDEDesktopFile* df = new TDEDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) );
 		df->writeEntry("GenericName", m_popupPath.description);
 		df->writeEntry( "Icon", m_popupPath.icon );
 		df->writePathEntry( "URL", m_popupPath.path );
@@ -2969,17 +2969,17 @@ void KMenu::slotContextMenu(int selected)
 	case AddItemToPanel:
             accept();
 	    if (m_popupService)
-	    	kapp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
+	    	tdeApp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
             else
 #warning FIXME special RecentDocuments/foo.desktop handling
-	    	kapp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
+	    	tdeApp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
 	    accept();
 	    break;
 
 	case EditItem:
         case EditMenu:
 	    accept();
-            proc = new TDEProcess(TQT_TQOBJECT(this));
+            proc = new TDEProcess(this);
             *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
             proc->start();
@@ -2988,16 +2988,16 @@ void KMenu::slotContextMenu(int selected)
 	case PutIntoRunDialog:
 	    accept();
 	    if (m_popupService)
-	      kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
+	      tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
 	    else
 #warning FIXME special RecentDocuments/foo.desktop handling
-              kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
+              tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
             accept();
 	    break;
 
 	case AddMenuToDesktop: {
 	    accept();
-	    KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath()));
+	    TDEDesktopFile *df = new TDEDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath()));
             df->writeEntry( "Icon", m_popupPath.icon );
             df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath );
 	    df->writeEntry( "Name", m_popupPath.title );
@@ -3010,7 +3010,7 @@ void KMenu::slotContextMenu(int selected)
 	case AddMenuToPanel:
 	    accept();
             ds << "foo" << m_popupPath.menuPath;
-	    kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
+	    tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
 	    break;
 
         case AddToFavorites:
@@ -3025,14 +3025,14 @@ void KMenu::slotContextMenu(int selected)
                TQStringList::Iterator it;
                for (it = favs.begin(); it != favs.end(); ++it) {
                   if ((*it)[0]=='/') {
-                     KDesktopFile df((*it),true);
+                     TDEDesktopFile df((*it),true);
                      if (df.readURL().replace("file://",TQString())==m_popupPath.path)
                         break;
                   }
                }
                if (it==favs.end()) {
                  TQString file = KickerLib::newDesktopFile(m_popupPath.path);
-                 KDesktopFile df(file);
+                 TDEDesktopFile df(file);
                  df.writeEntry("Encoding", "UTF-8");
                  df.writeEntry("Type","Link");
                  df.writeEntry("Name", m_popupPath.title);
@@ -3067,7 +3067,7 @@ void KMenu::slotContextMenu(int selected)
             else {
                for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) {
                   if ((*it)[0]=='/') {
-                     KDesktopFile df((*it),true);
+                     TDEDesktopFile df((*it),true);
                      if (df.readURL().replace("file://",TQString())==m_popupPath.path) {
 			TQFile::remove((*it));
                         favs.erase(it);
@@ -3243,7 +3243,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
     TQDataStream stream(params, IO_WriteOnly);
     stream << "minicli" << service->storageId();
     kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
-    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 }
 
@@ -3311,7 +3311,7 @@ void KMenu::searchActionClicked(TQListViewItem* item)
    list << "kurisearchfilter" << "kuriikwsfilter";
 
    if( !KURIFilter::self()->filterURI(data, list) ) {
-       KDesktopFile file("searchproviders/google.desktop", true, "services");
+       TDEDesktopFile file("searchproviders/google.desktop", true, "services");
        data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText()));
    }
 
@@ -3420,7 +3420,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
         {
             if ((*it)[0]=='/')
             {
-                KDesktopFile df((*it),true);
+                TDEDesktopFile df((*it),true);
                 if (df.readURL().replace("file://",TQString())==kitem->path())
                 {
                     addFav = *it;
@@ -3445,7 +3445,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
         {
             if ((*it)[0]=='/' && !kafterNow->service())
             {
-                KDesktopFile df((*it),true);
+                TDEDesktopFile df((*it),true);
                 if (df.readURL().replace("file://",TQString())==kafterNow->path())
                 {
                     kdDebug() << "insert after " << kafterNow->path() << endl;
@@ -3569,7 +3569,7 @@ bool KMenu::ensureServiceRunning(const TQString & service)
     TQDataStream arg(data, IO_WriteOnly);
     arg << service << URLs;
 
-    if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+    if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
                       data, replyType, replyData) ) {
         tqWarning( "call to tdelauncher failed.");
         return false;
@@ -3615,7 +3615,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
         {
             TQString uri = item.m_path;
             if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
-               KDesktopFile df(uri,true);
+               TDEDesktopFile df(uri,true);
                uri=df.readURL();
             }
 
@@ -3624,7 +3624,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
             {
                 if ((*it)[0]=='/')
                 {
-                    KDesktopFile df((*it),true);
+                    TDEDesktopFile df((*it),true);
                     if (df.readURL().replace("file://",TQString())==uri)
                         break;
                 }
@@ -3632,7 +3632,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
             if (it==favs.end())
             {
                 TQString file = KickerLib::newDesktopFile(uri);
-                KDesktopFile df(file);
+                TDEDesktopFile df(file);
                 df.writeEntry("Encoding", "UTF-8");
                 df.writeEntry("Type","Link");
                 df.writeEntry("Name", item.m_title);
@@ -3666,7 +3666,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
             {
                 if ((*it)[0]=='/')
                 {
-                    KDesktopFile df((*it),true);
+                    TDEDesktopFile df((*it),true);
                     if (df.readURL().replace("file://",TQString())==text)
                         break;
                 }
@@ -3677,7 +3677,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
                 KURL kurl(text);
 
                 TQString file = KickerLib::newDesktopFile(text);
-                KDesktopFile df(file);
+                TDEDesktopFile df(file);
                 df.writeEntry("Encoding", "UTF-8");
                 df.writeEntry("Type","Link");
                 df.writeEntry("Name", item->name());
@@ -3849,7 +3849,7 @@ void KMenu::runUserCommand()
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
 
-    kapp->updateRemoteUserTimestamp( appname );
-    kapp->dcopClient()->send( appname, "KDesktopIface",
+    tdeApp->updateRemoteUserTimestamp( appname );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
diff --git a/kicker/kicker/ui/media_watcher.cpp b/kicker/kicker/ui/media_watcher.cpp
index 9ff74535c..d40178dc8 100644
--- a/kicker/kicker/ui/media_watcher.cpp
+++ b/kicker/kicker/ui/media_watcher.cpp
@@ -43,7 +43,7 @@ MediaWatcher::MediaWatcher( TQObject *parent ) :
 void MediaWatcher::updateDevices()
 {
     DCOPRef nsd( "kded", "mediamanager" );
-    nsd.setDCOPClient( kapp->dcopClient() );
+    nsd.setDCOPClient( tdeApp->dcopClient() );
     m_devices = nsd.call( "fullList" );
 }
 
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index 7aa839218..a6f3dec5e 100644
--- a/kicker/kicker/ui/popupmenutitle.h
+++ b/kicker/kicker/ui/popupmenutitle.h
@@ -46,7 +46,7 @@ public:
     {
         p->save();
         TQRect r(x, y, w, h);
-        kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
+        tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
                                     p, r, cg);
 
         if (!m_desktopName.isEmpty())
@@ -73,7 +73,7 @@ public:
     {
       TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
       size.setHeight(size.height() +
-                     (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
+                     (tdeApp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
       return size;
     }
 
diff --git a/kicker/kicker/ui/popupmenutop.cpp b/kicker/kicker/ui/popupmenutop.cpp
index 571d1c7dc..c05545aae 100644
--- a/kicker/kicker/ui/popupmenutop.cpp
+++ b/kicker/kicker/ui/popupmenutop.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "popupmenutop.h"
 #include "kickerSettings.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqimage.h>
 #include <kdebug.h>
 
diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp
index 9efc1ab5c..4ca117f3f 100644
--- a/kicker/kicker/ui/quickbrowser_mnu.cpp
+++ b/kicker/kicker/ui/quickbrowser_mnu.cpp
@@ -44,17 +44,17 @@ void PanelQuickBrowser::initialize()
     KURL url;
     
     url.setPath(TQDir::homeDirPath());
-    if (kapp->authorizeURLAction("list", KURL(), url))
+    if (tdeApp->authorizeURLAction("list", KURL(), url))
         insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"),
                new PanelBrowserMenu(url.path(), this));
                
     url.setPath(TQDir::rootDirPath());
-    if (kapp->authorizeURLAction("list", KURL(), url))
+    if (tdeApp->authorizeURLAction("list", KURL(), url))
         insertItem(SmallIcon("folder_red"), i18n("&Root Folder"),
                new PanelBrowserMenu(url.path(), this));
                
     url.setPath(TQDir::rootDirPath() + "etc");
-    if (kapp->authorizeURLAction("list", KURL(), url))
+    if (tdeApp->authorizeURLAction("list", KURL(), url))
         insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"),
                new PanelBrowserMenu(url.path(), this));
 }
diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp
index ef2f5c6a1..0cb81b53f 100644
--- a/kicker/kicker/ui/recentapps.cpp
+++ b/kicker/kicker/ui/recentapps.cpp
@@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
     TQByteArray params;
     TQDataStream stream(params, IO_WriteOnly);
     stream << launchDCOPSignalSource() << strApp;
-    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 
     for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp
index a7bc609a6..4ce3c4ea0 100644
--- a/kicker/kicker/ui/removeapplet_mnu.cpp
+++ b/kicker/kicker/ui/removeapplet_mnu.cpp
@@ -37,8 +37,8 @@ PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea,
                                              const char *name)
     : TQPopupMenu(parent, name), m_containerArea(cArea)
 {
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelRemoveAppletMenu::slotAboutToShow()
@@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow()
     if (m_containers.count() > 1)
     {
         insertSeparator();
-        insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id);
+        insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id);
     }
 }
 
diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp
index 819eff533..6617975f5 100644
--- a/kicker/kicker/ui/removebutton_mnu.cpp
+++ b/kicker/kicker/ui/removebutton_mnu.cpp
@@ -40,8 +40,8 @@ PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea,
                                               TQWidget *parent, const char *name )
     : TQPopupMenu( parent, name ), containerArea( cArea )
 {
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 void PanelRemoveButtonMenu::addToContainers(const TQString& type)
@@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow()
     if (containers.count() > 1)
     {
         insertSeparator();
-        insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id);
+        insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id);
     }
 }
 
diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp
index 1b30506cc..a447b4d66 100644
--- a/kicker/kicker/ui/removecontainer_mnu.cpp
+++ b/kicker/kicker/ui/removecontainer_mnu.cpp
@@ -44,7 +44,7 @@ RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea,
     buttonId = insertItem(i18n("Appli&cation"),
                           new PanelRemoveButtonMenu( containerArea, this ) );
     adjustSize();
-    connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+    connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
 }
 
 RemoveContainerMenu::~RemoveContainerMenu()
diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp
index 829dfab5c..ef345921d 100644
--- a/kicker/kicker/ui/removeextension_mnu.cpp
+++ b/kicker/kicker/ui/removeextension_mnu.cpp
@@ -37,8 +37,8 @@ static const int REMOVEALLID = 1000;
 PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name )
     : TQPopupMenu( parent, name )
 {
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
-    connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
 }
 
 PanelRemoveExtensionMenu::PanelRemoveExtensionMenu()
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 10510ca6f..59d63e533 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -31,14 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <kmimetype.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <krun.h>
 #include <kservicegroup.h>
 #include <tdesycoca.h>
@@ -68,10 +68,10 @@ PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relP
 {
     excludeNoDisplay_=true;
 
-    connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
-            TQT_SLOT(slotClearOnClose()));
-    connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose()));
-    connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int)));
+    connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
+            TQ_SLOT(slotClearOnClose()));
+    connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClose()));
+    connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSetTooltip(int)));
 }
 
 PanelServiceMenu::~PanelServiceMenu()
@@ -378,7 +378,7 @@ void PanelServiceMenu::doInitialize()
         if (relPath_ == "")
         {
             insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"),
-                       this, TQT_SLOT(addNonKDEApp()));
+                       this, TQ_SLOT(addNonKDEApp()));
         }
 
         if (list.count() > 0) {
@@ -553,7 +553,7 @@ void PanelServiceMenu::slotExec(int id)
 
     KSycocaEntry * e = entryMap_[id];
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
 
     KService::Ptr service = static_cast<KService *>(e);
     TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
@@ -590,31 +590,31 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
 
         delete popupMenu_;
         popupMenu_ = new TDEPopupMenu(this);
-        connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
+        connect(popupMenu_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int)));
         bool hasEntries = false;
 
         switch (contextKSycocaEntry_->sycocaType())
         {
         case KST_KService:
-            if (kapp->authorize("editable_desktop_icons"))
+            if (tdeApp->authorize("editable_desktop_icons"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeTDEAction("menuedit"))
+            if (tdeApp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
                     i18n("Edit Item"), EditItem);
             }
-            if (kapp->authorize("run_command"))
+            if (tdeApp->authorize("run_command"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("system-run"),
@@ -623,19 +623,19 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
             break;
 
         case KST_KServiceGroup:
-            if (kapp->authorize("editable_desktop_icons"))
+            if (tdeApp->authorize("editable_desktop_icons"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Menu to Desktop"), AddMenuToDesktop);
             }
-            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Menu to Main Panel"), AddMenuToPanel);
             }
-            if (kapp->authorizeTDEAction("menuedit"))
+            if (tdeApp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
@@ -672,7 +672,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
 
     KURL src,dest;
     TDEIO::CopyJob *job;
-    KDesktopFile *df;
+    TDEDesktopFile *df;
 
     switch (selected) {
         case AddItemToDesktop:
@@ -691,12 +691,12 @@ void PanelServiceMenu::slotContextMenu(int selected)
             if ( kicker_screen_number )
                 appname.sprintf("kicker-screen-%d", kicker_screen_number);
             service = static_cast<KService *>(contextKSycocaEntry_);
-            kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath());
+            tdeApp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath());
             break;
         }
 
 	case EditItem:
-            proc = new TDEProcess(TQT_TQOBJECT(this));
+            proc = new TDEProcess(this);
             *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
             proc->start();
@@ -708,8 +708,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
             if ( kicker_screen_number )
                 appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
             service = static_cast<KService *>(contextKSycocaEntry_);
-            kapp->updateRemoteUserTimestamp( appname );
-            kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec());
+            tdeApp->updateRemoteUserTimestamp( appname );
+            tdeApp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec());
             break;
         }
 
@@ -718,7 +718,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
             dest.setPath( TDEGlobalSettings::desktopPath() );
 	    dest.setFileName( g->caption() );
 
-	    df = new KDesktopFile( dest.path() );
+	    df = new TDEDesktopFile( dest.path() );
             df->writeEntry( "Icon", g->icon() );
             df->writePathEntry( "URL", "programs:/"+g->name() );
 	    df->writeEntry( "Name", g->caption() );
@@ -735,12 +735,12 @@ void PanelServiceMenu::slotContextMenu(int selected)
 
             g = static_cast<KServiceGroup *>(contextKSycocaEntry_);
             ds << "foo" << g->relPath();
-            kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
+            tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
             break;
         }
 
         case EditMenu:
-            proc = new TDEProcess(TQT_TQOBJECT(this));
+            proc = new TDEProcess(this);
             *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
             proc->start();
@@ -814,7 +814,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
     // path from KStdDirs.
 
     KURLDrag *d = new KURLDrag(KURL::List(url), this);
-    connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed()));
+    connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed()));
     d->setPixmap(icon);
     d->dragCopy();
 
@@ -857,7 +857,7 @@ void PanelServiceMenu::slotDragObjectDestroyed()
         // the execution of any code after the original exec() statement
         // though the panels themselves continue on otherwise normally
         // (we just have some sort of nested event loop)
-        TQTimer::singleShot(0, this, TQT_SLOT(close()));
+        TQTimer::singleShot(0, this, TQ_SLOT(close()));
     }
 }
 
@@ -898,7 +898,7 @@ void PanelServiceMenu::slotClear()
         // QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
         // and also before a click in the menu is handled, so do the clearing
         // only after that has been handled
-        TQTimer::singleShot(100, this, TQT_SLOT(slotClear()));
+        TQTimer::singleShot(100, this, TQ_SLOT(slotClear()));
         return;
     }
 
diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h
index a52e10d45..be4d47332 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -48,7 +48,7 @@ typedef TQValueVector<TQPopupMenu*> PopupMenuList;
 class PanelServiceMenu;
 typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap;
 
-class KDE_EXPORT PanelServiceMenu : public KPanelMenu
+class TDE_EXPORT PanelServiceMenu : public KPanelMenu
 {
     TQ_OBJECT
 
diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp
index 4a851df55..0e8b70994 100644
--- a/kicker/libkicker/appletinfo.cpp
+++ b/kicker/libkicker/appletinfo.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include <tqfileinfo.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeapplication.h>
 
 #include "appletinfo.h"
@@ -53,7 +53,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co
             break;
     }
 
-    KDesktopFile df(m_desktopFile, true, resource);
+    TDEDesktopFile df(m_desktopFile, true, resource);
 
     // set the appletssimple attributes
     setName(df.readName());
@@ -81,7 +81,7 @@ AppletInfo::AppletInfo( const TQString& deskFile, const TQString& configFile, co
         else
         {
             m_configFile.append("_")
-                        .append(kapp->randomString(20).lower())
+                        .append(tdeApp->randomString(20).lower())
                         .append("_rc");
         }
     }
diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h
index f89bb6aea..343c8eae5 100644
--- a/kicker/libkicker/appletinfo.h
+++ b/kicker/libkicker/appletinfo.h
@@ -29,9 +29,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
-class KDE_EXPORT AppletInfo
+class TDE_EXPORT AppletInfo
 {
     public:
         typedef TQValueVector<AppletInfo> List;
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 224cf427a..b9c7a6960 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconeffect.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservice.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include "global.h"
 #include "kickerSettings.h"
@@ -161,7 +161,7 @@ int maxButtonDim()
     int maxDim;
     //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge;
 
-    KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
+    TDESimpleConfig *kickerconfig = new TDESimpleConfig( TQString::fromLatin1( "kickerrc" ));
     kickerconfig->setGroup("General");
     maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);;
     delete kickerconfig;
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index 61ba2f0ea..6520d55c8 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -37,38 +37,38 @@ namespace KickerLib
 /*
  * Functions to convert between various enums
  */
-KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
-KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
-KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
-KDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p);
-KDE_EXPORT int sizeValue(KPanelExtension::Size s);
+TDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
+TDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
+TDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
+TDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p);
+TDE_EXPORT int sizeValue(KPanelExtension::Size s);
 
 /**
  * Pixel sizes for but sizes and margins
  */
-KDE_EXPORT int maxButtonDim();
+TDE_EXPORT int maxButtonDim();
 
 /**
  * Tint the image to reflect the current color scheme
  * Used, for instance, by KMenu side bar
  */
-KDE_EXPORT void colorize(TQImage& image);
+TDE_EXPORT void colorize(TQImage& image);
 
 /**
  * Blend a color rectangle on a painter
  */
-KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40);
+TDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40);
 
 /**
  * Blend two colours together to get a colour halfway in between
  */
-KDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2);
+TDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2);
 
 /**
  * Create or copy .desktop files for use in kicker safely and easily
  */
-KDE_EXPORT TQString copyDesktopFile(const KURL&url);
-KDE_EXPORT TQString newDesktopFile(const KURL&url);
+TDE_EXPORT TQString copyDesktopFile(const KURL&url);
+TDE_EXPORT TQString newDesktopFile(const KURL&url);
 
 
 /**
@@ -80,7 +80,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url);
  * This function checks whether that is the case and returns either the
  * original menu or the sub-menu when appropriate.
  */
-KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
+TDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
 
 
 /**
@@ -88,7 +88,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *);
  * direction, the size of the menu, the widget geometry, and a optional
  * point in the local coordinates of the widget.
  */
-KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
+TDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
                                 const TQWidget* popup,
                                 const TQWidget* source,
                                 const TQPoint& offset = TQPoint(0, 0));
@@ -97,7 +97,7 @@ KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d,
  * Calculate an acceptable inverse of the given color wich will be used
  * as the shadow color.
  */
-KDE_EXPORT TQColor shadowColor(const TQColor& c);
+TDE_EXPORT TQColor shadowColor(const TQColor& c);
 
 /**
  * Get an appropriate for a menu in Plasma. As the user may set this size
@@ -105,7 +105,7 @@ KDE_EXPORT TQColor shadowColor(const TQColor& c);
  * @param icon the name of icon requested
  * @return the icon set for the requested icon
  */
-KDE_EXPORT TQIconSet menuIconSet(const TQString& icon);
+TDE_EXPORT TQIconSet menuIconSet(const TQString& icon);
 
 }
 
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 9951fe9e1..9c38534c5 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -44,8 +44,8 @@
    </entry>
 
 <entry name="MenubarPanelBlurred" type="Bool" >
-      <label>Enable blurring for menubar panel</label>
-      <whatsthis>When this option is enabled, the panel containing the menubar will blur pseudo-transparent image</whatsthis>
+      <label>Enable blurring for menubar panel (deprecated)</label>
+      <whatsthis>This option is deprecated, use MenubarPanelBlur</whatsthis>
       <default>false</default>
    </entry>
 
@@ -79,6 +79,14 @@
       <max>100</max>
    </entry>
 
+<entry name="BlurValue" type="Int" >
+      <label>Blur strength</label>
+      <whatsthis>Set blur effect strenght for the panel. Set to 0 to disable blur.</whatsthis>
+      <default>0</default>
+      <min>0</min>
+      <max>10</max>
+   </entry>
+
 <entry name="TintColor" type="Color" >
       <label>The tint color used to colorize transparent panels</label>
       <default code="true">(TQApplication::palette().active().mid())</default>
diff --git a/kicker/libkicker/kickerSettings.kcfgc b/kicker/libkicker/kickerSettings.kcfgc
index 8e0b42d93..1ac8fa567 100644
--- a/kicker/libkicker/kickerSettings.kcfgc
+++ b/kicker/libkicker/kickerSettings.kcfgc
@@ -2,7 +2,7 @@ File=kickerSettings.kcfg
 Singleton=true
 ClassName=KickerSettings
 Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
 IncludeFiles=tqapplication.h
 GlobalEnums=true
 MemberVariables=dpointer
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index b3716a871..d0aab24de 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -80,9 +80,9 @@ KickerTip::KickerTip(TQWidget * parent)
     setBackgroundMode(NoBackground);
     resize(0, 0);
     hide();
-    connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate()));
+    connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate()));
 //     // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from?
-//     connect(kapp, TQT_SIGNAL(settingsChanged(SettingsCategory)), TQT_SLOT(slotSettingsChanged()));
+//     connect(tdeApp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged()));
 }
 
 KickerTip::~KickerTip()
@@ -176,8 +176,8 @@ void KickerTip::display()
     // close the message window after given mS
     if (data.duration > 0)
     {
-        disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-        connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
+        disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+        connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()));
         m_timer.start(data.duration, true);
     }
     else
@@ -424,16 +424,16 @@ void KickerTip::tipFor(const TQWidget* w)
 {
     if (m_tippingFor)
     {
-        disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
-                   this, TQT_SLOT(tipperDestroyed(TQObject*)));
+        disconnect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)),
+                   this, TQ_SLOT(tipperDestroyed(TQObject*)));
     }
 
     m_tippingFor = w;
 
     if (m_tippingFor)
     {
-        connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)),
-                this, TQT_SLOT(tipperDestroyed(TQObject*)));
+        connect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)),
+                this, TQ_SLOT(tipperDestroyed(TQObject*)));
     }
 }
 
@@ -452,7 +452,7 @@ void KickerTip::tipperDestroyed(TQObject* o)
 {
     // we can't do a dynamic cast because we are in the process of dying
     // so static it is.
-    untipFor(TQT_TQWIDGET(o));
+    untipFor(static_cast<TQWidget*>(o));
 }
 
 void KickerTip::internalUpdate()
@@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
         return false;
     }
 
-    TQWidget *widget = TQT_TQWIDGET(object);
+    TQWidget *widget = static_cast<TQWidget*>(object);
 
     switch (event->type())
     {
@@ -526,8 +526,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
 
                 tipFor(widget);
                 m_timer.stop();
-                disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-                connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display()));
+                disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+                connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(display()));
 
                 // delay to avoid false starts
                 // e.g. when the user quickly zooms their mouse over
@@ -547,8 +547,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
 
             if (isTippingFor(widget) && isVisible())
             {
-                disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0);
-                connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide()));
+                disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0);
+                connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide()));
                 m_timer.start(KickerSettings::mouseOversHideDelay(), true);
             }
 
diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h
index 7295b4efa..bcc956eee 100644
--- a/kicker/libkicker/kickertip.h
+++ b/kicker/libkicker/kickertip.h
@@ -38,7 +38,7 @@ class TQPaintEvent;
 class TQSimpleRichText;
 class TQTimer;
 
-class KDE_EXPORT KickerTip : public TQWidget
+class TDE_EXPORT KickerTip : public TQWidget
 {
     TQ_OBJECT
 
@@ -58,7 +58,7 @@ public:
             TQMimeSourceFactory* mimeFactory;
     };
 
-    class KDE_EXPORT Client
+    class TDE_EXPORT Client
     {
         public:
             virtual void updateKickerTip(KickerTip::Data&) = 0;
diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h
index 1ddc093ff..ae423d0bc 100644
--- a/kicker/libkicker/kshadowengine.h
+++ b/kicker/libkicker/kshadowengine.h
@@ -28,7 +28,7 @@
 #include <tqimage.h>
 #include <tqcolor.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KShadowSettings;
 
@@ -40,7 +40,7 @@ class KShadowSettings;
  * @author laur.ivan@corvil.com
  * @since 3.2
  */
-class KDE_EXPORT KShadowEngine
+class TDE_EXPORT KShadowEngine
 {
 public:
     /// Creates a new shadow engine.
@@ -112,7 +112,7 @@ private:
     void *d;
 };
 
-class KDE_EXPORT KTextShadowEngine : public KShadowEngine
+class TDE_EXPORT KTextShadowEngine : public KShadowEngine
 {
 public:
     KTextShadowEngine();
diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h
index e222b964d..a328fd8bd 100644
--- a/kicker/libkicker/kshadowsettings.h
+++ b/kicker/libkicker/kshadowsettings.h
@@ -22,7 +22,7 @@
 #ifndef __FX_DATA
 #define __FX_DATA
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define SHADOW_CONFIG_ENTRY TQString("ShadowParameters")
 #define SHADOW_TEXT_COLOR TQString("ShadowTextColor")
@@ -41,7 +41,7 @@
  * @author laur.ivan@corvil.com
  * @since 3.2
  */
-class KDE_EXPORT KShadowSettings
+class TDE_EXPORT KShadowSettings
 {
 	public:
 		/**
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index a8e4bf1fa..9e275f90c 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -27,25 +27,25 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqwidget.h>
 
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <klibloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kpanelmenu.h>
 #include <tdeparts/componentfactory.h>
 
 MenuInfo::MenuInfo(const TQString& desktopFile)
 {
-    KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
+    TDESimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile)));
     df.setGroup("Desktop Entry");
 
     TQStringList list = df.readListEntry("X-TDE-AuthorizeAction");
-    if (kapp && !list.isEmpty())
+    if (tdeApp && !list.isEmpty())
     {
        for(TQStringList::ConstIterator it = list.begin();
            it != list.end();
            ++it)
        {
-          if (!kapp->authorize((*it).stripWhiteSpace()))
+          if (!tdeApp->authorize((*it).stripWhiteSpace()))
              return;
        }
     }
@@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name)
 
     return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>(
                TQFile::encodeName( library_ ),
-               TQT_TQOBJECT(parent), name );
+               parent, name );
 }
diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h
index 5925d4826..8b5917992 100644
--- a/kicker/libkicker/menuinfo.h
+++ b/kicker/libkicker/menuinfo.h
@@ -26,12 +26,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqstring.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KPanelMenu;
 class TQWidget;
 
-class KDE_EXPORT MenuInfo
+class TDE_EXPORT MenuInfo
 {
 public:
     MenuInfo(const TQString& desktopFile);
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index aef83bbb3..42e5286e2 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kicontheme.h>
 #include <kiconeffect.h>
 #include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 
@@ -89,12 +89,12 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     updateSettings(TDEApplication::SETTINGS_MOUSE);
 
-    kapp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
+    tdeApp->addKipcEventMask(KIPC::SettingsChanged | KIPC::IconChanged);
 
     installEventFilter(KickerTip::the());
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
+    connect(tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
 }
 
 void PanelButton::configure()
@@ -225,10 +225,10 @@ void PanelButton::updateSettings(int category)
         return;
     }
 
-    if (m_forceStandardCursor == FALSE)
+    if (!m_forceStandardCursor)
         m_changeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
     else
-        m_changeCursorOverItem = FALSE;
+        m_changeCursorOverItem = false;
 
     if (m_changeCursorOverItem)
     {
@@ -245,7 +245,7 @@ void PanelButton::checkForDeletion(const TQString& path)
     if (path == m_backingFile)
     {
         setEnabled(false);
-        TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval()));
+        TQTimer::singleShot(1000, this, TQ_SLOT(scheduleForRemoval()));
     }
 }
 
@@ -278,7 +278,7 @@ void PanelButton::scheduleForRemoval()
         }
 
         timelapse *= 2;
-        TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval()));
+        TQTimer::singleShot(timelapse, this, TQ_SLOT(scheduleForRemoval()));
     }
 }
 
@@ -436,7 +436,7 @@ void PanelButton::startDrag()
 
 void PanelButton::enterEvent(TQEvent* e)
 {
-    if (!m_highlight && m_disableHighlighting == FALSE)
+    if (!m_highlight && !m_disableHighlighting)
     {
         m_highlight = true;
         repaint(false);
@@ -602,7 +602,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
         style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
     }
 
-    drawButtonLabel(p,0,FALSE);
+    drawButtonLabel(p,0,false);
 
     if (hasFocus() || m_hasAcceptedDrag)
     {
@@ -616,7 +616,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
 
 void PanelButton::drawButtonLabel(TQPainter *p)
 {
-    drawButtonLabel(p,0,TRUE);
+    drawButtonLabel(p,0,true);
 }
 
 void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
@@ -833,16 +833,16 @@ void PanelButton::backedByFile(const TQString& localFilePath)
     }
 
     // avoid multiple connections
-    disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
-               this, TQT_SLOT(checkForDeletion(const TQString&)));
+    disconnect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),
+               this, TQ_SLOT(checkForDeletion(const TQString&)));
 
     if (!KDirWatch::self()->contains(m_backingFile))
     {
         KDirWatch::self()->addFile(m_backingFile);
     }
 
-    connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),
-            this, TQT_SLOT(checkForDeletion(const TQString&)));
+    connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),
+            this, TQ_SLOT(checkForDeletion(const TQString&)));
 
 }
 
@@ -966,7 +966,7 @@ PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name, bool forc
     m_pressedDuringPopup(false),
     m_initialized(false)
 {
-    connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu()));
+    connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotExecMenu()));
 }
 
 void PanelPopupButton::setPopup(TQWidget *popup)
@@ -974,7 +974,7 @@ void PanelPopupButton::setPopup(TQWidget *popup)
     if (m_popup)
     {
         m_popup->removeEventFilter(this);
-        disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
+        disconnect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide()));
     }
 
     m_popup = popup;
@@ -983,7 +983,7 @@ void PanelPopupButton::setPopup(TQWidget *popup)
     if (m_popup)
     {
         m_popup->installEventFilter(this);
-        connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide()));
+        connect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide()));
     }
 }
 
@@ -1057,8 +1057,8 @@ void PanelPopupButton::slotExecMenu()
 
     m_pressedDuringPopup = false;
     KickerTip::enableTipping(false);
-    kapp->syncX();
-    kapp->processEvents();
+    tdeApp->syncX();
+    tdeApp->processEvents();
 
     if (!m_initialized)
     {
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index cea132680..dda35d398 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -43,7 +43,7 @@ class KShadowEngine;
  * placed in Kicker's panels. It inherits TQButton, and
  * KickerTip::Client.
  */
-class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client
+class TDE_EXPORT PanelButton: public TQButton, public KickerTip::Client
 {
     TQ_OBJECT
 
@@ -53,7 +53,7 @@ public:
      * @param parent the parent widget
      * @param name the widget's name
      */
-    PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = FALSE );
+    PanelButton( TQWidget* parent, const char* name, bool forceStandardCursor = false );
 
     /**
      * Configures this button according to the user's preferences for
@@ -420,7 +420,7 @@ private:
 /**
  * Base class for panelbuttons which popup a menu
  */
-class KDE_EXPORT PanelPopupButton : public PanelButton
+class TDE_EXPORT PanelPopupButton : public PanelButton
 {
     TQ_OBJECT
 
@@ -430,7 +430,7 @@ public:
     * @param parent the parent widget
     * @param name the widget's name
     */
-    PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = FALSE);
+    PanelPopupButton(TQWidget *parent=0, const char *name=0, bool forceStandardCursor = false);
 
     /**
      * Sets the button's popup menu.
diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h
index 6684c32c6..21bb879d3 100644
--- a/kicker/libkicker/paneldrag.h
+++ b/kicker/libkicker/paneldrag.h
@@ -26,13 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqdragobject.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "appletinfo.h"
 
 class BaseContainer;
 
-class KDE_EXPORT PanelDrag : public TQDragObject
+class TDE_EXPORT PanelDrag : public TQDragObject
 {
     public:
         PanelDrag(BaseContainer* container, TQWidget *dragSource);
@@ -48,7 +48,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject
         TQByteArray a;
 };
 
-class KDE_EXPORT AppletInfoDrag : public TQDragObject
+class TDE_EXPORT AppletInfoDrag : public TQDragObject
 {
     public:
         AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource);
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index a868747fb..0401cfcdc 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -46,7 +46,7 @@ Panner::Panner( TQWidget* parent, const char* name )
     setBackgroundOrigin( AncestorOrigin );
 
     _updateScrollButtonsTimer = new TQTimer(this);
-    connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons()));
+    connect(_updateScrollButtonsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reallyUpdateScrollButtons()));
 
     _clipper = new TQWidget(this);
     _clipper->setBackgroundOrigin(AncestorOrigin);
@@ -78,8 +78,8 @@ void Panner::createScrollButtons()
     _luSB->setMinimumSize(12, 12);
     _luSB->hide();
     _layout->addWidget(_luSB);
-    connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp()));
-    connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
+    connect(_luSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollLeftUp()));
+    connect(_luSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll()));
 
     // right/down scroll button
     _rdSB = new SimpleArrowButton(this);
@@ -88,8 +88,8 @@ void Panner::createScrollButtons()
     _rdSB->setMinimumSize(12, 12);
     _rdSB->hide();
     _layout->addWidget(_rdSB);
-    connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown()));
-    connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll()));
+    connect(_rdSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollRightDown()));
+    connect(_rdSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll()));
 
     // set up the buttons
     setupButtons();
@@ -170,7 +170,7 @@ void Panner::scrollLeftUp()
 void Panner::startScrollRightDown()
 {
     _scrollTimer = new TQTimer(this);
-    connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown()));
+    connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollRightDown()));
     _scrollTimer->start(50);
     _step = 8;
     scrollRightDown();
@@ -179,7 +179,7 @@ void Panner::startScrollRightDown()
 void Panner::startScrollLeftUp()
 {
     _scrollTimer = new TQTimer(this);
-    connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp()));
+    connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollLeftUp()));
     _scrollTimer->start(50);
     _step = 8;
     scrollLeftUp();
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index 36305bb0c..6d73ba5a8 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQBoxLayout;
 class TQTimer;
 
-class KDE_EXPORT Panner : public TQWidget
+class TDE_EXPORT Panner : public TQWidget
 {
     TQ_OBJECT
 
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index c53d6ce5a..6836e06eb 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -30,7 +30,7 @@
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kipc.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kickerSettings.h"
 
@@ -47,13 +47,13 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
-       TQT_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
-       TQT_SLOT( slotIconChanged( int ) ) );
+    connect( tdeApp, TQ_SIGNAL( settingsChanged( int ) ),
+       TQ_SLOT( slotSettingsChanged( int ) ) );
+    connect( tdeApp, TQ_SIGNAL( iconChanged( int ) ),
+       TQ_SLOT( slotIconChanged( int ) ) );
 
-    kapp->addKipcEventMask( KIPC::SettingsChanged );
-    kapp->addKipcEventMask( KIPC::IconChanged );
+    tdeApp->addKipcEventMask( KIPC::SettingsChanged );
+    tdeApp->addKipcEventMask( KIPC::IconChanged );
 
     slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
 }
@@ -95,7 +95,7 @@ void SimpleButton::drawButton( TQPainter *p )
 {
     TQRect r(0, 0, width(), height());
 
-    if (m_disableHighlighting == TRUE) {
+    if (m_disableHighlighting) {
         if (m_highlight || isDown() || isOn()) {
             int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
             if (isDown() || isOn()) flags |= TQStyle::Style_Down;
@@ -115,13 +115,13 @@ void SimpleButton::drawButtonLabel( TQPainter *p )
 
     TQPixmap pix = isEnabled() ? ((m_highlight&&(!m_disableHighlighting))? m_activeIcon : m_normalIcon) : m_disabledIcon;
 
-    if ((isOn() || isDown()) && (m_disableHighlighting == FALSE))
+    if ((isOn() || isDown()) && !m_disableHighlighting)
     {
         pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 2,
                                                pix.height() - 2);
     }
 
-    if (m_disableHighlighting == TRUE) {
+    if (m_disableHighlighting) {
         pix = TQImage(pix.convertToImage()).smoothScale(pix.width() - 4,
                                                pix.height() - 4);
     }
@@ -171,10 +171,10 @@ void SimpleButton::slotSettingsChanged(int category)
     }
 
     bool changeCursor;
-    if (m_forceStandardCursor == FALSE)
+    if (!m_forceStandardCursor)
         changeCursor = TDEGlobalSettings::changeCursorOverIcon();
     else
-        changeCursor = FALSE;
+        changeCursor = false;
 
     if (changeCursor)
     {
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index 7f1718273..9a7dce4e8 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -24,14 +24,14 @@
 #include <tqbutton.h>
 #include <tqpixmap.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
-class KDE_EXPORT SimpleButton : public TQButton
+class TDE_EXPORT SimpleButton : public TQButton
 {
     TQ_OBJECT
 
     public:
-        SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE);
+        SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = false);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(TQt::Orientation orientaton);
         TQSize sizeHint() const;
@@ -61,12 +61,12 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButtonPrivate* d;
 };
 
-class KDE_EXPORT SimpleArrowButton: public SimpleButton
+class TDE_EXPORT SimpleArrowButton: public SimpleButton
 {
     TQ_OBJECT
     
     public:
-        SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
+        SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = false);
         virtual ~SimpleArrowButton() {};
         TQSize sizeHint() const;
     
diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index a45bdabb5..3084e74b0 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -23,8 +23,8 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include "findmenu.h"
 
@@ -52,7 +52,7 @@ void FindMenu::initialize()
 
   mConfigList.clear();
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
-    KSimpleConfig config( *it, true );
+    TDESimpleConfig config( *it, true );
     config.setDesktopGroup();
 
     mConfigList.append( *it );
@@ -67,13 +67,13 @@ void FindMenu::slotExec( int pos )
 {
   TQString app = mConfigList[ pos ];
 
-  kapp->propagateSessionManager();
+  tdeApp->propagateSessionManager();
 
-  KSimpleConfig config(app, true);
+  TDESimpleConfig config(app, true);
   config.setDesktopGroup();
-  if (kapp && config.readEntry("Type") == "Link")
+  if (tdeApp && config.readEntry("Type") == "Link")
   {
-    kapp->invokeBrowser(config.readEntry("URL"));
+    tdeApp->invokeBrowser(config.readEntry("URL"));
   }
   else
   {
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index c992cf855..198cb4f7a 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -29,8 +29,8 @@
 #include <klibloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include <tqvalidator.h>
 
@@ -80,7 +80,7 @@ void KateSessionMenu::initialize()
   if (TDEGlobal::dirs()->exists(configFile))
   {
     // Read new style configuration (from TDE R14.1.0)
-    KSimpleConfig *config = new KSimpleConfig(configFile, true);
+    TDESimpleConfig *config = new TDESimpleConfig(configFile, true);
     config->setGroup("Sessions list");
     int sessionsCount = config->readNumEntry("Sessions count", 0);
     for (int i = 0;  i < sessionsCount;  ++i)
@@ -89,7 +89,7 @@ void KateSessionMenu::initialize()
       if (!urlStr.isEmpty() && TDEGlobal::dirs()->exists(urlStr))
       {
         // Filter out empty URLs or non existing sessions
-        KSimpleConfig *sessionConfig = new KSimpleConfig(urlStr, true);
+        TDESimpleConfig *sessionConfig = new TDESimpleConfig(urlStr, true);
         sessionConfig->setGroup("General");
         // Session general properties
         TQString sessionName = sessionConfig->readEntry("Name", i18n("Unnamed"));
@@ -102,7 +102,7 @@ void KateSessionMenu::initialize()
     TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kate/sessions/*.katesession", false, true);
     for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-      KSimpleConfig config( *it, true );
+      TDESimpleConfig config( *it, true );
       config.setGroup( "General" );
       m_sessions.append( config.readEntry( "Name" ) );
     }
@@ -117,7 +117,7 @@ void KateSessionMenu::initialize()
 
   // means for updating, to let the user manually update if he/she added new sessions.
   insertSeparator();
-  insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reloadSessionsList()) );
+  insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQ_SLOT(reloadSessionsList()) );
 }
 
 void KateSessionMenu::slotExec( int id )
@@ -136,7 +136,7 @@ void KateSessionMenu::slotExec( int id )
     TQString name = KInputDialog::getText( i18n("Session Name"),
                                           i18n("Please enter a name for the new session"),
                                           TQString::null,
-                                          &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) );
+                                          &ok, 0, 0, new Validator( m_parent ) );
     if ( ! ok )
       return;
 
@@ -167,7 +167,7 @@ void KateSessionMenu::slotExec( int id )
   else if ( id > 2 )
     args << m_sessions[ id-3 ];
 
-  kapp->tdeinitExec("kate", args);
+  tdeApp->tdeinitExec("kate", args);
 }
 
 void KateSessionMenu::reloadSessionsList()
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index 321d9ac59..46d0faa9e 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -27,9 +27,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/global.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include <tqregexp.h>
 #include <tqfileinfo.h>
@@ -65,7 +65,7 @@ void KonquerorProfilesMenu::initialize()
       TQFileInfo info( *pIt );
       TQString profileName = TDEIO::decodeFileName( info.baseName() );
       TQString niceName=profileName;
-      KSimpleConfig cfg( *pIt, true );
+      TDESimpleConfig cfg( *pIt, true );
       if ( cfg.hasGroup( "Profile" ) )
       {
          cfg.setGroup( "Profile" );
@@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id)
 {
    TQStringList args;
    args<<"--profile"<<m_profiles[id-1];
-   kapp->tdeinitExec("konqueror", args);
+   tdeApp->tdeinitExec("konqueror", args);
 }
 
 void KonquerorProfilesMenu::reload()
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index c9439c8db..709cde6c7 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -37,8 +37,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <krun.h>
 #include <kshell.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include "konsole_mnu.h"
 
@@ -91,7 +91,7 @@ void KonsoleMenu::initialize()
     }
     else
     {
-        kapp->iconLoader()->addAppDir("konsole");
+        tdeApp->iconLoader()->addAppDir("konsole");
     }
 
     setInitialized(true);
@@ -113,7 +113,7 @@ void KonsoleMenu::initialize()
            continue;
         }
 
-        KSimpleConfig conf(*it, true /* read only */);
+        TDESimpleConfig conf(*it, true /* read only */);
         conf.setDesktopGroup();
         TQString text = conf.readEntry("Name");
 
@@ -150,8 +150,8 @@ void KonsoleMenu::initialize()
     insertItem(SmallIconSet("keditbookmarks"),
                i18n("New Session at Bookmark"), m_bookmarksSession);
     connect(m_bookmarkHandlerSession,
-            TQT_SIGNAL(openURL(const TQString&, const TQString&)),
-            TQT_SLOT(newSession(const TQString&, const TQString&)));
+            TQ_SIGNAL(openURL(const TQString&, const TQString&)),
+            TQ_SLOT(newSession(const TQString&, const TQString&)));
 
 
     screenList.clear();
@@ -207,7 +207,7 @@ void KonsoleMenu::initialize()
         TQFileInfo info(*pIt);
         TQString profileName = TDEIO::decodeFileName(info.baseName());
         TQString niceName = profileName;
-        KSimpleConfig cfg(*pIt, true);
+        TDESimpleConfig cfg(*pIt, true);
         if (cfg.hasGroup("Profile"))
         {
             cfg.setGroup("Profile");
@@ -229,11 +229,11 @@ void KonsoleMenu::initialize()
         // we don't have any profiles, disable the menu
         setItemEnabled(profileID, false);
     }
-    connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int)));
+    connect(m_profileMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(launchProfile(int)));
 
     insertSeparator();
     insertItem(SmallIconSet("reload"),
-               i18n("Reload Sessions"), this, TQT_SLOT(reinitialize()));
+               i18n("Reload Sessions"), this, TQ_SLOT(reinitialize()));
 }
 
 void KonsoleMenu::slotExec(int id)
@@ -244,7 +244,7 @@ void KonsoleMenu::slotExec(int id)
     }
 
     --id;
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     TQStringList args;
     if (static_cast<unsigned int>(id) < sessionList.count())
     {
@@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id)
     // this is a session, not a bookmark, so execute that instead
    TQStringList args;
    args << "--profile" << m_profiles[id];
-   kapp->tdeinitExec("konsole", args);
+   tdeApp->tdeinitExec("konsole", args);
 }
 
 KURL KonsoleMenu::baseURL() const
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 9ace6483e..1b1254a54 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -9,7 +9,7 @@
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "konsole_mnu.h"
 #include "konsolebookmarkmenu.h"
@@ -38,8 +38,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
     manager->setUpdate( true );
     manager->setShowNSBookmarks( false );
 
-    connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
+    connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
     m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
                              NULL, false, /*Not toplevel*/
 			     false /*No 'Add Bookmark'*/ );
@@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path,
 
     KNSBookmarkImporter importer( path );
     connect( &importer,
-             TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
-             TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
+             TQ_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
+             TQ_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
     connect( &importer,
-             TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
-             TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
-    connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ));
-    connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() ));
+             TQ_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
+             TQ_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
+    connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ));
+    connect( &importer, TQ_SIGNAL( endMenu() ), TQ_SLOT( endMenu() ));
 
     importer.parseNSBookmarks( false );
 
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 52588ed72..811cc3f29 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -7,7 +7,7 @@
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 //#include <kbookmarkmenu.h>
 
 #include "konsole_mnu.h"
@@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
     /*
      * First, we disconnect KBookmarkMenu::slotAboutToShow()
      * Then,  we connect    KonsoleBookmarkMenu::slotAboutToShow().
-     * They are named differently because the TQT_SLOT() macro thinks we want
+     * They are named differently because the TQ_SLOT() macro thinks we want
      * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
      * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
      */
-    disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
-                TQT_SLOT( slotAboutToShow() ) );
-    connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
-             TQT_SLOT( slotAboutToShow2() ) );
+    disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this,
+                TQ_SLOT( slotAboutToShow() ) );
+    connect( _parentMenu, TQ_SIGNAL( aboutToShow() ),
+             TQ_SLOT( slotAboutToShow2() ) );
 }
 
 /*
@@ -100,8 +100,8 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
                                          m_actionCollection, false,
 					 m_bAddBookmark, TQString::null );
       m_lstSubMenus.append(subMenu);
-      connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu,
-               TQT_SLOT(slotNSLoad()));
+      connect( actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu,
+               TQ_SLOT(slotNSLoad()));
     }
   }
 
@@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
         // create a normal URL item, with ID as a name
         TDEAction * action = new TDEAction( text, bm.icon(), 0,
-                                        this, TQT_SLOT( slotBookmarkSelected() ),
+                                        this, TQ_SLOT( slotBookmarkSelected() ),
                                         m_actionCollection, bm.url().url().utf8() );
 
         action->setStatusText( bm.url().prettyURL() );
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 2ab6afc2c..6df543bc3 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdesycoca.h>
 #include <kurl.h>
 #include <kurldrag.h>
@@ -60,11 +60,11 @@ PrefMenu::PrefMenu(const TQString& label,
 {
     m_subMenus.setAutoDelete(true);
 
-    connect(KSycoca::self(),  TQT_SIGNAL(databaseChanged()),
-            this, TQT_SLOT(clearOnClose()));
+    connect(KSycoca::self(),  TQ_SIGNAL(databaseChanged()),
+            this, TQ_SLOT(clearOnClose()));
 
-    connect(this, TQT_SIGNAL(aboutToHide()),
-            this, TQT_SLOT(aboutToClose()));
+    connect(this, TQ_SIGNAL(aboutToHide()),
+            this, TQ_SLOT(aboutToClose()));
 }
 
 PrefMenu::~PrefMenu()
@@ -198,7 +198,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
     // If the path to the desktop file is relative, try to get the full
     // path from KStdDirs.
     KURLDrag *d = new KURLDrag(KURL::List(url), this);
-    connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed()));
+    connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(dragObjectDestroyed()));
     d->setPixmap(icon);
     d->dragCopy();
 
@@ -246,7 +246,7 @@ void PrefMenu::initialize()
     {
         insertItem(KickerLib::menuIconSet("kcontrol"),
                    i18n("Trinity Control Center"),
-                   this, TQT_SLOT(launchControlCenter()));
+                   this, TQ_SLOT(launchControlCenter()));
         insertSeparator();
     }
 
@@ -328,7 +328,7 @@ void PrefMenu::slotExec(int id)
         return;
     }
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     KSycocaEntry *e = m_entryMap[id];
     KService::Ptr service = static_cast<KService *>(e);
     TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
@@ -358,7 +358,7 @@ void PrefMenu::slotClear()
         // QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
         // and also before a click in the menu is handled, so do the clearing
         // only after that has been handled
-        TQTimer::singleShot( 100, this, TQT_SLOT( slotClear()));
+        TQTimer::singleShot( 100, this, TQ_SLOT( slotClear()));
         return;
     }
 
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index ae4137017..df583f3f3 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <tdelocale.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <kurldrag.h>
@@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu()
 void RecentDocsMenu::initialize() {
 	if (initialized()) clear();
 
-	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory()));
+	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQ_SLOT(slotClearHistory()));
 	insertSeparator();
 
 	_fileList = TDERecentDocument::recentDocuments();
@@ -67,7 +67,7 @@ void RecentDocsMenu::initialize() {
 	char alreadyPresentInMenu;
 	TQStringList previousEntries;
 	for (TQStringList::ConstIterator it = _fileList.begin(); it != _fileList.end(); ++it) {
-		KDesktopFile f(*it, true /* read only */);
+		TDEDesktopFile f(*it, true /* read only */);
 
 		// Make sure this entry is not already present in the menu
 		alreadyPresentInMenu = 0;
@@ -96,7 +96,7 @@ void RecentDocsMenu::slotClearHistory() {
 
 void RecentDocsMenu::slotExec(int id) {
 	if (id >= 0) {
-		kapp->propagateSessionManager();
+		tdeApp->propagateSessionManager();
 		KURL u;
 		u.setPath(_fileList[id]);
 		KDEDesktopMimeType::run(u, true);
@@ -128,7 +128,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
 	if (id < 0)
 		return;
 
-	KDesktopFile f(_fileList[id], true /* read only */);
+	TDEDesktopFile f(_fileList[id], true /* read only */);
 
 	KURL url ( f.readURL() );
 
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index aeaff8e94..b9556a15a 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -21,10 +21,10 @@
 
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <krun.h>
 #include <kiconloader.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kservice.h>
 
 #include <tqpixmap.h>
@@ -68,9 +68,9 @@ void RemoteMenu::initialize()
     }
 
     id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder"));
-    connectItem(id, this, TQT_SLOT(startWizard()));
+    connectItem(id, this, TQ_SLOT(startWizard()));
     id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders"));
-    connectItem(id, this, TQT_SLOT(openRemoteDir()));
+    connectItem(id, this, TQ_SLOT(openRemoteDir()));
 
     insertSeparator();
 
@@ -97,7 +97,7 @@ void RemoteMenu::initialize()
             {
                 names_found.append(*name);
                 TQString filename = *dirpath+*name;
-                KDesktopFile desktop(filename);
+                TDEDesktopFile desktop(filename);
                 id = insertItem(SmallIcon(desktop.readIcon()), desktop.readName());
                 m_desktopMap[id] = filename;
             }
diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp
index 12ec087d8..e738e7af9 100644
--- a/kicker/menuext/system/systemmenu.cpp
+++ b/kicker/menuext/system/systemmenu.cpp
@@ -32,8 +32,8 @@ SystemMenu::SystemMenu(TQWidget *parent, const char *name,
                        const TQStringList &/*args*/)
   : KPanelMenu( parent, name)
 {
-    connect( &m_dirLister, TQT_SIGNAL( completed() ),
-             this, TQT_SLOT( slotCompleted() ) );
+    connect( &m_dirLister, TQ_SIGNAL( completed() ),
+             this, TQ_SLOT( slotCompleted() ) );
 
     m_dirLister.openURL(KURL("system:/"));
 }
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index 3a1b31145..c0ca57d7c 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID)
     switch (ID)
     {
         case ADD_PRINTER_ID:
-            kapp->tdeinitExec("kaddprinterwizard");
+            tdeApp->tdeinitExec("kaddprinterwizard");
             break;
         case TDEPRINT_SETTINGS_ID:
-	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
+	    tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
             break;
 	case CONFIG_SERVER_ID:
-	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
+	    tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
 	    break;
         case PRINT_MANAGER_ID:
             KRun::runCommand("tdecmshell tde-printers.desktop");
@@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID)
             KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
             break;
 	case KPRINTER_ID:
-	    kapp->tdeinitExec("kprinter");
+	    tdeApp->tdeinitExec("kprinter");
 	    break;
         default:
             {
                 // start kjobviewer
                 TQStringList args;
                 args << "--show" << "-d" << text(ID).remove('&');
-                kapp->tdeinitExec("kjobviewer", args);
+                tdeApp->tdeinitExec("kjobviewer", args);
             }
             break;
     }
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index ed07468de..5f42bd0f0 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -47,7 +47,7 @@ using namespace std;
 #include <tderecentdocument.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstdaction.h>
 #include <tdesycocaentry.h>
 
@@ -62,7 +62,7 @@ const int destMenuTitleID = 10001;
 
 extern "C"
 {
-    KDE_EXPORT void* init_kickermenu_tom()
+    TDE_EXPORT void* init_kickermenu_tom()
     {
         TDEGlobal::locale()->insertCatalogue("libkickermenu_tom");
         return new TOMFactory;
@@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
             TQPainter p(this);
             TQRect r(rect());
             // ew, nasty hack. may result in coredumps due to horrid C-style cast???
-            kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
+            tdeApp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
                                       TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium ));
             p.drawPixmap(KDialog::spacingHint(), 1, icon);
             p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
@@ -217,7 +217,7 @@ void TOM::initializeRecentDocs()
 {
     m_recentDocsMenu->clear();
     m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"),
-                                 this, TQT_SLOT(clearRecentDocHistory()));
+                                 this, TQ_SLOT(clearRecentDocHistory()));
     m_recentDocsMenu->insertSeparator();
 
     m_recentDocURLs = TDERecentDocument::recentDocuments();
@@ -237,7 +237,7 @@ void TOM::initializeRecentDocs()
          * TODO: make the number of visible items configurable?
          */
 
-        KDesktopFile f(*it, true /* read only */);
+        TDEDesktopFile f(*it, true /* read only */);
         m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), TDEIcon::SizeMedium),
                                      f.readName().replace('&', "&&"), id);
         ++id;
@@ -365,13 +365,13 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
         return 0;
     }
 
-    connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int)));
+    connect(taskGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(runTask(int)));
     // so we have an actual task group menu with tasks, let's add it
 
     if (inSubMenu)
     {
-        TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
-                         this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
+        TQObject::connect(taskGroup, TQ_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
+                         this, TQ_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
 
         m_submenus.append(taskGroup);
 
@@ -389,7 +389,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
             rmbMenu->insertItem(title, contextMenuTitleID);
             rmbMenu->insertItem(i18n("Add This Task to Panel"));
             rmbMenu->insertItem(i18n("Modify This Task..."));
-            rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask()));
+            rmbMenu->insertItem(i18n("Remove This Task..."), this, TQ_SLOT(removeTask()));
             rmbMenu->insertItem(i18n("Insert New Task..."));
         }
     }
@@ -432,7 +432,7 @@ void TOM::initialize()
     }
     else
     {
-      connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+      connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
     }*/
 
     // TASKS
@@ -484,9 +484,9 @@ void TOM::initialize()
     {
         removeItem(destMenuTitleID);
     }
-    else if (kapp->authorize("run_command"))
+    else if (tdeApp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
 
     // RECENTLY USED ITEMS
@@ -494,8 +494,8 @@ void TOM::initialize()
 
     m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs");
     m_recentDocsMenu->setFont(m_largerFont);
-    connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
-    connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
+    connect(m_recentDocsMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(initializeRecentDocs()));
+    connect(m_recentDocsMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openRecentDocument(int)));
     insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
     m_submenus.append(m_recentDocsMenu);
 
@@ -510,9 +510,9 @@ void TOM::initialize()
     insertTitle(i18n("Special Items"), contextMenuTitleID);
 
     // if we have no destinations, put the run command here
-    if (numDests == 0 && kapp->authorize("run_command"))
+    if (numDests == 0 && tdeApp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
 
 
@@ -564,7 +564,7 @@ void TOM::initialize()
     }
 
     insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium),
-               i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
+               i18n("Logout %1").arg(username), this, TQ_SLOT(logout()));
 }
 
 void TOM::reload()
@@ -817,8 +817,8 @@ void TOM::runCommand()
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
 
-    kapp->updateRemoteUserTimestamp( appname );
-    kapp->dcopClient()->send( appname, "KDesktopIface",
+    tdeApp->updateRemoteUserTimestamp( appname );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
 
@@ -826,7 +826,7 @@ void TOM::runTask(int id)
 {
     if (!m_tasks.contains(id)) return;
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
       TQStringList(), 0, 0, 0, "", true);
 }
@@ -840,7 +840,7 @@ void TOM::openRecentDocument(int id)
 {
     if (id >= 0)
     {
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         KURL u;
         u.setPath(m_recentDocURLs[id]);
         KDEDesktopMimeType::run(u, true);
@@ -849,7 +849,7 @@ void TOM::openRecentDocument(int id)
 
 void TOM::logout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 #include "tom.moc"
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index ac2f969d8..1084b5667 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <klibloader.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
@@ -68,7 +68,7 @@ static TDECmdLineOptions options[] =
   TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
 {
     TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.")
                           , "v0.1.0"
@@ -126,7 +126,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
   , _applet(0)
 {
     // try to attach to DCOP server
-    if (!kapp->dcopClient()->attach()) {
+    if (!tdeApp->dcopClient()->attach()) {
 	kdError() << "Failed to attach to DCOP server." << endl;
         KMessageBox::error(0,
                            i18n("The applet proxy could not be started due to DCOP communication problems."),
@@ -134,7 +134,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
 	exit(0);
     }
 
-    if (kapp->dcopClient()->registerAs("applet_proxy", true) == 0) {
+    if (tdeApp->dcopClient()->registerAs("applet_proxy", true) == 0) {
 	kdError() << "Failed to register at DCOP server." << endl;
         KMessageBox::error(0,
                            i18n("The applet proxy could not be started due to DCOP registration problems."),
@@ -147,7 +147,7 @@ AppletProxy::AppletProxy(TQObject* parent, const char* name)
 
 AppletProxy::~AppletProxy()
 {
-    kapp->dcopClient()->detach();
+    tdeApp->dcopClient()->detach();
     delete _info;
     delete _applet;
 }
@@ -197,9 +197,9 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config
     }
 
     // connect updateLayout signal
-    connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
+    connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
     // connect requestFocus signal
-    connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus()));
+    connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(slotRequestFocus()));
 }
 
 KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
@@ -255,11 +255,11 @@ void AppletProxy::dock(const TQCString& callbackID)
     _callbackID = callbackID;
 
     // try to attach to DCOP server
-    DCOPClient* dcop = kapp->dcopClient();
+    DCOPClient* dcop = tdeApp->dcopClient();
 
     dcop->setNotifications(true);
-    connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
-	    TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+    connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+	    TQ_SLOT(slotApplicationRemoved(const TQCString&)));
 
     WId win;
 
@@ -463,7 +463,7 @@ void AppletProxy::slotUpdateLayout()
     else
 	appname.sprintf("kicker-screen-%d", screen_number);
 
-    kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
+    tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
 }
 
 void AppletProxy::slotRequestFocus()
@@ -480,7 +480,7 @@ void AppletProxy::slotRequestFocus()
     else
 	appname.sprintf("kicker-screen-%d", screen_number);
 
-    kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
+    tdeApp->dcopClient()->send(appname, _callbackID, "requestFocus()", data);
 }
 
 void AppletProxy::slotApplicationRemoved(const TQCString& appId)
@@ -496,7 +496,7 @@ void AppletProxy::slotApplicationRemoved(const TQCString& appId)
 
     if(appId == appname) {
 	kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
-	kapp->quit();
+	tdeApp->quit();
     }
 }
 
@@ -510,7 +510,7 @@ void AppletProxy::showStandalone()
     _applet->resize( _applet->widthForHeight( 48 ), 48 );
     _applet->setMinimumSize( _applet->size() );
     _applet->setCaption( _info->name() );
-    kapp->setMainWidget( _applet );
+    tdeApp->setMainWidget( _applet );
     _applet->show();
 }
 
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index c210e7b9e..4591f9c34 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <klibloader.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kpanelextension.h>
@@ -129,7 +129,7 @@ int main( int argc, char ** argv )
     ExtensionContainer *container = new ExtensionContainer( extension );
     container->show();
 
-    TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) );
+    TQObject::connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) );
 
     int result = a.exec();
 
@@ -143,8 +143,8 @@ ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *pa
     ( new TQVBoxLayout( this ) )->setAutoAdd( true );
 
     TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this );
-    connect( configButton, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( showPreferences() ) );
+    connect( configButton, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( showPreferences() ) );
 
     m_extension->reparent( this, TQPoint( 0, 0 ) );
 }
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 13c40e67b..10ab9ff5d 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <klibloader.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kpanelextension.h>
@@ -54,7 +54,7 @@ static TDECmdLineOptions options[] =
   TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char ** argv )
 {
     TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy")
                           , "v0.1.0"
@@ -108,12 +108,12 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
   , _extension(0)
 {
     // try to attach to DCOP server
-    if (!kapp->dcopClient()->attach()) {
+    if (!tdeApp->dcopClient()->attach()) {
 	kdError() << "Failed to attach to DCOP server." << endl;
 	exit(0);
     }
 
-    if (kapp->dcopClient()->registerAs("extension_proxy", true) == 0) {
+    if (tdeApp->dcopClient()->registerAs("extension_proxy", true) == 0) {
 	kdError() << "Failed to register at DCOP server." << endl;
 	exit(0);
     }
@@ -121,7 +121,7 @@ ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name)
 
 ExtensionProxy::~ExtensionProxy()
 {
-    kapp->dcopClient()->detach();
+    tdeApp->dcopClient()->detach();
 }
 
 void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile)
@@ -161,7 +161,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString
     }
 
     // connect updateLayout signal
-    connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout()));
+    connect(_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout()));
 }
 
 KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info)
@@ -195,11 +195,11 @@ void ExtensionProxy::dock(const TQCString& callbackID)
     _callbackID = callbackID;
 
     // try to attach to DCOP server
-    DCOPClient* dcop = kapp->dcopClient();
+    DCOPClient* dcop = tdeApp->dcopClient();
 
     dcop->setNotifications(true);
-    connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)),
-	    TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+    connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+	    TQ_SLOT(slotApplicationRemoved(const TQCString&)));
 
     WId win;
 
@@ -380,7 +380,7 @@ void ExtensionProxy::slotUpdateLayout()
     else
 	appname.sprintf("kicker-screen-%d", screen_number);
 
-    kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
+    tdeApp->dcopClient()->send(appname, _callbackID, "updateLayout()", data);
 }
 
 void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
@@ -396,6 +396,6 @@ void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
 
     if(appId == appname) {
 	kdDebug(1210) << "Connection to kicker lost, shutting down" << endl;
-	kapp->quit();
+	tdeApp->quit();
     }
 }
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 9ca123a94..3f82f1e50 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -36,10 +36,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <kimageeffect.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kickerSettings.h"
 #include "taskbarsettings.h"
@@ -92,24 +92,24 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
     // configure
     configure();
 
-    connect(&m_relayoutTimer, TQT_SIGNAL(timeout()),
-            this, TQT_SLOT(reLayout()));
+    connect(&m_relayoutTimer, TQ_SIGNAL(timeout()),
+            this, TQ_SLOT(reLayout()));
 
-		connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));
+		connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground()));
 
     // connect manager
-    connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)),
-            this, TQT_SLOT(add(Task::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)),
-            this, TQT_SLOT(remove(Task::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)),
-            this, TQT_SLOT(add(Startup::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)),
-            this, TQT_SLOT(remove(Startup::Ptr)));
-    connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)),
-            this, TQT_SLOT(desktopChanged(int)));
-    connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)),
-            this, TQT_SLOT(windowChanged(Task::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)),
+            this, TQ_SLOT(add(Task::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)),
+            this, TQ_SLOT(remove(Task::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)),
+            this, TQ_SLOT(add(Startup::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)),
+            this, TQ_SLOT(remove(Startup::Ptr)));
+    connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)),
+            this, TQ_SLOT(desktopChanged(int)));
+    connect(TaskManager::the(), TQ_SIGNAL(windowChanged(Task::Ptr)),
+            this, TQ_SLOT(windowChanged(Task::Ptr)));
 
     isGrouping = shouldGroup();
 
@@ -131,8 +131,8 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
 
     blocklayout = false;
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    keys = new TDEGlobalAccel( this );
 #include "taskbarbindings.cpp"
     keys->readSettings();
     keys->updateConnections();
@@ -261,12 +261,12 @@ void TaskBar::configure()
     // are paying attention to the current Xinerama screen
     // disconnect first in case we've been here before
     // to avoid multiple connections
-    disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
-                this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
+    disconnect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)),
+                this, TQ_SLOT(windowChangedGeometry(Task::Ptr)));
     if (m_showOnlyCurrentScreen)
     {
-        connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
-                 this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
+        connect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)),
+                 this, TQ_SLOT(windowChangedGeometry(Task::Ptr)));
     }
     TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen);
 
@@ -386,7 +386,7 @@ void TaskBar::add(Startup::Ptr startup)
     // create new container
     TaskContainer *container = new TaskContainer(startup, frames, this, m_settingsObject, m_globalSettingsObject, viewport());
     m_hiddenContainers.append(container);
-    connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*)));
+    connect(container, TQ_SIGNAL(showMe(TaskContainer*)), this, TQ_SLOT(showTaskContainer(TaskContainer*)));
 }
 
 void TaskBar::reSort()
@@ -854,7 +854,7 @@ void TaskBar::reLayout()
         }
     }
     
-    TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry()));
+    TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry()));
 }
 
 void TaskBar::setViewportBackground()
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 86ea32dca..0665470df 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -93,14 +93,14 @@
             <default>200</default>
             <min>50</min>
             <max>500</max>
-            <label>Maximum button width</label>
-            <whatsthis>The maximum width to which a taskbar item can expand.</whatsthis>
+            <label>Maximum Taskbar Button Width</label>
+            <whatsthis>The maximum width each taskbar button will use. The default value is 200 pixels. The setting affects the Display options Text only and Icons and Text.</whatsthis>
         </entry>
         <entry key="MinimumButtonHeight" type="Int" >
             <default>18</default>
-            <label></label>
+            <label>Minimum Taskbar Button Height</label>
             <min>1</min>
-            <whatsthis></whatsthis>
+            <whatsthis>The minimum height to trigger taskbar buttons to stack into rows. The default value is 18 pixels. To prevent the taskbar buttons from stacking into rows, MinimumButtonHeight must be at least one pixel larger than the defined panel height.</whatsthis>
         </entry>
         <entry key="ShowCurrentScreenOnly" type="Bool" >
             <default>false</default>
diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp
index 364faac97..f604e3bc6 100644
--- a/kicker/taskbar/taskbarbindings.cpp
+++ b/kicker/taskbar/taskbarbindings.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index f9ba06c32..e9cc87979 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twindowlistmenu.h>
 
 #include <X11/X.h>
@@ -65,10 +65,10 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
     TQFile configFileObject(locateLocal("config", configFile));
     if (!configFileObject.exists())
     {
-        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true);
         TDEConfig localConfig(configFile);
         globalConfig.copyTo(configFile, &localConfig);
-        localConfig.writeEntry("UseGlobalSettings", TRUE);
+        localConfig.writeEntry("UseGlobalSettings", true);
         localConfig.sync();
     }
     settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile));
@@ -99,7 +99,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
     taskBar = new TaskBar(settingsObject, globalSettingsObject, this);
     layout->addWidget( taskBar );
 
-    connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) );
+    connect( taskBar, TQ_SIGNAL( containerCountChanged() ), TQ_SIGNAL( containerCountChanged() ) );
 
     setBackground();
 
@@ -134,10 +134,10 @@ void TaskBarContainer::configure()
         // window list button
         windowListButton = new SimpleButton(this);
         windowListMenu= new KWindowListMenu;
-        connect(windowListButton, TQT_SIGNAL(pressed()),
-                TQT_SLOT(showWindowListMenu()));
-        connect(windowListMenu, TQT_SIGNAL(aboutToHide()),
-                TQT_SLOT(windowListMenuAboutToHide()));
+        connect(windowListButton, TQ_SIGNAL(pressed()),
+                TQ_SLOT(showWindowListMenu()));
+        connect(windowListMenu, TQ_SIGNAL(aboutToHide()),
+                TQ_SLOT(windowListMenuAboutToHide()));
 
         // geometry
         TQString icon;
@@ -161,7 +161,7 @@ void TaskBarContainer::configure()
                 break;
         }
 
-        windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+        windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
                                                                  TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
@@ -188,20 +188,20 @@ void TaskBarContainer::preferences()
 {
     TQByteArray data;
 
-    if (!kapp->dcopClient()->isAttached())
+    if (!tdeApp->dcopClient()->isAttached())
     {
-        kapp->dcopClient()->attach();
+        tdeApp->dcopClient()->attach();
     }
 
     if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME)
     {
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
     }
     else
     {
         TQDataStream args( data, IO_WriteOnly );
         args << configFile;
-        kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
+        tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
     }
 }
 
@@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
 
     if (windowListButton)
     {
-        windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+        windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
                                                                  TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
@@ -299,9 +299,9 @@ void TaskBarContainer::showWindowListMenu()
             break;
     }
 
-    disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) );
+    disconnect( windowListButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( showWindowListMenu() ) );
     windowListMenu->exec( pos );
-    TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton()));
+    TQTimer::singleShot(100, this, TQ_SLOT(reconnectWindowListButton()));
 }
 
 void TaskBarContainer::windowListMenuAboutToHide()
@@ -313,7 +313,7 @@ void TaskBarContainer::windowListMenuAboutToHide()
 
 void TaskBarContainer::reconnectWindowListButton()
 {
-    connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) );
+    connect( windowListButton, TQ_SIGNAL( pressed() ), TQ_SLOT( showWindowListMenu() ) );
 }
 
 TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h
index a8b078d67..006724e30 100644
--- a/kicker/taskbar/taskbarcontainer.h
+++ b/kicker/taskbar/taskbarcontainer.h
@@ -36,7 +36,7 @@ class KWindowListMenu;
 class TaskBar;
 class TaskBarSettings;
 
-class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
+class TDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
 {
     TQ_OBJECT
     K_DCOP
diff --git a/kicker/taskbar/taskbarsettings.kcfgc b/kicker/taskbar/taskbarsettings.kcfgc
index c5219f64e..1e6a7c8cc 100644
--- a/kicker/taskbar/taskbarsettings.kcfgc
+++ b/kicker/taskbar/taskbarsettings.kcfgc
@@ -2,6 +2,6 @@ File=taskbar.kcfg
 Singleton=false
 ClassName=TaskBarSettings
 Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
 SetUserTexts=true
 GlobalEnums=true
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index d6b873e2b..8e44f100f 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <kimageeffect.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <netwm.h>
 #include <fixx11h.h>
@@ -117,7 +117,7 @@ bool is_process_resumable(pid_t pid) {
 		TQByteArray statRaw = procStatFile.readAll();
 		procStatFile.close();
 		TQString statString(statRaw);
-		TQStringList statFields = TQStringList::split(" ", statString, TRUE);
+		TQStringList statFields = TQStringList::split(" ", statString, true);
 		TQString tcomm = statFields[1];
 		TQString state = statFields[2];
 		if( state == "T" ) {
@@ -186,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta
 
     sid = m_startup->bin();
 
-    connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update()));
+    connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update()));
 
     dragSwitchTimer.start(333, true);
 }
@@ -212,10 +212,10 @@ void TaskContainer::init()
 
     installEventFilter(KickerTip::the());
 
-    connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired()));
-    connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe()));
-    connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired()));
-    connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow()));
+    connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired()));
+    connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe()));
+    connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired()));
+    connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow()));
 }
 
 TaskContainer::~TaskContainer()
@@ -235,8 +235,8 @@ void TaskContainer::showMe()
         animationTimer.start(100);
 
     emit showMe(this);
-    disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe()));
-    connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+    disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe()));
+    connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
 }
 
 void TaskContainer::stopTimers()
@@ -442,9 +442,9 @@ void TaskContainer::add(Task::Ptr task)
     KickerTip::Client::updateKickerTip();
     update();
 
-    connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool)));
-    connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged()));
-    connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated()));
+    connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool)));
+    connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged()));
+    connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated()));
 }
 
 void TaskContainer::remove(Task::Ptr task)
@@ -724,7 +724,7 @@ void TaskContainer::drawButton(TQPainter *p)
     if (taskBar->showIcons())
     {
       if (pixmap.isNull() && m_startup)
-          pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
+          pixmap = tdeApp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
 
       if ( !pixmap.isNull() )
       {
@@ -1097,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
     }
 
     performAction( buttonAction );
-    TQTimer::singleShot(0, this, TQT_SLOT(update()));
+    TQTimer::singleShot(0, this, TQ_SLOT(update()));
 }
 
 void TaskContainer::performAction(int action)
@@ -1254,7 +1254,7 @@ void TaskContainer::popupMenu(int action)
     }
     else if (action == m_settingsObject->ShowOperationsMenu)
     {
-        if (!kapp->authorizeTDEAction("twin_rmb"))
+        if (!tdeApp->authorizeTDEAction("twin_rmb"))
         {
             return;
         }
@@ -1310,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu()
 
     id = menu->insertItem(SmallIconSet("go-first"),
                           i18n("Move to Beginning"),
-                          this, TQT_SLOT(slotTaskMoveBeginning()));
+                          this, TQ_SLOT(slotTaskMoveBeginning()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
 
     id = menu->insertItem(SmallIconSet("back"),
                           i18n("Move Left"),
-                          this, TQT_SLOT(slotTaskMoveLeft()));
+                          this, TQ_SLOT(slotTaskMoveLeft()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
 
     id = menu->insertItem(SmallIconSet("forward"),
                           i18n("Move Right"),
-                          this, TQT_SLOT(slotTaskMoveRight()));
+                          this, TQ_SLOT(slotTaskMoveRight()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
 
     id = menu->insertItem(SmallIconSet("go-last"),
                           i18n("Move to End"),
-                          this, TQT_SLOT(slotTaskMoveEnd()));
+                          this, TQ_SLOT(slotTaskMoveEnd()));
     menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
 
     return menu;
@@ -1665,7 +1665,7 @@ void TaskContainer::updateFilteredTaskList()
             (!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified()))
         {
             pid_t pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             Atom type_ret;
             int format_ret;
             unsigned long nitems_ret = 0, unused = 0;
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 3286c8576..79c809e39 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -99,7 +99,7 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char *
     setAcceptDrops(true); // Always enabled to activate task during drag&drop.
 
     m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer");
-    connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+    connect(m_dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
 }
 
 void TaskLMBMenu::fillMenu()
@@ -118,7 +118,7 @@ void TaskLMBMenu::fillMenu()
                                                   t->isIconified(),
                                                   t->demandsAttention());
         int id = insertItem(TQIconSet(t->pixmap()), menuItem);
-        connectItem(id, t, TQT_SLOT(activateRaiseOrIconify()));
+        connectItem(id, t, TQ_SLOT(activateRaiseOrIconify()));
         setItemChecked(id, t->isActive());
 
         if (t->demandsAttention())
@@ -131,7 +131,7 @@ void TaskLMBMenu::fillMenu()
     if (m_attentionState)
     {
         m_attentionTimer = new TQTimer(this, "AttentionTimer");
-        connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout()));
+        connect(m_attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimeout()));
         m_attentionTimer->start(500, true);
     }
 }
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index 4c20819b6..f0ff70afc 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -51,7 +51,7 @@ private:
 
 /*****************************************************************************/
 
-class KDE_EXPORT TaskLMBMenu : public TQPopupMenu
+class TDE_EXPORT TaskLMBMenu : public TQPopupMenu
 {
     TQ_OBJECT
 
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 33df1ddd6..3e941315f 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqimage.h>
 #include <tqtimer.h>
 
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
@@ -36,6 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <twinmodule.h>
 #include <kxerrorhandler.h>
 #include <netwm.h>
+#include "dcopclient.h"
 
 #include "taskmanager.h"
 #include "taskmanager.moc"
@@ -61,16 +63,16 @@ TaskManager::TaskManager()
       m_trackGeometry(false)
 {
     TDEGlobal::locale()->insertCatalogue("libtaskmanager");
-    connect(m_winModule, TQT_SIGNAL(windowAdded(WId)),
-            this,        TQT_SLOT(windowAdded(WId)));
-    connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)),
-            this,        TQT_SLOT(windowRemoved(WId)));
-    connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)),
-            this,        TQT_SLOT(activeWindowChanged(WId)));
-    connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)),
-            this,        TQT_SLOT(currentDesktopChanged(int)));
-    connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)),
-            this,        TQT_SLOT(windowChanged(WId,unsigned int)));
+    connect(m_winModule, TQ_SIGNAL(windowAdded(WId)),
+            this,        TQ_SLOT(windowAdded(WId)));
+    connect(m_winModule, TQ_SIGNAL(windowRemoved(WId)),
+            this,        TQ_SLOT(windowRemoved(WId)));
+    connect(m_winModule, TQ_SIGNAL(activeWindowChanged(WId)),
+            this,        TQ_SLOT(activeWindowChanged(WId)));
+    connect(m_winModule, TQ_SIGNAL(currentDesktopChanged(int)),
+            this,        TQ_SLOT(currentDesktopChanged(int)));
+    connect(m_winModule, TQ_SIGNAL(windowChanged(WId,unsigned int)),
+            this,        TQ_SLOT(windowChanged(WId,unsigned int)));
 
     // register existing windows
     const TQValueList<WId> windows = m_winModule->windows();
@@ -99,14 +101,14 @@ void TaskManager::configure_startup()
         return;
     _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this );
     connect( _startup_info,
-        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+        TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
-        TQT_SLOT( killStartup( const TDEStartupInfoId& )));
+        TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQ_SLOT( killStartup( const TDEStartupInfoId& )));
     c.setGroup( "TaskbarButtonSettings" );
     _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
 }
@@ -1305,7 +1307,7 @@ void Task::updateThumbnail()
     // by the thumbnail generation. This makes things much smoother
     // on slower machines.
     //
-    TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop());
+    TQWidget *rootWin = tqApp->desktop();
     TQRect geom = _info.geometry();
     _grab = TQPixmap::grabWindow(rootWin->winId(),
                                 geom.x(), geom.y(),
@@ -1313,7 +1315,7 @@ void Task::updateThumbnail()
 
     if (!_grab.isNull())
     {
-       TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail()));
+       TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail()));
     }
 }
 
@@ -1452,6 +1454,14 @@ void Task::updateWindowPixmap()
 #endif // THUMBNAILING_POSSIBLE
 }
 
+void Task::tileTo(int position)
+{
+    TQByteArray params;
+    TQDataStream stream(params, IO_WriteOnly);
+    stream << _win << position;
+    tdeApp->dcopClient()->send("twin", "KWinInterface", "tileWindowToBorder(unsigned long int, int)", params);
+}
+
 Startup::Startup(const TDEStartupInfoId& id, const TDEStartupInfoData& data,
                  TQObject * parent, const char *name)
     : TQObject(parent, name), _id(id), _data(data)
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 3771d29a6..3f8e2f5e2 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -68,7 +68,7 @@ typedef TQValueList<WId> WindowList;
  * @see TaskManager
  * @see KWinModule
  */
-class KDE_EXPORT Task: public TQObject, public TDEShared
+class TDE_EXPORT Task: public TQObject, public TDEShared
 {
     TQ_OBJECT
     TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName )
@@ -423,6 +423,12 @@ public slots:
      */
     void updateThumbnail();
 
+    /**
+     * Tile the task's window to the specified position. The position is one of the
+     * valid value for ActiveBorder enum
+     */
+    void tileTo(int);
+
 signals:
     /**
      * Indicates that this task has changed in some way.
@@ -483,7 +489,7 @@ private:
 /**
  * Provids a drag object for tasks across desktops.
  */
-class KDE_EXPORT TaskDrag : public TQStoredDrag
+class TDE_EXPORT TaskDrag : public TQStoredDrag
 {
 public:
     /**
@@ -511,7 +517,7 @@ public:
  *
  * @see TaskManager
  */
-class KDE_EXPORT Startup: public TQObject, public TDEShared
+class TDE_EXPORT Startup: public TQObject, public TDEShared
 {
     TQ_OBJECT
     TQ_PROPERTY( TQString text READ text )
@@ -565,7 +571,7 @@ private:
  * @see Startup
  * @see KWinModule
  */
-class KDE_EXPORT TaskManager : public TQObject
+class TDE_EXPORT TaskManager : public TQObject
 {
     TQ_OBJECT
     TQ_PROPERTY( int currentDesktop READ currentDesktop )
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index cdc6e4532..31c48d61c 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <assert.h>
 
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 
@@ -44,6 +45,8 @@ TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQPopupMenu* mov
 	, showAll( show )
 	, taskMoveMenu( moveMenu )
 {
+    TDEGlobal::iconLoader()->addAppDir("twin");
+
     assert(tasks.count() > 0);
     if (tasks.count() == 1)
     {
@@ -68,9 +71,14 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
     int id;
     setCheckable(true);
 
-    insertItem(i18n("Ad&vanced"), makeAdvancedMenu(t));
     bool checkActions = KWin::allowedActionsSupported();
 
+    insertItem(i18n("Ad&vanced"), makeAdvancedMenu(t));
+
+    id = insertItem(i18n("T&ile"), makeTileMenu(t));
+    setItemEnabled(id, !checkActions ||
+            (t->info().actionSupported(NET::ActionMove) && t->info().actionSupported(NET::ActionResize)));
+
     if (TaskManager::the()->numberOfDesktops() > 1)
     {
         id = insertItem(i18n("To &Desktop"), makeDesktopsMenu(t));
@@ -78,7 +86,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         if (showAll)
         {
             id = insertItem(i18n("&To Current Desktop"),
-                            t, TQT_SLOT(toCurrentDesktop()));
+                            t, TQ_SLOT(toCurrentDesktop()));
             setItemEnabled( id, !t->isOnCurrentDesktop() );
         }
 
@@ -88,34 +96,34 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         }
     }
 
-    id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move()));
+    id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQ_SLOT(move()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove));
 
-    id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize()));
+    id = insertItem(i18n("Re&size"), t, TQ_SLOT(resize()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize));
 
-    id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified()));
+    id = insertItem(i18n("Mi&nimize"), t, TQ_SLOT(toggleIconified()));
     setItemChecked(id, t->isIconified());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize));
 
-    id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized()));
+    id = insertItem(i18n("Ma&ximize"), t, TQ_SLOT(toggleMaximized()));
     setItemChecked(id, t->isMaximized());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax));
 
-    id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded()));
+    id = insertItem(i18n("&Shade"), t, TQ_SLOT(toggleShaded()));
     setItemChecked(id, t->isShaded());
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade));
 
     insertSeparator();
 
     if (taskMoveMenu) {
-        taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE);
+        taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), false);
         insertItem(i18n("Move Task Button"), taskMoveMenu);
 
         insertSeparator();
     }
 
-    id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close()));
+    id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQ_SLOT(close()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose));
 }
 
@@ -133,7 +141,7 @@ void TaskRMBMenu::fillMenu()
                          t->visibleNameWithState(),
 		         new TaskRMBMenu(t, this) );
         setItemChecked( id, t->isActive() );
-        connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
+        connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) );
     }
 
     insertSeparator();
@@ -144,7 +152,7 @@ void TaskRMBMenu::fillMenu()
     {
         id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu());
 
-        id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop()));
+        id = insertItem(i18n("All &to Current Desktop"), this, TQ_SLOT(slotAllToCurrentDesktop()));
         Task::List::iterator itEnd = tasks.end();
         for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
         {
@@ -159,7 +167,7 @@ void TaskRMBMenu::fillMenu()
 
     enable = false;
 
-    id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) );
+    id = insertItem( i18n( "Mi&nimize All" ), this, TQ_SLOT( slotMinimizeAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
@@ -172,7 +180,7 @@ void TaskRMBMenu::fillMenu()
 
     enable = false;
 
-    id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) );
+    id = insertItem( i18n( "Ma&ximize All" ), this, TQ_SLOT( slotMaximizeAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
@@ -185,7 +193,7 @@ void TaskRMBMenu::fillMenu()
 
     enable = false;
 
-    id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) );
+    id = insertItem( i18n( "&Restore All" ), this, TQ_SLOT( slotRestoreAll() ) );
     itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
@@ -201,13 +209,13 @@ void TaskRMBMenu::fillMenu()
     enable = false;
 
     if (taskMoveMenu) {
-        taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE);
+        taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), false);
         insertItem(i18n("Move Task Button"), taskMoveMenu);
 
         insertSeparator();
     }
 
-    insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
+    insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) );
 }
 
 TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
@@ -219,17 +227,17 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
 
     id = menu->insertItem(SmallIconSet("go-up"),
                           i18n("Keep &Above Others"),
-                          t, TQT_SLOT(toggleAlwaysOnTop()));
+                          t, TQ_SLOT(toggleAlwaysOnTop()));
     menu->setItemChecked(id, t->isAlwaysOnTop());
 
     id = menu->insertItem(SmallIconSet("go-down"),
                           i18n("Keep &Below Others"),
-                          t, TQT_SLOT(toggleKeptBelowOthers()));
+                          t, TQ_SLOT(toggleKeptBelowOthers()));
     menu->setItemChecked(id, t->isKeptBelowOthers());
 
     id = menu->insertItem(SmallIconSet("view-fullscreen"),
                           i18n("&Fullscreen"),
-                          t, TQT_SLOT(toggleFullScreen()));
+                          t, TQ_SLOT(toggleFullScreen()));
     menu->setItemChecked(id, t->isFullScreen());
 
     if (KWin::allowedActionsSupported())
@@ -245,7 +253,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
 	TQPopupMenu* m = new TQPopupMenu( this );
 	m->setCheckable( true );
 
-	int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) );
+	int id = m->insertItem( i18n("&All Desktops"), t, TQ_SLOT( toDesktop(int) ) );
 	m->setItemParameter( id, 0 ); // 0 means all desktops
 	m->setItemChecked( id, t->isOnAllDesktops() );
 
@@ -253,7 +261,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
 		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
-		id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) );
+		id = m->insertItem( name, t, TQ_SLOT( toDesktop(int) ) );
 		m->setItemParameter( id, i );
 		m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i );
 	}
@@ -266,20 +274,47 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu()
 	TQPopupMenu* m = new TQPopupMenu( this );
 	m->setCheckable( true );
 
-	int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) );
+	int id = m->insertItem( i18n("&All Desktops"), this, TQ_SLOT( slotAllToDesktop(int) ) );
 	m->setItemParameter( id, 0 ); // 0 means all desktops
 
 	m->insertSeparator();
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
 		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
-		id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
+		id = m->insertItem( name, this, TQ_SLOT( slotAllToDesktop(int) ) );
 		m->setItemParameter( id, i );
 	}
 
 	return m;
 }
 
+TQPopupMenu* TaskRMBMenu::makeTileMenu(Task::Ptr t)
+{
+    TQPopupMenu *m = new TQPopupMenu( this );
+
+    // Tile to side (the menu id matched the ActiveBorder index used for tiling)
+    int id = m->insertItem( UserIconSet("tile_left"), i18n("&Left"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 6 );
+    id = m->insertItem( UserIconSet("tile_right"), i18n("&Right"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 2 );
+    id = m->insertItem( UserIconSet("tile_top"), i18n("&Top"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 0 );
+    id = m->insertItem( UserIconSet("tile_bottom"), i18n("&Bottom"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 4 );
+
+    // Tile to corner (the menu id matched the ActiveBorder index used for tiling)
+    id = m->insertItem( UserIconSet("tile_topleft"), i18n("Top &Left"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 7 );
+    id = m->insertItem( UserIconSet("tile_topright"), i18n("Top &Right"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 1 );
+    id = m->insertItem( UserIconSet("tile_bottomleft"), i18n("Bottom L&eft"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 5 );
+    id = m->insertItem( UserIconSet("tile_bottomright"), i18n("&Bottom R&ight"), t, TQ_SLOT( tileTo(int) ) );
+    m->setItemParameter( id, 3 );
+
+    return m;
+}
+
 void TaskRMBMenu::slotMinimizeAll()
 {
     Task::List::iterator itEnd = tasks.end();
diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h
index a73d83d3a..5dd66b98f 100644
--- a/kicker/taskmanager/taskrmbmenu.h
+++ b/kicker/taskmanager/taskrmbmenu.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqpopupmenu.h>
 
-class KDE_EXPORT TaskRMBMenu : public TQPopupMenu
+class TDE_EXPORT TaskRMBMenu : public TQPopupMenu
 {
 	TQ_OBJECT
 
@@ -38,9 +38,10 @@ public:
 private:
 	void fillMenu(Task::Ptr);
 	void fillMenu();
-    TQPopupMenu* makeAdvancedMenu(Task::Ptr);
+	TQPopupMenu* makeAdvancedMenu(Task::Ptr);
 	TQPopupMenu* makeDesktopsMenu(Task::Ptr);
 	TQPopupMenu* makeDesktopsMenu();
+	TQPopupMenu* makeTileMenu(Task::Ptr);
 
 private slots:
 	void slotMinimizeAll();
@@ -48,7 +49,7 @@ private slots:
 	void slotRestoreAll();
 	void slotShadeAll();
 	void slotCloseAll();
-	void slotAllToDesktop( int desktop );
+	void slotAllToDesktop(int desktop);
 	void slotAllToCurrentDesktop();
 
 private:
diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index 345b05149..84b2f7d68 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -42,6 +42,13 @@ tde_create_translated_desktop(
   OUTPUT_NAME klipperrc
   PO_DIR klipper-desktops
 )
+
+tde_create_translated_desktop(
+  SOURCE copy-full-path.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
+  PO_DIR klipper-desktops
+)
+
 install( FILES klipperrc.upd klippershortcuts.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( PROGRAMS klipper-1-2.pl klipper-trinity1.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index ac47f4d9b..56a57db7b 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("klipper");
         int actions = KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help;
@@ -90,7 +90,7 @@ void KlipperApplet::preferences()
 
 void KlipperApplet::help()
 {
-    kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
+    tdeApp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
 }
 
 void KlipperApplet::about()
@@ -114,9 +114,9 @@ void KlipperAppletWidget::init()
     TQByteArray arg1, arg2;
     TQCString str;
     // call() - wait for finishing
-    kapp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
+    tdeApp->dcopClient()->call("klipper", "klipper", "quitProcess()", arg1, str, arg2 );
     // register ourselves, so if klipper process is started,
-    // it will quit immediately (KUniqueApplication)
+    // it will quit immediately (TDEUniqueApplication)
     s_dcop = new DCOPClient;
     s_dcop->registerAs( "klipper", false );
 }
@@ -129,7 +129,7 @@ KlipperAppletWidget::~KlipperAppletWidget()
 
 DCOPClient* KlipperAppletWidget::s_dcop = 0;
 
-// this is just to make klipper process think we're KUniqueApplication
+// this is just to make klipper process think we're TDEUniqueApplication
 // (AKA ugly hack)
 int KlipperAppletWidget::newInstance()
 {
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index ff6c50cef..852a2ef30 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -78,7 +78,7 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
     selection.timestamp_atom = atoms[ 4 ];
     clipboard.timestamp_atom = atoms[ 5 ];
     bool use_polling = true;
-    kapp->installX11EventFilter( this );
+    tdeApp->installX11EventFilter( this );
 #ifdef HAVE_XFIXES
     int dummy;
     if( XFixesQueryExtension( tqt_xdisplay(), &xfixes_event_base, &dummy ))
@@ -108,9 +108,9 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent )
     
 void ClipboardPoll::initPolling()
 {
-    connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged()));
-    connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() ));
-    connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout()));
+    connect( tdeApp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
+    connect( tdeApp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() ));
+    connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( timeout()));
     timer.start( 1000, false );
     selection.atom = XA_PRIMARY;
     clipboard.atom = xa_clipboard;
@@ -146,7 +146,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
     if( xfixes_event_base != -1 && e->type == xfixes_event_base + XFixesSelectionNotify )
     {
         XFixesSelectionNotifyEvent* ev = reinterpret_cast< XFixesSelectionNotifyEvent* >( e );
-        if( ev->selection == XA_PRIMARY && !kapp->clipboard()->ownsSelection())
+        if( ev->selection == XA_PRIMARY && !tdeApp->clipboard()->ownsSelection())
         {
 #ifdef NOISY_KLIPPER_
             kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
@@ -154,7 +154,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
             set_tqt_x_time(ev->timestamp);
             emit clipboardChanged( true );
         }
-        else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
+        else if( ev->selection == xa_clipboard && !tdeApp->clipboard()->ownsClipboard())
         {
 #ifdef NOISY_KLIPPER_
             kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
@@ -217,13 +217,13 @@ void ClipboardPoll::updateQtOwnership( SelectionData& data )
 void ClipboardPoll::timeout()
 {
     KlipperWidget::updateTimestamp();
-    if( !kapp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
+    if( !tdeApp->clipboard()->ownsSelection() && checkTimestamp( selection ) ) {
 #ifdef NOISY_KLIPPER_
         kdDebug() << "SELECTION CHANGED" << endl;
 #endif
         emit clipboardChanged( true );
     }
-    if( !kapp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
+    if( !tdeApp->clipboard()->ownsClipboard() && checkTimestamp( clipboard ) ) {
 #ifdef NOISY_KLIPPER_
         kdDebug() << "CLIPBOARD CHANGED" << endl;
 #endif
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 25c095c2a..0dfc7ede1 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -158,11 +158,11 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
     maxItems = new KIntNumInput( this );
     maxItems->setLabel(  i18n( "C&lipboard history size:" ) );
     maxItems->setRange( 2, 2048, 1, true );
-    connect( maxItems, TQT_SIGNAL( valueChanged( int )),
-             TQT_SLOT( historySizeChanged( int ) ));
+    connect( maxItems, TQ_SIGNAL( valueChanged( int )),
+             TQ_SLOT( historySizeChanged( int ) ));
 
-    connect( group, TQT_SIGNAL( clicked( int )),
-             TQT_SLOT( slotClipConfigChanged() ));
+    connect( group, TQ_SIGNAL( clicked( int )),
+             TQ_SLOT( slotClipConfigChanged() ));
     slotClipConfigChanged();
 
     // Add some spacing at the end
@@ -201,7 +201,7 @@ void ListView::rename( TQListViewItem* item, int c )
 
   if ( gui ) {
     if ( ! _regExpEditor )
-      _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+      _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
     KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( _regExpEditor->tqt_cast( "KRegExpEditorInterface" ) );
     assert( iface );
     iface->setRegExp( item->text( 0 ) );
@@ -243,13 +243,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
     listView->setMultiSelection( false );
     listView->setAllColumnsShowFocus( true );
     listView->setSelectionMode( TQListView::Single );
-    connect( listView, TQT_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )),
-             TQT_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) ));
-    connect( listView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
-             TQT_SLOT(selectionChanged ( TQListViewItem * )));
+    connect( listView, TQ_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )),
+             TQ_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) ));
+    connect( listView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+             TQ_SLOT(selectionChanged ( TQListViewItem * )));
     connect(listView,
-            TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)),
-            TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+            TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)),
+            TQ_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
     ClipAction *action   = 0L;
     ClipCommand *command = 0L;
@@ -291,10 +291,10 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
     TQHBox *box = new TQHBox( this );
     box->setSpacing( KDialog::spacingHint() );
     TQPushButton *button = new TQPushButton( i18n("&Add Action"), box );
-    connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAction() ));
+    connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddAction() ));
 
     delActionButton = new TQPushButton( i18n("&Delete Action"), box );
-    connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() ));
+    connect( delActionButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDeleteAction() ));
 
     TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box);
     label->setAlignment( WordBreak | AlignLeft | AlignVCenter );
@@ -304,7 +304,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
     box = new TQHBox( this );
     TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box );
     advanced->setFixedSize( advanced->sizeHint() );
-    connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() ));
+    connect( advanced, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdvanced() ));
     (void) new TQWidget( box ); // spacer
 
     delActionButton->setEnabled(listView->currentItem () !=0);
diff --git a/klipper/copy-full-path.desktop b/klipper/copy-full-path.desktop
new file mode 100644
index 000000000..32264550a
--- /dev/null
+++ b/klipper/copy-full-path.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=all/allfiles,inode/directory
+Actions=CopyFullPath
+
+[Desktop Action CopyFullPath]
+Name=Copy full path
+Icon=edit-copy
+Exec=klipper; dcop klipper klipper setClipboardContents "%U"
\ No newline at end of file
diff --git a/klipper/hi128-app-klipper.png b/klipper/hi128-app-klipper.png
index 51dcba6bb..4e04224da 100644
--- a/klipper/hi128-app-klipper.png
+++ b/klipper/hi128-app-klipper.png
diff --git a/klipper/hi16-app-klipper.png b/klipper/hi16-app-klipper.png
index ea8c2337c..0c1527d00 100644
--- a/klipper/hi16-app-klipper.png
+++ b/klipper/hi16-app-klipper.png
diff --git a/klipper/hi22-app-klipper.png b/klipper/hi22-app-klipper.png
index a1b8ca89b..9ae7258c5 100644
--- a/klipper/hi22-app-klipper.png
+++ b/klipper/hi22-app-klipper.png
diff --git a/klipper/hi32-app-klipper.png b/klipper/hi32-app-klipper.png
index cdffa2db6..00ff32727 100644
--- a/klipper/hi32-app-klipper.png
+++ b/klipper/hi32-app-klipper.png
diff --git a/klipper/hi48-app-klipper.png b/klipper/hi48-app-klipper.png
index aeb46281c..0f8a0d9ac 100644
--- a/klipper/hi48-app-klipper.png
+++ b/klipper/hi48-app-klipper.png
diff --git a/klipper/hi64-app-klipper.png b/klipper/hi64-app-klipper.png
index 4de252ed9..88aac010f 100644
--- a/klipper/hi64-app-klipper.png
+++ b/klipper/hi64-app-klipper.png
diff --git a/klipper/hisc-app-klipper.svgz b/klipper/hisc-app-klipper.svgz
index 3f1f30d7d..6dc7f749c 100644
--- a/klipper/hisc-app-klipper.svgz
+++ b/klipper/hisc-app-klipper.svgz
diff --git a/klipper/history.cpp b/klipper/history.cpp
index 625fbef0f..99db4eaba 100644
--- a/klipper/history.cpp
+++ b/klipper/history.cpp
@@ -29,7 +29,7 @@ History::History( TQWidget* parent, const char* name )
       m_popup( new KlipperPopup( this, parent, "main_widget" ) ),
       m_topIsUserSelected( false )
 {
-    connect( this, TQT_SIGNAL( changed() ), m_popup,  TQT_SLOT( slotHistoryChanged() ) );
+    connect( this, TQ_SIGNAL( changed() ), m_popup,  TQ_SLOT( slotHistoryChanged() ) );
     itemList.setAutoDelete( true );
 
 }
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index 16b0c24f2..8db1f5fe8 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -18,7 +18,7 @@
 */
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 9d3ab728d..38cd51aa5 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -112,7 +112,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name
 
     m_popupProxy = new PopupProxy( this, "popup_proxy", menu_height, menu_width );
 
-    connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+    connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
 }
 
 KlipperPopup::~KlipperPopup() {
diff --git a/klipper/main.cpp b/klipper/main.cpp
index 6d0b5e9e2..8a1057156 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -24,34 +24,34 @@
 #include <tdecmdlineargs.h>
 #include <twin.h>
 #include <tdeaboutdata.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 
 #include "toplevel.h"
 #include "version.h"
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <qxembed.h> // schroder
 #endif
 
 
-extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
+extern "C" int TDE_EXPORT kdemain(int argc, char *argv[])
 {
   Klipper::createAboutData();
   TDECmdLineArgs::init( argc, argv, Klipper::aboutData());
-  KUniqueApplication::addCmdLineOptions();
+  TDEUniqueApplication::addCmdLineOptions();
 
-  if (!KUniqueApplication::start()) {
+  if (!TDEUniqueApplication::start()) {
        fprintf(stderr, "Klipper is already running!\n");
        exit(0);
   }
-  KUniqueApplication app;
+  TDEUniqueApplication app;
   app.disableSessionManagement();
 
   Klipper *toplevel = new Klipper();
 
   // Make Klipper conform to freedesktop system tray standard, see
   // http://bugs.kde.org/show_bug.cgi?id=69119
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
   QXEmbed::initialize();
 #endif
 
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index f3a86379f..20f8139a1 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -39,7 +39,7 @@ PopupProxy::PopupProxy( KlipperPopup* parent, const char* name, int menu_height,
       m_menu_width( menu_width ),
       nextItemNumber( 0 )
 {
-    connect( parent->history(), TQT_SIGNAL( changed() ), TQT_SLOT( slotHistoryChanged() ) );
+    connect( parent->history(), TQ_SIGNAL( changed() ), TQ_SLOT( slotHistoryChanged() ) );
 }
 
 void PopupProxy::slotHistoryChanged() {
@@ -117,7 +117,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
     History* history = parent()->history();
     proxy_for_menu->connectItem(  id,
                                   history,
-                                  TQT_SLOT( slotMoveToTop( int ) ) );
+                                  TQ_SLOT( slotMoveToTop( int ) ) );
     proxy_for_menu->setItemParameter(  id,  nextItemNumber );
 
 }
@@ -151,7 +151,7 @@ int PopupProxy::insertFromSpill( int index ) {
     if ( spillPointer.current() ) {
         TDEPopupMenu* moreMenu = new TDEPopupMenu( proxy_for_menu, "a more menu" );
         proxy_for_menu->insertItem( i18n( "&More" ),  moreMenu, -1, index );
-        connect( moreMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) );
+        connect( moreMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) );
         proxy_for_menu = moreMenu;
     }
 
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index d90846dfc..c1c5754d6 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -40,8 +40,8 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 #include <kstringhandler.h>
 #include <ksystemtray.h>
 #include <kurldrag.h>
@@ -121,7 +121,7 @@ extern bool tqt_qclipboard_bailout_hack;
 
 static void ensureGlobalSyncOff(TDEConfig* config);
 
-// config == kapp->config for process, otherwise applet
+// config == tdeApp->config for process, otherwise applet
 KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     : TQWidget( parent )
     , DCOPObject( "klipper" )
@@ -138,12 +138,12 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
 
     updateTimestamp(); // read initial X user time
     setBackgroundMode( X11ParentRelative );
-    clip = kapp->clipboard();
+    clip = tdeApp->clipboard();
 
-    connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow()));
+    connect( &m_overflowClearTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotClearOverflow()));
     m_overflowClearTimer.start( 1000 );
-    connect( &m_pendingCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotCheckPending()));
-    connect( &m_setClipboardTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotDelayedSetClipboard()));
+    connect( &m_pendingCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotCheckPending()));
+    connect( &m_setClipboardTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotDelayedSetClipboard()));
 
     m_history = new History( this, "main_history" );
 
@@ -156,25 +156,25 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     clearHistoryAction = new TDEAction( i18n("C&lear Clipboard History"),
                                       "history_clear",
                                       0,
-                                      TQT_TQOBJECT(history()),
-                                      TQT_SLOT( slotClear() ),
+                                      history(),
+                                      TQ_SLOT( slotClear() ),
                                       collection,
                                       "clearHistoryAction" );
-    connect( clearHistoryAction, TQT_SIGNAL( activated() ), TQT_SLOT( slotClearClipboard() ) );
+    connect( clearHistoryAction, TQ_SIGNAL( activated() ), TQ_SLOT( slotClearClipboard() ) );
     clearHistoryAction->setGroup( defaultGroup );
     configureAction = new TDEAction( i18n("&Configure Klipper..."),
                                    "configure",
                                    0,
-                                   TQT_TQOBJECT(this),
-                                   TQT_SLOT( slotConfigure() ),
+                                   this,
+                                   TQ_SLOT( slotConfigure() ),
                                    collection,
                                    "configureAction" );
     configureAction->setGroup( defaultGroup );
     quitAction = new TDEAction( i18n("&Quit"),
                               "system-log-out",
                               0,
-                              TQT_TQOBJECT(this),
-                              TQT_SLOT( slotQuit() ),
+                              this,
+                              TQ_SLOT( slotQuit() ),
                               collection,
                               "quitAction" );
     quitAction->setGroup( "exit" );
@@ -187,11 +187,11 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     showTimer = new TQTime();
 
     readProperties(m_config);
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
     poll = new ClipboardPoll( this );
-    connect( poll, TQT_SIGNAL( clipboardChanged( bool ) ),
-             this, TQT_SLOT( newClipData( bool ) ) );
+    connect( poll, TQ_SIGNAL( clipboardChanged( bool ) ),
+             this, TQ_SLOT( newClipData( bool ) ) );
 
     if ( isApplet() || !isShown() ) {
         m_pixmap = KSystemTray::loadIcon( "klipper" );
@@ -203,7 +203,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     m_iconOrigHeight = m_pixmap.height();
     adjustSize();
 
-    globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+    globalKeys = new TDEGlobalAccel(this);
     TDEGlobalAccel* keys = globalKeys;
 #include "klipperbindings.cpp"
     // the keys need to be read from kdeglobals, not kickerrc --ellis, 22/9/02
@@ -211,13 +211,13 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     globalKeys->updateConnections();
     toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions"));
 
-    connect( toggleURLGrabAction, TQT_SIGNAL( toggled( bool )),
-             this, TQT_SLOT( setURLGrabberEnabled( bool )));
+    connect( toggleURLGrabAction, TQ_SIGNAL( toggled( bool )),
+             this, TQ_SLOT( setURLGrabberEnabled( bool )));
 
     KlipperPopup* popup = history()->popup();
-    connect ( history(),  TQT_SIGNAL( topChanged() ), TQT_SLOT( slotHistoryTopChanged() ) );
-    connect( popup, TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotStartHideTimer() ) );
-    connect( popup, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotStartShowTimer() ) );
+    connect ( history(),  TQ_SIGNAL( topChanged() ), TQ_SLOT( slotHistoryTopChanged() ) );
+    connect( popup, TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotStartHideTimer() ) );
+    connect( popup, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotStartShowTimer() ) );
 
     popup->plugAction( toggleURLGrabAction );
     popup->plugAction( clearHistoryAction );
@@ -235,7 +235,7 @@ KlipperWidget::~KlipperWidget()
     delete showTimer;
     delete hideTimer;
     delete myURLGrabber;
-    if( m_config != kapp->config())
+    if( m_config != tdeApp->config())
         delete m_config;
     tqt_qclipboard_bailout_hack = false;
 }
@@ -616,7 +616,7 @@ void KlipperWidget::slotQuit()
         return;
     config->sync();
 
-    kapp->quit();
+    tdeApp->quit();
 
 }
 
@@ -631,10 +631,10 @@ void KlipperWidget::slotRepeatAction()
 {
     if ( !myURLGrabber ) {
         myURLGrabber = new URLGrabber( m_config );
-        connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
-                 TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
-        connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
-                 this, TQT_SLOT( disableURLGrabber() ) );
+        connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )),
+                 TQ_SLOT( showPopupMenu( TQPopupMenu * )) );
+        connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ),
+                 this, TQ_SLOT( disableURLGrabber() ) );
     }
 
     const HistoryStringItem* top = dynamic_cast<const HistoryStringItem*>( history()->first() );
@@ -666,10 +666,10 @@ void KlipperWidget::setURLGrabberEnabled( bool enable )
         toggleURLGrabAction->setText(i18n("&Actions Enabled"));
         if ( !myURLGrabber ) {
             myURLGrabber = new URLGrabber( m_config );
-            connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )),
-                     TQT_SLOT( showPopupMenu( TQPopupMenu * )) );
-            connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ),
-                     this, TQT_SLOT( disableURLGrabber() ) );
+            connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )),
+                     TQ_SLOT( showPopupMenu( TQPopupMenu * )) );
+            connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ),
+                     this, TQ_SLOT( disableURLGrabber() ) );
         }
     }
 }
@@ -785,7 +785,7 @@ bool KlipperWidget::blockFetchingNewData()
 //   while the user is doing a selection using the mouse, OOo stops updating the clipboard
 //   contents, so in practice it's like the user has selected only the part which was
 //   selected when Klipper asked first.
-    ButtonState buttonstate = kapp->keyboardMouseState();
+    ButtonState buttonstate = tdeApp->keyboardMouseState();
     if( ( buttonstate & ( ShiftButton | TQt::LeftButton )) == ShiftButton // #85198
         || ( buttonstate & TQt::LeftButton ) == TQt::LeftButton ) { // #80302
         m_pendingContentsCheck = true;
@@ -908,7 +908,7 @@ void KlipperWidget::checkClipData( bool selectionMode )
         // changing the clipboard at the same time.
         bSavedSelectionMode = selectionMode;
         bCheckForEmpty = true;
-        m_setClipboardTimer.start(100, TRUE);
+        m_setClipboardTimer.start(100, true);
         return;
     }
 
@@ -984,7 +984,7 @@ void KlipperWidget::checkClipData( bool selectionMode )
             // changing the clipboard at the same time.
             bSavedSelectionMode = !selectionMode; // inverted in order to sync
             bCheckForEmpty = false;
-            m_setClipboardTimer.start(100, TRUE);
+            m_setClipboardTimer.start(100, true);
         }
     }
 
@@ -1180,19 +1180,19 @@ TDEAboutData* KlipperWidget::aboutData()
 }
 
 Klipper::Klipper( TQWidget* parent )
-    : KlipperWidget( parent, kapp->config())
+    : KlipperWidget( parent, tdeApp->config())
 {
 }
 
-// this sucks ... KUniqueApplication registers itself as 'klipper'
+// this sucks ... TDEUniqueApplication registers itself as 'klipper'
 // for the unique-app detection calls (and it shouldn't use that name IMHO)
-// but in Klipper it's not KUniqueApplication class who handles
+// but in Klipper it's not TDEUniqueApplication class who handles
 // the DCOP calls, but an instance of class Klipper, registered as 'klipper'
-// this below avoids a warning when KUniqueApplication wouldn't otherwise
+// this below avoids a warning when TDEUniqueApplication wouldn't otherwise
 // find newInstance()  (which doesn't do anything in Klipper anyway)
 int Klipper::newInstance()
 {
-    kapp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
+    tdeApp->dcopClient()->setPriorityCall(false); // Allow other dcop calls
     return 0;
 }
 
@@ -1200,8 +1200,8 @@ int Klipper::newInstance()
 // (AKA ugly hack)
 void Klipper::quitProcess()
 {
-    kapp->dcopClient()->detach();
-    kapp->quit();
+    tdeApp->dcopClient()->detach();
+    tdeApp->quit();
 }
 
 static void ensureGlobalSyncOff(TDEConfig* config) {
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 8a924a46f..3dbd0a069 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -21,7 +21,7 @@
 #define _TOPLEVEL_H_
 
 #include <tdeapplication.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdepopupmenu.h>
 #include <tqmap.h>
 #include <tqpixmap.h>
@@ -127,7 +127,7 @@ protected:
     bool ignoreClipboardChanges() const;
 
     TDEConfig* config() const { return m_config; }
-    bool isApplet() const { return m_config != kapp->config(); }
+    bool isApplet() const { return m_config != tdeApp->config(); }
 
 protected slots:
     void slotPopupMenu();
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index b8b1cb032..9fd003857 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -49,7 +49,7 @@ URLGrabber::URLGrabber( TDEConfig* config )
  : m_config( config )
 {
     if( m_config == NULL )
-        m_config = kapp->config();
+        m_config = tdeApp->config();
     myMenu = 0L;
     myPopupKillTimeout = 8;
     m_stripWhiteSpace = true;
@@ -61,8 +61,8 @@ URLGrabber::URLGrabber( TDEConfig* config )
     readConfiguration( m_config );
 
     myPopupKillTimer = new TQTimer( this );
-    connect( myPopupKillTimer, TQT_SIGNAL( timeout() ),
-             TQT_SLOT( slotKillPopupMenu() ));
+    connect( myPopupKillTimer, TQ_SIGNAL( timeout() ),
+             TQ_SLOT( slotKillPopupMenu() ));
 
     // testing
     /*
@@ -163,8 +163,8 @@ void URLGrabber::actionMenu( bool wm_class_check )
         myPopupKillTimer->stop();
         delete myMenu;
         myMenu = new TDEPopupMenu;
-        connect( myMenu, TQT_SIGNAL( activated( int )),
-                 TQT_SLOT( slotItemSelected( int )));
+        connect( myMenu, TQ_SIGNAL( activated( int )),
+                 TQ_SLOT( slotItemSelected( int )));
 
         for ( action = it.current(); action; action = ++it ) {
             TQPtrListIterator<ClipCommand> it2( action->commands() );
@@ -279,7 +279,7 @@ void URLGrabber::editData()
     if ( dlg->exec() == TQDialog::Accepted ) {
         myClipData = edit->text();
         delete dlg;
-        TQTimer::singleShot( 0, this, TQT_SLOT( slotActionMenu() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( slotActionMenu() ) );
     }
     else
     {
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index cf1c9c784..f83a16816 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 
 class TQTimer;
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 32dba3f3e..597ce4f81 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -27,19 +27,19 @@
 #include <tqwhatsthis.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <kdialog.h>
 #include <kkeybutton.h>
 #include <klineedit.h>
 #include <tdemessagebox.h>
 #include <kicondialog.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <kcombobox.h>
 #include <kkeydialog.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include "khotkeys.h"
 
 #include "menuinfo.h"
@@ -101,18 +101,18 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     grid->addWidget(_execLabel, 3, 0);
 
     // connect line inputs
-    connect(_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
-    connect(_descriptionEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	    TQT_SLOT(slotChanged()));
-    connect(_commentEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
-    connect(_execEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
-    connect(_execEdit, TQT_SIGNAL(urlSelected(const TQString&)),
-            TQT_SLOT(slotExecSelected()));
-    connect(_launchCB, TQT_SIGNAL(clicked()), TQT_SLOT(launchcb_clicked()));
-    connect(_systrayCB, TQT_SIGNAL(clicked()), TQT_SLOT(systraycb_clicked()));
+    connect(_nameEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
+    connect(_descriptionEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	    TQ_SLOT(slotChanged()));
+    connect(_commentEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
+    connect(_execEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
+    connect(_execEdit, TQ_SIGNAL(urlSelected(const TQString&)),
+            TQ_SLOT(slotExecSelected()));
+    connect(_launchCB, TQ_SIGNAL(clicked()), TQ_SLOT(launchcb_clicked()));
+    connect(_systrayCB, TQ_SIGNAL(clicked()), TQ_SLOT(systraycb_clicked()));
 
     // add line inputs to the grid
     grid->addMultiCellWidget(_nameEdit, 0, 0, 1, 1);
@@ -126,7 +126,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     _iconButton = new TDEIconButton(general_group);
     _iconButton->setFixedSize(56,56);
     _iconButton->setIconSize(48);
-    connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged()));
+    connect(_iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(slotChanged()));
     grid->addMultiCellWidget(_iconButton, 0, 1, 2, 2);
 
     // add the general group to the main layout
@@ -148,8 +148,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
 
     _pathLabel->setBuddy(_pathEdit);
 
-    connect(_pathEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
+    connect(_pathEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
     vbox->addWidget(hbox);
     layout->addMultiCellWidget(_path_group, 1, 1, 0, 1);
 
@@ -159,7 +159,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
 			   KDialog::spacingHint());
 
     _terminalCB = new TQCheckBox(i18n("Run in term&inal"), _term_group);
-    connect(_terminalCB, TQT_SIGNAL(clicked()), TQT_SLOT(termcb_clicked()));
+    connect(_terminalCB, TQ_SIGNAL(clicked()), TQ_SLOT(termcb_clicked()));
     vbox->addWidget(_terminalCB);
 
     hbox = new TQHBox(_term_group);
@@ -169,8 +169,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     _termOptEdit->setAcceptDrops(false);
     _termOptLabel->setBuddy(_termOptEdit);
 
-    connect(_termOptEdit, TQT_SIGNAL(textChanged(const TQString&)),
-            TQT_SLOT(slotChanged()));
+    connect(_termOptEdit, TQ_SIGNAL(textChanged(const TQString&)),
+            TQ_SLOT(slotChanged()));
     vbox->addWidget(hbox);
     layout->addMultiCellWidget(_term_group, 2, 2, 0, 1);
 
@@ -182,7 +182,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
                            KDialog::spacingHint());
 
     _uidCB = new TQCheckBox(i18n("&Run as a different user"), _uid_group);
-    connect(_uidCB, TQT_SIGNAL(clicked()), TQT_SLOT(uidcb_clicked()));
+    connect(_uidCB, TQ_SIGNAL(clicked()), TQ_SLOT(uidcb_clicked()));
     vbox->addWidget(_uidCB);
 
     hbox = new TQHBox(_uid_group);
@@ -192,8 +192,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     _uidEdit->setAcceptDrops(false);
     _uidLabel->setBuddy(_uidEdit);
 
-    connect(_uidEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	    TQT_SLOT(slotChanged()));
+    connect(_uidEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	    TQ_SLOT(slotChanged()));
     vbox->addWidget(hbox);
     layout->addMultiCellWidget(_uid_group, 3, 3, 0, 1);
 
@@ -216,11 +216,11 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
     //_keyEdit->setText( "" );
     //TQPushButton* _keyButton = new TQPushButton( i18n( "Change" ),
     //                                           general_group_keybind );
-    //connect( _keyButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( keyButtonPressed()));
+    //connect( _keyButton, TQ_SIGNAL( clicked()), this, TQ_SLOT( keyButtonPressed()));
     _keyEdit = new KKeyButton(general_group_keybind);
     grid_keybind->addWidget(new TQLabel(_keyEdit, i18n("Current shortcut &key:"), general_group_keybind), 0, 0);
-    connect( _keyEdit, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
-             this, TQT_SLOT(slotCapturedShortcut(const TDEShortcut&)));
+    connect( _keyEdit, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)),
+             this, TQ_SLOT(slotCapturedShortcut(const TDEShortcut&)));
     grid_keybind->addWidget(_keyEdit, 0, 1);
     //grid_keybind->addWidget(_keyButton, 0, 2 );
 
@@ -337,7 +337,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
        return;
     }
 
-    KDesktopFile *df = entryInfo->desktopFile();
+    TDEDesktopFile *df = entryInfo->desktopFile();
 
     _nameEdit->setText(df->readName());
     _descriptionEdit->setText(df->readGenericName());
@@ -398,7 +398,7 @@ void BasicTab::apply()
         _menuEntryInfo->setDescription(_descriptionEdit->text());
         _menuEntryInfo->setIcon(_iconButton->icon());
 
-        KDesktopFile *df = _menuEntryInfo->desktopFile();
+        TDEDesktopFile *df = _menuEntryInfo->desktopFile();
         df->writeEntry("Comment", _commentEdit->text());
         if (_systrayCB->isChecked())
           df->writePathEntry("Exec", _execEdit->lineEdit()->text().prepend("ksystraycmd "));
diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp
index cd580e02e..1801e7709 100644
--- a/kmenuedit/kcontrol_main.cpp
+++ b/kmenuedit/kcontrol_main.cpp
@@ -21,18 +21,18 @@
 
 #include <unistd.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "kmenuedit.h"
 
 static const char description[] = I18N_NOOP("TDE control center editor");
 static const char version[] = "1.0";
 
-extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
+extern "C" int TDE_EXPORT kdemain( int argc, char **argv )
 {
     TDELocale::setMainCatalogue("kmenuedit");
     TDEAboutData aboutData("kcontroledit", I18N_NOOP("Trinity Control Center Editor"),
@@ -43,12 +43,12 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
     aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
 
     TDECmdLineArgs::init( argc, argv, &aboutData );
-    KUniqueApplication::addCmdLineOptions();
+    TDEUniqueApplication::addCmdLineOptions();
 
-    if (!KUniqueApplication::start()) 
+    if (!TDEUniqueApplication::start()) 
 	return 1;
 
-    KUniqueApplication app;
+    TDEUniqueApplication app;
 
     KMenuEdit *menuEdit = new KMenuEdit(true);
     menuEdit->show();
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 05414213f..282c9843c 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -67,12 +67,12 @@ void KMenuEdit::setupActions()
     if (!m_controlCenter)
        (void)new TDEAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep");
 
-    (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
+    (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, this, TQ_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
 
     m_actionDelete = 0;
 
-    KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT( slotSave() ), actionCollection());
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
+    KStdAction::save(this, TQ_SLOT( slotSave() ), actionCollection());
+    KStdAction::quit(this, TQ_SLOT( close() ), actionCollection());
     KStdAction::cut(0, 0, actionCollection());
     KStdAction::copy(0, 0, actionCollection());
     KStdAction::paste(0, 0, actionCollection());
@@ -84,21 +84,21 @@ void KMenuEdit::setupView()
     m_tree = new TreeView(m_controlCenter, actionCollection(), m_splitter);
     m_basicTab = new BasicTab(m_splitter);
 
-    connect(m_tree, TQT_SIGNAL(entrySelected(MenuFolderInfo *)),
-            m_basicTab, TQT_SLOT(setFolderInfo(MenuFolderInfo *)));
-    connect(m_tree, TQT_SIGNAL(entrySelected(MenuEntryInfo *)),
-            m_basicTab, TQT_SLOT(setEntryInfo(MenuEntryInfo *)));
-    connect(m_tree, TQT_SIGNAL(disableAction()),
-            m_basicTab, TQT_SLOT(slotDisableAction() ) );
+    connect(m_tree, TQ_SIGNAL(entrySelected(MenuFolderInfo *)),
+            m_basicTab, TQ_SLOT(setFolderInfo(MenuFolderInfo *)));
+    connect(m_tree, TQ_SIGNAL(entrySelected(MenuEntryInfo *)),
+            m_basicTab, TQ_SLOT(setEntryInfo(MenuEntryInfo *)));
+    connect(m_tree, TQ_SIGNAL(disableAction()),
+            m_basicTab, TQ_SLOT(slotDisableAction() ) );
 
-    connect(m_basicTab, TQT_SIGNAL(changed(MenuFolderInfo *)),
-            m_tree, TQT_SLOT(currentChanged(MenuFolderInfo *)));
+    connect(m_basicTab, TQ_SIGNAL(changed(MenuFolderInfo *)),
+            m_tree, TQ_SLOT(currentChanged(MenuFolderInfo *)));
 
-    connect(m_basicTab, TQT_SIGNAL(changed(MenuEntryInfo *)),
-            m_tree, TQT_SLOT(currentChanged(MenuEntryInfo *)));
+    connect(m_basicTab, TQ_SIGNAL(changed(MenuEntryInfo *)),
+            m_tree, TQ_SLOT(currentChanged(MenuEntryInfo *)));
 
-    connect(m_basicTab, TQT_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)),
-            m_tree, TQT_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &)));
+    connect(m_basicTab, TQ_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)),
+            m_tree, TQ_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &)));
 
     // restore splitter sizes
     TDEConfig* config = TDEGlobal::config();
diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp
index b78a71ef0..69440e946 100644
--- a/kmenuedit/main.cpp
+++ b/kmenuedit/main.cpp
@@ -20,7 +20,7 @@
 
 #include <unistd.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
@@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] =
 
 static KMenuEdit *menuEdit = 0;
 
-class KMenuApplication : public KUniqueApplication
+class KMenuApplication : public TDEUniqueApplication
 {
 public:
    KMenuApplication() { }
@@ -57,12 +57,12 @@ public:
               menuEdit->selectMenuEntry(TQString::fromLocal8Bit(args->arg(1)));
           }
       }
-      return KUniqueApplication::newInstance();
+      return TDEUniqueApplication::newInstance();
    }
 };
 
 
-extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
+extern "C" int TDE_EXPORT kdemain( int argc, char **argv )
 {
     TDEAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"),
 			 version, description, TDEAboutData::License_GPL,
@@ -72,10 +72,10 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
     aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
 
     TDECmdLineArgs::init( argc, argv, &aboutData );
-    KUniqueApplication::addCmdLineOptions();
+    TDEUniqueApplication::addCmdLineOptions();
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    if (!KUniqueApplication::start()) 
+    if (!TDEUniqueApplication::start()) 
 	return 1;
 
     KMenuApplication app;
diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp
index 2322cc31d..612da6cd1 100644
--- a/kmenuedit/menufile.cpp
+++ b/kmenuedit/menufile.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "menufile.h"
 
@@ -188,7 +188,7 @@ TQDomElement MenuFile::findMenu(TQDomElement elem, const TQString &menuName, boo
    
 static TQString entryToDirId(const TQString &path)
 {
-   // See also KDesktopFile::locateLocal
+   // See also TDEDesktopFile::locateLocal
    TQString local;
    if (path.startsWith("/"))
    {
diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp
index 03c3a2e57..c6fe00a12 100644
--- a/kmenuedit/menuinfo.cpp
+++ b/kmenuedit/menuinfo.cpp
@@ -22,9 +22,9 @@
 
 #include <tqregexp.h>
 
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <khotkeys.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 //
 // MenuFolderInfo
@@ -191,7 +191,7 @@ void MenuFolderInfo::save(MenuFile *menuFile)
 
    if (dirty)
    {
-      TQString local = KDesktopFile::locateLocal(directoryFile);
+      TQString local = TDEDesktopFile::locateLocal(directoryFile);
 
       TDEConfig *df = 0;
       if (directoryFile != local)
@@ -305,11 +305,11 @@ MenuEntryInfo::~MenuEntryInfo()
    delete df;
 }
 
-KDesktopFile *MenuEntryInfo::desktopFile()
+TDEDesktopFile *MenuEntryInfo::desktopFile()
 {
    if (!df)
    {
-      df = new KDesktopFile(service->desktopEntryPath());
+      df = new TDEDesktopFile(service->desktopEntryPath());
    }
    return df;
 }
@@ -323,7 +323,7 @@ void MenuEntryInfo::setDirty()
    TQString local = locateLocal("xdgdata-apps", service->menuId());
    if (local != service->desktopEntryPath())
    {
-      KDesktopFile *oldDf = desktopFile();
+      TDEDesktopFile *oldDf = desktopFile();
       df = oldDf->copyTo(local);
       df->setDesktopGroup();
       delete oldDf;
diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h
index 9497022d0..f766e4612 100644
--- a/kmenuedit/menuinfo.h
+++ b/kmenuedit/menuinfo.h
@@ -142,7 +142,7 @@ public:
 class MenuEntryInfo : public MenuInfo
 {
 public:
-    MenuEntryInfo(const KService::Ptr &_service, KDesktopFile *_df = 0) 
+    MenuEntryInfo(const KService::Ptr &_service, TDEDesktopFile *_df = 0) 
      : service(_service), df(_df), 
        shortcutLoaded(false), shortcutDirty(false), dirty(_df != 0), hidden(false)
     {
@@ -174,14 +174,14 @@ public:
     
     void save();
 
-    KDesktopFile *desktopFile();
+    TDEDesktopFile *desktopFile();
 
 public:
     TQString caption;
     TQString description;
     TQString icon;
     KService::Ptr service;
-    KDesktopFile *df;
+    TDEDesktopFile *df;
     TDEShortcut shortCut;
     bool shortcutLoaded;
     bool shortcutDirty;
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 0e15d8d38..304d95e42 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -34,13 +34,13 @@
 #include <tqstringlist.h>
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinputdialog.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeaction.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
@@ -163,23 +163,23 @@ TreeView::TreeView( bool controlCenter, TDEActionCollection *ac, TQWidget *paren
     addColumn("");
     header()->hide();
 
-    connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
-	    TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+    connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
+	    TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
 
-    connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
-	    TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this, TQ_SIGNAL(clicked( TQListViewItem* )),
+	    TQ_SLOT(itemSelected( TQListViewItem* )));
 
-    connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
-            TQT_SLOT(itemSelected( TQListViewItem* )));
+    connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+            TQ_SLOT(itemSelected( TQListViewItem* )));
 
-    connect(this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
-	    TQT_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&)));
+    connect(this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
+	    TQ_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&)));
 
     // connect actions
-    connect(m_ac->action("newitem"), TQT_SIGNAL(activated()), TQT_SLOT(newitem()));
-    connect(m_ac->action("newsubmenu"), TQT_SIGNAL(activated()), TQT_SLOT(newsubmenu()));
+    connect(m_ac->action("newitem"), TQ_SIGNAL(activated()), TQ_SLOT(newitem()));
+    connect(m_ac->action("newsubmenu"), TQ_SIGNAL(activated()), TQ_SLOT(newsubmenu()));
     if (m_ac->action("newsep"))
-        connect(m_ac->action("newsep"), TQT_SIGNAL(activated()), TQT_SLOT(newsep()));
+        connect(m_ac->action("newsep"), TQ_SIGNAL(activated()), TQ_SLOT(newsep()));
 
     m_menuFile = new MenuFile( locateLocal("xdgconf-menu", "applications-tdemenuedit.menu"));
     m_rootFolder = new MenuFolderInfo;
@@ -215,21 +215,21 @@ void TreeView::setViewMode(bool showHidden)
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(cut()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(cut()));
     }
 
     action = m_ac->action("edit_copy");
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(copy()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(copy()));
     }
 
     action = m_ac->action("edit_paste");
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(paste()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(paste()));
     }
 
     m_rmb->insertSeparator();
@@ -238,7 +238,7 @@ void TreeView::setViewMode(bool showHidden)
     if(action) {
         action->plug(m_rmb);
         action->setEnabled(false);
-        connect(action, TQT_SIGNAL(activated()), TQT_SLOT(del()));
+        connect(action, TQ_SIGNAL(activated()), TQ_SLOT(del()));
     }
 
     m_rmb->insertSeparator();
@@ -316,7 +316,7 @@ void TreeView::fill()
     TQApplication::restoreOverrideCursor();
 }
 
-TQString TreeView::findName(KDesktopFile *df, bool deleted)
+TQString TreeView::findName(TDEDesktopFile *df, bool deleted)
 {
     TQString name = df->readName();
     if (deleted)
@@ -340,7 +340,7 @@ TQString TreeView::findName(KDesktopFile *df, bool deleted)
                 continue;
              }
 
-             KDesktopFile df2(*it);
+             TDEDesktopFile df2(*it);
              name = df2.readName();
 
              if (!name.isEmpty() && (name != "empty"))
@@ -692,10 +692,10 @@ static TQString createDesktopFile(const TQString &file, TQString *menuId, TQStri
    return result;
 }
 
-static KDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, TQStringList *excludeList)
+static TDEDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, TQStringList *excludeList)
 {
    TQString result = createDesktopFile(entryInfo->file(), menuId, excludeList);
-   KDesktopFile *df = entryInfo->desktopFile()->copyTo(result);
+   TDEDesktopFile *df = entryInfo->desktopFile()->copyTo(result);
    df->deleteEntry("Categories"); // Don't set any categories!
    
    return df;
@@ -749,8 +749,8 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI
 
      TQString menuId;
      TQString result = createDesktopFile(path, &menuId, &m_newMenuIds);
-     KDesktopFile orig_df(path);
-     KDesktopFile *df = orig_df.copyTo(result);
+     TDEDesktopFile orig_df(path);
+     TDEDesktopFile *df = orig_df.copyTo(result);
      df->deleteEntry("Categories"); // Don't set any categories!
 
      KService *s = new KService(df);
@@ -869,7 +869,7 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI
       {
 
          // Need to copy file and then add it
-         KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
+         TDEDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
 //UNDO-ACTION: NEW_MENU_ID (menuId)
 
          KService *s = new KService(df);
@@ -1030,7 +1030,7 @@ void TreeView::newsubmenu()
    folderInfo->hidden = false;
    folderInfo->setDirty();
 
-   KDesktopFile *df = new KDesktopFile(file);
+   TDEDesktopFile *df = new TDEDesktopFile(file);
    df->writeEntry("Name", folderInfo->caption);
    df->writeEntry("Icon", folderInfo->icon);
    df->sync();
@@ -1073,7 +1073,7 @@ void TreeView::newitem()
 
    file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create
 
-   KDesktopFile *df = new KDesktopFile(file);
+   TDEDesktopFile *df = new TDEDesktopFile(file);
    df->writeEntry("Name", caption);
    df->writeEntry("Type", "Application");
 
@@ -1314,7 +1314,7 @@ void TreeView::paste()
       if (command == COPY_FILE)
       {
          // Need to copy file and then add it
-         KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
+         TDEDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
 
          KService *s = new KService(df);
          s->setMenuId(menuId);
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index c456d1c9c..329dbcf9e 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -29,7 +29,7 @@
 
 class TQPopupMenu;
 class TDEActionCollection;
-class KDesktopFile;
+class TDEDesktopFile;
 class MenuFile;
 class MenuFolderInfo;
 class MenuEntryInfo;
@@ -133,7 +133,7 @@ protected:
     void del(TreeItem *, bool deleteInfo);
     void fill();
     void fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent);
-    TQString findName(KDesktopFile *df, bool deleted);
+    TQString findName(TDEDesktopFile *df, bool deleted);
 
     void closeAllItems(TQListViewItem *item);
 
diff --git a/knetattach/CMakeLists.txt b/knetattach/CMakeLists.txt
index e5c4d7aa1..adf1ae32e 100644
--- a/knetattach/CMakeLists.txt
+++ b/knetattach/CMakeLists.txt
@@ -9,6 +9,8 @@
 #
 #################################################
 
+add_subdirectory( tdeconf_update )
+
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 781643ff1..44504aff5 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -51,14 +51,6 @@
                     <property name="margin">
                         <number>0</number>
                     </property>
-                    <widget class="TQRadioButton" row="4" column="0">
-                        <property name="name">
-                            <cstring>_recent</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Recent connection:</string>
-                        </property>
-                    </widget>
                     <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>_webfolder</cstring>
@@ -70,18 +62,53 @@
                             <bool>true</bool>
                         </property>
                     </widget>
+                    <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>_ftp</cstring>
+                        </property>
+                        <property name="text">
+                            <string>FT&amp;P</string>
+                        </property>
+                    </widget>
+                    <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>_smb</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&amp;Microsoft® Windows® network drive</string>
+                        </property>
+                    </widget>
                     <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
+                            <cstring>_sftp</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&amp;Secure shell (via SFTP)</string>
+                        </property>
+                        <property name="checked">
+                            <bool>false</bool>
+                        </property>
+                    </widget>
+                    <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="2">
+                        <property name="name">
                             <cstring>_fish</cstring>
                         </property>
                         <property name="text">
-                            <string>&amp;Secure shell (ssh)</string>
+                            <string>&amp;Secure shell (via FISH)</string>
                         </property>
                         <property name="checked">
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="KComboBox" row="4" column="1">
+                    <widget class="TQRadioButton" row="5" column="0">
+                        <property name="name">
+                            <cstring>_recent</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&amp;Recent connection:</string>
+                        </property>
+                    </widget>
+                    <widget class="KComboBox" row="5" column="1">
                         <property name="name">
                             <cstring>_recentConnectionName</cstring>
                         </property>
@@ -103,22 +130,6 @@
                             </size>
                         </property>
                     </widget>
-                    <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>_ftp</cstring>
-                        </property>
-                        <property name="text">
-                            <string>FT&amp;P</string>
-                        </property>
-                    </widget>
-                    <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>_smb</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Microsoft® Windows® network drive</string>
-                        </property>
-                    </widget>
                 </grid>
             </widget>
             <spacer row="3" column="0">
@@ -411,9 +422,9 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="global" impldecl="in implementation">tdeglobalsettings.h</include>
-    <include location="global" impldecl="in implementation">ksimpleconfig.h</include>
+    <include location="global" impldecl="in implementation">tdesimpleconfig.h</include>
     <include location="global" impldecl="in implementation">tdeapplication.h</include>
-    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
+    <include location="global" impldecl="in implementation">tdestandarddirs.h</include>
     <include location="global" impldecl="in implementation">kdirnotify_stub.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
@@ -424,7 +435,7 @@
 <variables>
     <variable access="private">TQString _type;</variable>
 </variables>
-<Q_SLOTS>
+<slots>
     <slot access="private">init()</slot>
     <slot>setInformationText( const TQString &amp; type )</slot>
     <slot access="private">showPage( TQWidget * page )</slot>
@@ -432,7 +443,7 @@
     <slot access="private">finished()</slot>
     <slot access="private">updatePort( bool encryption )</slot>
     <slot access="private">updateFinishButtonText( bool save )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="private" returnType="bool">doConnectionTest( const KURL &amp; url )</function>
     <function access="private" returnType="bool">updateForProtocol( const TQString &amp; protocol )</function>
diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h
index f71240990..07678f2b5 100644
--- a/knetattach/knetattach.ui.h
+++ b/knetattach/knetattach.ui.h
@@ -13,8 +13,8 @@
 void KNetAttach::init()
 {
     setIcon(SmallIcon("knetattach"));
-    disconnect(finishButton(), TQT_SIGNAL(clicked()), (TQDialog*)this, TQT_SLOT(accept()));
-    connect(finishButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(finished()));
+    disconnect(finishButton(), TQ_SIGNAL(clicked()), (TQDialog*)this, TQ_SLOT(accept()));
+    connect(finishButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(finished()));
     finishButton()->setText(i18n("Save && C&onnect"));
     //setResizeMode(Fixed); FIXME: make the wizard fixed-geometry
     setFinishEnabled(_folderParameters, false);
@@ -38,7 +38,7 @@ void KNetAttach::setInformationText( const TQString &type )
     
     if (type=="WebFolder") {
 	text = i18n("Enter a name for this <i>WebFolder</i> as well as a server address, port and folder path to use and press the <b>Save & Connect</b> button.");
-    } else if (type=="Fish") {
+    } else if (type=="Fish"||type=="SFTP") {
 	text = i18n("Enter a name for this <i>Secure shell connection</i> as well as a server address, port and folder path to use and press the <b>Save & Connect</b> button.");
     } else if (type=="FTP") {
         text = i18n("Enter a name for this <i>File Transfer Protocol connection</i> as well as a server address and folder path to use and press the <b>Save & Connect</b> button.");
@@ -64,6 +64,10 @@ void KNetAttach::showPage( TQWidget *page )
 	    setInformationText("Fish");
 	    updateForProtocol("Fish");
 	    _port->setValue(22);
+    } else if (_sftp->isChecked()) {
+        setInformationText("SFTP");
+        updateForProtocol("SFTP");
+        _port->setValue(22);
 	} else if (_ftp->isChecked()) {
 	    setInformationText("FTP");
 	    updateForProtocol("FTP");
@@ -139,6 +143,9 @@ void KNetAttach::finished()
     } else if (_type == "Fish") {
 	url.setProtocol("fish");
 	url.setPort(_port->value());
+    } else if (_type == "SFTP") {
+        url.setProtocol("sftp");
+        url.setPort(_port->value());
     } else if (_type == "FTP") {
 	url.setProtocol("ftp");
 	url.setPort(_port->value());
@@ -164,7 +171,7 @@ void KNetAttach::finished()
 	return;
     }
 
-    kapp->invokeBrowser(url.url());
+    tdeApp->invokeBrowser(url.url());
 
     TQString name = _connectionName->text().stripWhiteSpace();
 
@@ -174,9 +181,9 @@ void KNetAttach::finished()
 
 	TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
 	path += name + ".desktop";
-	KSimpleConfig desktopFile(path, false);
+	TDESimpleConfig desktopFile(path, false);
 	desktopFile.setGroup("Desktop Entry");
-	desktopFile.writeEntry("Icon", "applications-internet");
+	desktopFile.writeEntry("Icon", "server");
 	desktopFile.writeEntry("Name", name);
 	desktopFile.writeEntry("Type", "Link");
 	desktopFile.writeEntry("URL", url.prettyURL());
@@ -207,7 +214,7 @@ void KNetAttach::finished()
 	}
 	recent.setGroup(name);
 	recent.writeEntry("URL", url.prettyURL());
-	if (_type == "WebFolder" || _type == "Fish" || _type == "FTP") {
+	if (_type == "WebFolder" || _type == "Fish" || _type == "SFTP" || _type == "FTP") {
 	    recent.writeEntry("Port", _port->value());
 	}
 	recent.writeEntry("Type", _type);
@@ -250,7 +257,7 @@ bool KNetAttach::updateForProtocol(const TQString& protocol)
 	_port->show();
 	_userText->show();
 	_user->show();
-    } else if (protocol == "Fish") {
+    } else if (protocol == "Fish" || protocol == "SFTP") {
 	_useEncryption->hide();
 	_portText->show();
 	_port->show();
diff --git a/knetattach/tdeconf_update/CMakeLists.txt b/knetattach/tdeconf_update/CMakeLists.txt
new file mode 100644
index 000000000..b32f6417c
--- /dev/null
+++ b/knetattach/tdeconf_update/CMakeLists.txt
@@ -0,0 +1,18 @@
+###############################################################################
+#                                                                             #
+# Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com                     #
+#                                                                             #
+# Licensed under the terms of GNU General Public License v2 or later.         #
+# Improvements are welcome!                                                   # 
+#                                                                             #
+###############################################################################
+
+install(
+  FILES remote_folder_icon.upd
+  DESTINATION ${KCONF_UPDATE_INSTALL_DIR}
+)
+
+install(
+  PROGRAMS remote_folder_icon_upd.sh
+  DESTINATION ${KCONF_UPDATE_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/knetattach/tdeconf_update/remote_folder_icon.upd b/knetattach/tdeconf_update/remote_folder_icon.upd
new file mode 100644
index 000000000..66f75f96d
--- /dev/null
+++ b/knetattach/tdeconf_update/remote_folder_icon.upd
@@ -0,0 +1,2 @@
+Id=remote_folder_icon_update
+Script=remote_folder_icon_upd.sh
\ No newline at end of file
diff --git a/knetattach/tdeconf_update/remote_folder_icon_upd.sh b/knetattach/tdeconf_update/remote_folder_icon_upd.sh
new file mode 100755
index 000000000..b859896ff
--- /dev/null
+++ b/knetattach/tdeconf_update/remote_folder_icon_upd.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+find "$HOME/.trinity/share/apps/remoteview" -type f -iname "*.desktop" -print0 2>/dev/null | \
+    xargs -r0 sed -ri "s|Icon=applications-internet|Icon=server|g"
\ No newline at end of file
diff --git a/konqueror/KonqMainWindowIface.cpp b/konqueror/KonqMainWindowIface.cpp
index a18301a2f..f2b3d4c0d 100644
--- a/konqueror/KonqMainWindowIface.cpp
+++ b/konqueror/KonqMainWindowIface.cpp
@@ -93,7 +93,7 @@ DCOPRef KonqMainWindowIface::currentView()
   if ( !view )
     return DCOPRef();
 
-  return DCOPRef( kapp->dcopClient()->appId(), view->dcopObject()->objId() );
+  return DCOPRef( tdeApp->dcopClient()->appId(), view->dcopObject()->objId() );
 }
 
 DCOPRef KonqMainWindowIface::currentPart()
@@ -115,7 +115,7 @@ DCOPRef KonqMainWindowIface::view(int viewNumber)
       ++it;
   if ( it == viewMap.end() )
       return DCOPRef();
-  return DCOPRef( kapp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
+  return DCOPRef( tdeApp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
 }
 
 DCOPRef KonqMainWindowIface::part(int viewNumber)
@@ -131,7 +131,7 @@ DCOPRef KonqMainWindowIface::part(int viewNumber)
 
 DCOPRef KonqMainWindowIface::action( const TQCString &name )
 {
-  return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
+  return DCOPRef( tdeApp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
 }
 
 QCStringList KonqMainWindowIface::actions()
@@ -153,13 +153,13 @@ TQMap<TQCString,DCOPRef> KonqMainWindowIface::actionMap()
 
 QCStringList KonqMainWindowIface::functionsDynamic()
 {
-    return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( TQT_TQOBJECT(m_pMainWindow) );
+    return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow );
 }
 
 bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData )
 {
-    if ( KDCOPPropertyProxy::isPropertyRequest( fun, TQT_TQOBJECT(m_pMainWindow) ) )
-        return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, TQT_TQOBJECT(m_pMainWindow) );
+    if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) )
+        return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow );
 
     return DCOPObject::processDynamic( fun, data, replyType, replyData );
 }
diff --git a/konqueror/KonqViewIface.cpp b/konqueror/KonqViewIface.cpp
index 77bfbb61c..12e0fb4a1 100644
--- a/konqueror/KonqViewIface.cpp
+++ b/konqueror/KonqViewIface.cpp
@@ -91,7 +91,7 @@ DCOPRef KonqViewIface::part()
   if ( dcopProperty.type() != TQVariant::CString )
     return res;
 
-  res.setRef( kapp->dcopClient()->appId(), dcopProperty.toCString() );
+  res.setRef( tdeApp->dcopClient()->appId(), dcopProperty.toCString() );
   return res;
 }
 
diff --git a/konqueror/KonquerorIface.cpp b/konqueror/KonquerorIface.cpp
index db87e39ed..a449a0488 100644
--- a/konqueror/KonquerorIface.cpp
+++ b/konqueror/KonquerorIface.cpp
@@ -60,7 +60,7 @@ DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
 
 DCOPRef KonquerorIface::openBrowserWindowASN( const TQString &url, const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return openBrowserWindow( url );
 }
 
@@ -71,7 +71,7 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url )
 
 DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString& startup_id, bool tempFile )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindow( url, TQString::null, tempFile );
 }
 
@@ -86,7 +86,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStr
 
 DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQStringList filesToSelect, const TQCString &startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindowWithSelection( url, filesToSelect );
 }
 
@@ -106,7 +106,7 @@ DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mi
 DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString &mimetype,
     const TQCString& startup_id, bool tempFile )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createNewWindow( url, mimetype, tempFile );
 }
 
@@ -123,7 +123,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfile( path );
 }
 
@@ -141,7 +141,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, c
 DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path, const TQString &filename,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfile( path, filename );
 }
 
@@ -157,7 +157,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & p
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfileAndURL( path, filename, url );
 }
 
@@ -175,7 +175,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &pa
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString & path, const TQString &filename, const TQString &url, const TQString &mimetype,
     const TQCString& startup_id )
 {
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     return createBrowserWindowFromProfileAndURL( path, filename, url, mimetype );
 }
 
@@ -218,7 +218,7 @@ TQValueList<DCOPRef> KonquerorIface::getWindows()
     {
       TQPtrListIterator<KonqMainWindow> it( *mainWindows );
       for (; it.current(); ++it )
-        lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
+        lst.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
     }
     return lst;
 }
@@ -290,5 +290,5 @@ bool KonquerorIface::processCanBeReused( int screen )
 void KonquerorIface::terminatePreloaded()
 {
     if( KonqMainWindow::isPreloaded())
-        kapp->exit();
+        tdeApp->exit();
 }
diff --git a/konqueror/about/konq_aboutpage.cpp b/konqueror/about/konq_aboutpage.cpp
index a18aa3eda..9d9fe4c71 100644
--- a/konqueror/about/konq_aboutpage.cpp
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -8,7 +8,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kurifilter.h>
@@ -81,7 +81,7 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file )
 		       file.left( file.findRev( '/' )) +
 		       TQString::fromLatin1("/\">\n");
     TQRegExp reg("<head>");
-    reg.setCaseSensitive(FALSE);
+    reg.setCaseSensitive(false);
     res.replace(reg, "<head>\n\t" + basehref);
     return res;
 }
@@ -111,7 +111,7 @@ TQString KonqAboutPageFactory::launch()
   TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
   res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
   else
     res = res.arg( "" );
@@ -196,7 +196,7 @@ TQString KonqAboutPageFactory::intro()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -251,7 +251,7 @@ TQString KonqAboutPageFactory::specs()
 	return res;
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -348,7 +348,7 @@ TQString KonqAboutPageFactory::tips()
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
-    if ( kapp->reverseLayout() )
+    if ( tdeApp->reverseLayout() )
 	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) );
     else
 	res = res.arg( "" );
@@ -412,7 +412,7 @@ TQString KonqAboutPageFactory::plugins()
     if ( s_plugins_html )
         return *s_plugins_html;
 
-    TQString res = loadFile( locate( "data", kapp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
+    TQString res = loadFile( locate( "data", tdeApp->reverseLayout() ? "konqueror/about/plugins_rtl.html" : "konqueror/about/plugins.html" ))
                   .arg(i18n("Installed Plugins"))
                   .arg(i18n("<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"))
                   .arg(i18n("Installed"))
diff --git a/konqueror/about/top-right-konqueror.png b/konqueror/about/top-right-konqueror.png
index f685d4a3c..7ad4ea948 100644
--- a/konqueror/about/top-right-konqueror.png
+++ b/konqueror/about/top-right-konqueror.png
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp
index efc858f61..81c527f55 100644
--- a/konqueror/client/kfmclient.cpp
+++ b/konqueror/client/kfmclient.cpp
@@ -30,8 +30,8 @@
 #include <kpropertiesdialog.h>
 #include <tdelocale.h>
 #include <ktrader.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <kopenwith.h>
 #include <kurlrequesterdlg.h>
 #include <tdemessagebox.h>
@@ -68,7 +68,7 @@ static const TDECmdLineOptions options[] =
    TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
 {
   TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false);
 
@@ -323,8 +323,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
             TDEStartupInfo::appStarted();
 
             KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor]
-            TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
-            TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
+            TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() ));
+            TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() ));
             app.exec();
             return !krun_has_error;
         }
@@ -423,7 +423,7 @@ void clientApp::delayedQuit()
 {
     // Quit in 2 seconds. This leaves time for KRun to pop up
     // "app not found" in TDEProcessRunner, if that was the case.
-    TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) );
+    TQTimer::singleShot( 2000, this, TQ_SLOT(deref()) );
     // don't access the KRun instance later, it will be deleted after calling slots
     if( static_cast< const KRun* >( sender())->hasError())
         krun_has_error = true;
@@ -454,7 +454,7 @@ bool clientApp::doIt()
   }
   TQCString command = args->arg(0);
 
-  // read ASN env. variable for non-KApp cases
+  // read ASN env. variable for non-TDEApp cases
   startup_id_str = TDEStartupInfo::currentStartupIdEnv().id();
 
   if ( command == "openURL" || command == "newTab" )
@@ -504,8 +504,8 @@ bool clientApp::doIt()
   {
     checkArgumentCount(argc, 2, 2);
     KPropertiesDialog * p = new KPropertiesDialog( args->url(1) );
-    TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() ));
-    TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() ));
+    TQObject::connect( p, TQ_SIGNAL( destroyed() ), &app, TQ_SLOT( quit() ));
+    TQObject::connect( p, TQ_SIGNAL( canceled() ), &app, TQ_SLOT( slotDialogCanceled() ));
     app.exec();
     return m_ok;
   }
@@ -520,8 +520,8 @@ bool clientApp::doIt()
     else if ( argc == 2 )
     {
       KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ );
-      TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
-      TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
+      TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() ));
+      TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() ));
       app.exec();
       return !krun_has_error;
     }
@@ -538,8 +538,8 @@ bool clientApp::doIt()
   else if ( command == "openBrowser" )
   {
     KRun * run = new KRun( "http://default.browser", 0, 0, false, false /* no progress window */ );
-    TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() ));
-    TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() ));
+    TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() ));
+    TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() ));
     app.exec();
     return !krun_has_error;
   }
@@ -553,7 +553,7 @@ bool clientApp::doIt()
     TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) );
     if ( !s_interactive )
         job->setInteractive( false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     app.exec();
     return m_ok;
   }
@@ -588,7 +588,7 @@ bool clientApp::doIt()
     TDEIO::Job * job = TDEIO::copy( srcLst, dsturl );
     if ( !s_interactive )
         job->setInteractive( false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     app.exec();
     return m_ok;
   }
@@ -602,7 +602,7 @@ bool clientApp::doIt()
     TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) );
     if ( !s_interactive )
         job->setInteractive( false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     app.exec();
     return m_ok;
   }
@@ -619,7 +619,7 @@ bool clientApp::doIt()
   {
     checkArgumentCount(argc, 1, 1);
     TQByteArray data;
-    kapp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
+    tdeApp->dcopClient()->send( "*", "KonqMainViewIface", "reparseConfiguration()", data );
     // Warning. In case something is added/changed here, keep kcontrol/konq/main.cpp in sync.
   }
   else if ( command == "configureDesktop" )
diff --git a/konqueror/delayedinitializer.cpp b/konqueror/delayedinitializer.cpp
index e30db3d21..a635fb1ac 100644
--- a/konqueror/delayedinitializer.cpp
+++ b/konqueror/delayedinitializer.cpp
@@ -38,7 +38,7 @@ bool DelayedInitializer::eventFilter( TQObject *receiver, TQEvent *event )
     // Move the emitting of the event to the end of the eventQueue
     // so we are absolutely sure the event we get here is handled before
     // the initialize is fired.
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotInitialize() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotInitialize() ) );
 
     return false;
 }
diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp
index 1a84fb28d..04b973f8f 100644
--- a/konqueror/iconview/konq_iconview.cpp
+++ b/konqueror/iconview/konq_iconview.cpp
@@ -184,22 +184,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" );
     m_pIconView->initConfig( true );
 
-    connect( m_pIconView,  TQT_SIGNAL(imagePreviewFinished()),
-             this, TQT_SLOT(slotRenderingFinished()));
+    connect( m_pIconView,  TQ_SIGNAL(imagePreviewFinished()),
+             this, TQ_SLOT(slotRenderingFinished()));
 
     // connect up the icon inc/dec signals
-    connect( m_pIconView,  TQT_SIGNAL(incIconSize()),
-             this, TQT_SLOT(slotIncIconSize()));
-    connect( m_pIconView,  TQT_SIGNAL(decIconSize()),
-             this, TQT_SLOT(slotDecIconSize()));
+    connect( m_pIconView,  TQ_SIGNAL(incIconSize()),
+             this, TQ_SLOT(slotIncIconSize()));
+    connect( m_pIconView,  TQ_SIGNAL(decIconSize()),
+             this, TQ_SLOT(slotDecIconSize()));
 
     // pass signals to the extension
-    connect( m_pIconView, TQT_SIGNAL( enableAction( const char *, bool ) ),
-             m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) );
+    connect( m_pIconView, TQ_SIGNAL( enableAction( const char *, bool ) ),
+             m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) );
 
     // signals from konqdirpart (for BC reasons)
-    connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) );
-    connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) );
+    connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) );
+    connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) );
 
     setWidget( m_pIconView );
     m_mimeTypeResolver = new KMimeTypeResolver<KFileIVI,KonqKfmIconView>(this);
@@ -211,22 +211,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     // Don't repaint on configuration changes during construction
     m_bInit = true;
 
-    m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ),
+    m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ),
                                       actionCollection(), "show_dot" );
 //    m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files"));
     m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) );
 
-    m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ),
+    m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQ_SLOT( slotShowDirectoryOverlays() ),
                                       actionCollection(), "show_directory_overlays" );
 
-    m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQT_SLOT( slotShowFreeSpaceOverlays() ),
+    m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQ_SLOT( slotShowFreeSpaceOverlays() ),
                                       actionCollection(), "show_free_space_overlays" );
 
     m_pamPreview = new TDEActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" );
 
     m_paEnablePreviews = new TDEToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" );
     m_paEnablePreviews->setCheckedState( i18n("Disable Previews") );
-    connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
+    connect( m_paEnablePreviews, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) );
     m_paEnablePreviews->setIcon("thumbnail");
     m_pamPreview->insert( m_paEnablePreviews );
     m_pamPreview->insert( new TDEActionSeparator(this) );
@@ -240,13 +240,13 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
         else
         {
             preview = new TDEToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() );
-            connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
+            connect( preview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) );
             m_pamPreview->insert( preview );
             m_paPreviewPlugins.append( preview );
         }
     }
     TDEToggleAction *soundPreview = new TDEToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" );
-    connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) );
+    connect( soundPreview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) );
     m_pamPreview->insert( soundPreview );
     m_paPreviewPlugins.append( soundPreview );
 
@@ -270,11 +270,11 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     aSortByType->setChecked( false );
     aSortByDate->setChecked( false );
 
-    connect( aSortByNameCS, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseSensitive( bool ) ) );
-    connect( aSortByNameCI, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseInsensitive( bool ) ) );
-    connect( aSortBySize, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortBySize( bool ) ) );
-    connect( aSortByType, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByType( bool ) ) );
-    connect( aSortByDate, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByDate( bool ) ) );
+    connect( aSortByNameCS, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseSensitive( bool ) ) );
+    connect( aSortByNameCI, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseInsensitive( bool ) ) );
+    connect( aSortBySize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortBySize( bool ) ) );
+    connect( aSortByType, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByType( bool ) ) );
+    connect( aSortByDate, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByDate( bool ) ) );
 
     //enable menu item representing the saved sorting criterion
     TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion();
@@ -286,8 +286,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
 
     m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() );
 
-    connect( aSortDescending, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDescending() ) );
-    connect( m_paSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDirsFirst() ) );
+    connect( aSortDescending, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDescending() ) );
+    connect( m_paSortDirsFirst, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDirsFirst() ) );
 
     //enable stored settings
     slotSortDirsFirst();
@@ -307,15 +307,15 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
 
     m_pamSort->insert( aSortDescending );
     */
-    m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ),
+    m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ),
                               actionCollection(), "select" );
-    m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ),
+    m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ),
                                 actionCollection(), "unselect" );
-    m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
-    m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ),
+    m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
+    m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ),
                                    actionCollection(), "unselectall" );
     m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk,
-                                       this, TQT_SLOT( slotInvertSelection() ),
+                                       this, TQ_SLOT( slotInvertSelection() ),
                                        actionCollection(), "invertselection" );
 
     m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) );
@@ -328,65 +328,65 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     //m_paRightText = new TDEToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" );
     //m_paBottomText->setExclusiveGroup( "TextPos" );
     //m_paRightText->setExclusiveGroup( "TextPos" );
-    //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) );
-    //connect( m_paRightText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextRight( bool ) ) );
+    //connect( m_paBottomText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextBottom( bool ) ) );
+    //connect( m_paRightText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextRight( bool ) ) );
 
-    connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
-    connect( m_pIconView, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
 
-    connect( m_pIconView, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( onItem( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) );
 
-    connect( m_pIconView, TQT_SIGNAL( onViewport() ),
-             this, TQT_SLOT( slotOnViewport() ) );
+    connect( m_pIconView, TQ_SIGNAL( onViewport() ),
+             this, TQ_SLOT( slotOnViewport() ) );
 
-    connect( m_pIconView, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
-             this, TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
-    connect( m_pIconView, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
-             this, TQT_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) );
-    connect( m_pIconView, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
-             this, TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
+    connect( m_pIconView, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
+             this, TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
+    connect( m_pIconView, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
+             this, TQ_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) );
+    connect( m_pIconView, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
+             this, TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
 
     // Signals needed to implement the spring loading folders behavior
-    connect( m_pIconView, TQT_SIGNAL( held( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotDragHeld( TQIconViewItem * ) ) );
-    connect( m_pIconView, TQT_SIGNAL( dragEntered( bool ) ),
-             this, TQT_SLOT( slotDragEntered( bool ) ) );
-    connect( m_pIconView, TQT_SIGNAL( dragLeft() ),
-             this, TQT_SLOT( slotDragLeft() ) );
-    connect( m_pIconView, TQT_SIGNAL( dragMove( bool ) ),
-             this, TQT_SLOT( slotDragMove( bool ) ) );
-    connect( m_pIconView, TQT_SIGNAL( dragFinished() ),
-             this, TQT_SLOT( slotDragFinished() ) );
+    connect( m_pIconView, TQ_SIGNAL( held( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotDragHeld( TQIconViewItem * ) ) );
+    connect( m_pIconView, TQ_SIGNAL( dragEntered( bool ) ),
+             this, TQ_SLOT( slotDragEntered( bool ) ) );
+    connect( m_pIconView, TQ_SIGNAL( dragLeft() ),
+             this, TQ_SLOT( slotDragLeft() ) );
+    connect( m_pIconView, TQ_SIGNAL( dragMove( bool ) ),
+             this, TQ_SLOT( slotDragMove( bool ) ) );
+    connect( m_pIconView, TQ_SIGNAL( dragFinished() ),
+             this, TQ_SLOT( slotDragFinished() ) );
 
     // Create the directory lister
     m_dirLister = new KDirLister( true );
     setDirLister( m_dirLister );
     m_dirLister->setMainWindow(m_pIconView->topLevelWidget());
 
-    connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ),
-             this, TQT_SLOT( slotStarted() ) );
-    connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
-    connect( m_dirLister, TQT_SIGNAL( canceled( const KURL& ) ), this, TQT_SLOT( slotCanceled( const KURL& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) );
-    connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList& ) ),
-             this, TQT_SLOT( slotNewItems( const KFileItemList& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-             this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-    connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ),
-             this, TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( redirection( const KURL & ) ),
-             this, TQT_SLOT( slotRedirection( const KURL & ) ) );
-    connect( m_dirLister, TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ),
-             TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( infoMessage( const TQString& ) ),
-             extension(), TQT_SIGNAL( infoMessage( const TQString& ) ) );
-    connect( m_dirLister, TQT_SIGNAL( percent( int ) ),
-             extension(), TQT_SIGNAL( loadingProgress( int ) ) );
-    connect( m_dirLister, TQT_SIGNAL( speed( int ) ),
-             extension(), TQT_SIGNAL( speedProgress( int ) ) );
+    connect( m_dirLister, TQ_SIGNAL( started( const KURL & ) ),
+             this, TQ_SLOT( slotStarted() ) );
+    connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) );
+    connect( m_dirLister, TQ_SIGNAL( canceled( const KURL& ) ), this, TQ_SLOT( slotCanceled( const KURL& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( slotClear() ) );
+    connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList& ) ),
+             this, TQ_SLOT( slotNewItems( const KFileItemList& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+             this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+    connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList& ) ),
+             this, TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( redirection( const KURL & ) ),
+             this, TQ_SLOT( slotRedirection( const KURL & ) ) );
+    connect( m_dirLister, TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ),
+             TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( infoMessage( const TQString& ) ),
+             extension(), TQ_SIGNAL( infoMessage( const TQString& ) ) );
+    connect( m_dirLister, TQ_SIGNAL( percent( int ) ),
+             extension(), TQ_SIGNAL( loadingProgress( int ) ) );
+    connect( m_dirLister, TQ_SIGNAL( speed( int ) ),
+             extension(), TQ_SIGNAL( speedProgress( int ) ) );
 
     // Now we may react to configuration changes
     m_bInit = false;
@@ -399,8 +399,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     m_bPreviewRunningBeforeCloseURL = false;
     m_pIconView->setResizeMode( TQIconView::Adjust );
 
-    connect( m_pIconView, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
+    connect( m_pIconView, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
 
     // Respect kcmkonq's configuration for word-wrap icon text.
     // If we want something else, we have to adapt the configuration or remove it...
@@ -1150,8 +1150,8 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
            if (!m_paOutstandingOverlaysTimer)
            {
               m_paOutstandingOverlaysTimer = new TQTimer(this);
-              connect(m_paOutstandingOverlaysTimer, TQT_SIGNAL(timeout()),
-                      TQT_SLOT(slotDirectoryOverlayStart()));
+              connect(m_paOutstandingOverlaysTimer, TQ_SIGNAL(timeout()),
+                      TQ_SLOT(slotDirectoryOverlayStart()));
            }
            m_paOutstandingOverlaysTimer->start(20, true);
         }
@@ -1166,8 +1166,8 @@ void KonqKfmIconView::showFreeSpaceOverlay(KFileIVI* item)
        if (!m_paOutstandingFreeSpaceOverlaysTimer)
        {
           m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this);
-          connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()),
-                  TQT_SLOT(slotFreeSpaceOverlayStart()));
+          connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()),
+                  TQ_SLOT(slotFreeSpaceOverlayStart()));
        }
        m_paOutstandingFreeSpaceOverlaysTimer->start(20, true);
     }
@@ -1185,7 +1185,7 @@ void KonqKfmIconView::slotDirectoryOverlayStart()
 
        if (overlay)
        {
-          connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDirectoryOverlayFinished() ) );
+          connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDirectoryOverlayFinished() ) );
           overlay->start(); // Watch out, may emit finished() immediately!!
           return; // Let it run....
        }
@@ -1205,7 +1205,7 @@ void KonqKfmIconView::slotFreeSpaceOverlayStart()
 
        if (overlay)
        {
-          connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) );
+          connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) );
           overlay->start(); // Watch out, may emit finished() immediately!!
           return; // Let it run....
        }
@@ -1295,8 +1295,8 @@ void KonqKfmIconView::slotClear()
     if ( !m_pTimeoutRefreshTimer )
     {
         m_pTimeoutRefreshTimer = new TQTimer( this );
-        connect( m_pTimeoutRefreshTimer, TQT_SIGNAL( timeout() ),
-                 this, TQT_SLOT( slotRefreshViewport() ) );
+        connect( m_pTimeoutRefreshTimer, TQ_SIGNAL( timeout() ),
+                 this, TQ_SLOT( slotRefreshViewport() ) );
     }
     m_pTimeoutRefreshTimer->start( 700, true );
 
@@ -1575,8 +1575,8 @@ static KStaticDeleter<SpringLoadingManager> s_springManagerDeleter;
 SpringLoadingManager::SpringLoadingManager()
     : m_startPart(0L)
 {
-    connect( &m_endTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( finished() ) );
+    connect( &m_endTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( finished() ) );
 
 }
 
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index aedf4a74d..2a0b43923 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -51,7 +51,7 @@
 
 #include <kdatastream.h>
 #include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
@@ -78,136 +78,136 @@ void KEBApp::createActions() {
 
     // save and quit should probably not be in the toplevel???
     (void) KStdAction::quit(
-        TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
-    KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
+        this, TQ_SLOT( close() ), actionCollection());
+    KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
     (void) KStdAction::configureToolbars(
-        TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection());
+        this, TQ_SLOT( slotConfigureToolbars() ), actionCollection());
 
     if (m_browser) {
         (void) KStdAction::open(
-            TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection());
+            actn, TQ_SLOT( slotLoad() ), actionCollection());
         (void) KStdAction::saveAs(
-            TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection());
+            actn, TQ_SLOT( slotSaveAs() ), actionCollection());
     }
 
-    (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection());
-    (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection());
-    (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection());
-    (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection());
+    (void) KStdAction::cut(actn, TQ_SLOT( slotCut() ), actionCollection());
+    (void) KStdAction::copy(actn, TQ_SLOT( slotCopy() ), actionCollection());
+    (void) KStdAction::paste(actn, TQ_SLOT( slotPaste() ), actionCollection());
+    (void) KStdAction::print(actn, TQ_SLOT( slotPrint() ), actionCollection());
 
     // settings menu
     (void) new TDEToggleAction(
         i18n("&Show Netscape Bookmarks in Konqueror"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(),
+        actn, TQ_SLOT( slotShowNS() ), actionCollection(),
         "settings_showNS");
 
     // actions
     (void) new TDEAction(
         i18n("&Delete"), "edit-delete", Key_Delete,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
+        actn, TQ_SLOT( slotDelete() ), actionCollection(), "delete");
     (void) new TDEAction(
         i18n("Rename"), "text", Key_F2,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename");
+        actn, TQ_SLOT( slotRename() ), actionCollection(), "rename");
     (void) new TDEAction(
         i18n("C&hange URL"), "text", Key_F3,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+        actn, TQ_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
     (void) new TDEAction(
         i18n("C&hange Comment"), "text", Key_F4,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+        actn, TQ_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
     (void) new TDEAction(
         i18n("Chan&ge Icon..."), "icons", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+        actn, TQ_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
     (void) new TDEAction(
         i18n("Update Favicon"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+        actn, TQ_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
     (void) new TDEAction(
         i18n("Recursive Sort"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+        actn, TQ_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
     (void) new TDEAction(
         i18n("&New Folder..."), "folder-new", CTRL+Key_N,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+        actn, TQ_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
     (void) new TDEAction(
         i18n("&New Bookmark"), "www", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+        actn, TQ_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
     (void) new TDEAction(
         i18n("&Insert Separator"), CTRL+Key_I,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(),
+        actn, TQ_SLOT( slotInsertSeparator() ), actionCollection(),
         "insertseparator");
     (void) new TDEAction(
         i18n("&Sort Alphabetically"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort");
+        actn, TQ_SLOT( slotSort() ), actionCollection(), "sort");
     (void) new TDEAction(
         i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+        actn, TQ_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
     (void) new TDEAction(
         i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+        actn, TQ_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
     (void) new TDEAction(
         i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+        actn, TQ_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
     (void) new TDEAction(
         i18n("&Expand All Folders"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
+        actn, TQ_SLOT( slotExpandAll() ), actionCollection(), "expandall");
     (void) new TDEAction(
         i18n("Collapse &All Folders"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+        actn, TQ_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
     (void) new TDEAction(
         i18n("&Open in Konqueror"), "document-open", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+        actn, TQ_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
     (void) new TDEAction(
         i18n("Check &Status"), "bookmark", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+        actn, TQ_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
 
     (void) new TDEAction(
         i18n("Check Status: &All"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
+        actn, TQ_SLOT( slotTestAll() ), actionCollection(), "testall" );
     (void) new TDEAction(
         i18n("Update All &Favicons"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+        actn, TQ_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
         "updateallfavicons" );
     (void) new TDEAction(
         i18n("Cancel &Checks"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+        actn, TQ_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
     (void) new TDEAction(
         i18n("Cancel &Favicon Updates"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+        actn, TQ_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
         "cancelfaviconupdates" );
     (void) new TDEAction(
         i18n("Import &Netscape Bookmarks..."), "netscape", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importNS");
     (void) new TDEAction(
         i18n("Import &Opera Bookmarks..."), "opera", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importOpera");
     (void) new TDEAction(
         i18n("Import All &Crash Sessions as Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importCrashes");
     (void) new TDEAction(
         i18n("Import &Galeon Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importGaleon");
     (void) new TDEAction(
         i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importKDE2");
     (void) new TDEAction(
         i18n("Import &IE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importIE");
     (void) new TDEAction(
         i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importMoz");
     (void) new TDEAction(
         i18n("Export to &Netscape Bookmarks"), "netscape", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
+        actn, TQ_SLOT( slotExportNS() ), actionCollection(), "exportNS");
     (void) new TDEAction(
         i18n("Export to &Opera Bookmarks..."), "opera", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+        actn, TQ_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
     (void) new TDEAction(
         i18n("Export to &HTML Bookmarks..."), "text-html", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+        actn, TQ_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
     (void) new TDEAction(
         i18n("Export to &IE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
+        actn, TQ_SLOT( slotExportIE() ), actionCollection(), "exportIE");
     (void) new TDEAction(
         i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+        actn, TQ_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
 }
 
 void ActionsImpl::slotLoad() {
@@ -343,7 +343,7 @@ void ActionsImpl::slotCopy() {
     TQValueList<KBookmark> bookmarks
         = ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
     KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
-    kapp->clipboard()->setData(data, TQClipboard::Clipboard);
+    tdeApp->clipboard()->setData(data, TQClipboard::Clipboard);
 }
 
 void ActionsImpl::slotPaste() {
@@ -351,7 +351,7 @@ void ActionsImpl::slotPaste() {
     KEBMacroCommand *mcmd =
         CmdGen::insertMimeSource(
                             i18n("Paste"),
-                            kapp->clipboard()->data(TQClipboard::Clipboard),
+                            tdeApp->clipboard()->data(TQClipboard::Clipboard),
                             ListView::self()->userAddress());
     CmdHistory::self()->didCommand(mcmd);
 }
@@ -442,9 +442,9 @@ void ActionsImpl::slotPrint() {
     (*tstream) << exporter.toString(CurrentMgr::self()->mgr()->root(), true);
     tmpf.close();
 
-    s_appId = kapp->dcopClient()->appId();
+    s_appId = tdeApp->dcopClient()->appId();
     s_objId = s_part->property("dcopObjectId").toString().latin1();
-    connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint()));
+    connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint()));
 
     s_part->openURL(KURL( tmpf.name() ));
 }
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 8a7e05c3a..45da6db7a 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -231,7 +231,7 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name), m_connected(false) {
 
     timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges()));
+    connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( commitChanges()));
 
     titlecmd = 0;
     urlcmd = 0;
@@ -246,9 +246,9 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
             new TQLabel(m_title_le, i18n("Name:"), this),
             0, 0);
 
-    connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                        TQT_SLOT( slotTextChangedTitle(const TQString &) ));
-    connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() ));
+    connect(m_title_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                        TQ_SLOT( slotTextChangedTitle(const TQString &) ));
+    connect(m_title_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitTitle() ));
 
     m_url_le = new BookmarkLineEdit(this);
     grid->addWidget(m_url_le, 1, 1);
@@ -256,18 +256,18 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
             new TQLabel(m_url_le, i18n("Location:"), this),
             1, 0);
 
-    connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                      TQT_SLOT( slotTextChangedURL(const TQString &) ));
-    connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() ));
+    connect(m_url_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                      TQ_SLOT( slotTextChangedURL(const TQString &) ));
+    connect(m_url_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitURL() ));
 
     m_comment_le = new BookmarkLineEdit(this);
     grid->addWidget(m_comment_le, 2, 1);
     grid->addWidget(
             new TQLabel(m_comment_le, i18n("Comment:"), this),
             2, 0);
-    connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                          TQT_SLOT( slotTextChangedComment(const TQString &) ));
-    connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() ));
+    connect(m_comment_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                          TQ_SLOT( slotTextChangedComment(const TQString &) ));
+    connect(m_comment_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitComment() ));
 
     m_credate_le = new KLineEdit(this);
     grid->addWidget(m_credate_le, 0, 3);
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index 41aa6299d..35374136f 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -27,8 +27,8 @@
 #include <tqtimer.h>
 
 BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) {
-    connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), 
-            TQT_SLOT( slotCancelTest(BookmarkIterator *) ));
+    connect(this, TQ_SIGNAL( deleteSelf(BookmarkIterator *) ), 
+            TQ_SLOT( slotCancelTest(BookmarkIterator *) ));
     delayedEmitNextOne();
 }
 
@@ -37,7 +37,7 @@ BookmarkIterator::~BookmarkIterator() {
 }
 
 void BookmarkIterator::delayedEmitNextOne() {
-    TQTimer::singleShot(1, this, TQT_SLOT( nextOne() ));
+    TQTimer::singleShot(1, this, TQ_SLOT( nextOne() ));
 }
 
 void BookmarkIterator::slotCancelTest(BookmarkIterator *test) {
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 6f228e565..eefe5bff6 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -34,7 +34,7 @@
 #include <kbookmarkmanager.h>
 
 #include <kurldrag.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 
 TQString KEBMacroCommand::affectedBookmarks() const
 {
@@ -665,7 +665,7 @@ KEBMacroCommand* CmdGen::insertMimeSource(
                     urlBks << KBookmark::standaloneBookmark((*uit).prettyURL(), (*uit));
                     continue;
                 }
-                KDesktopFile df((*uit).path(), true);
+                TDEDesktopFile df((*uit).path(), true);
                 TQString title = df.readName();
                 KURL url(df.readURL());
                 if (title.isNull())
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 0d262bc7a..b02f0af16 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -37,8 +37,8 @@
 
 KBookmarkEditorIface::KBookmarkEditorIface()
     : TQObject(), DCOPObject("KBookmarkEditor") {
-    // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), 
-    //         this,                   TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) ));
+    // connect(KBookmarkNotifier_stub, TQ_SIGNAL( updatedAccessMetadata(TQString,TQString) ), 
+    //         this,                   TQ_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) ));
     connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false);
 }
 
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index a1ea018b1..d3d8ce432 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -83,9 +83,9 @@ void FavIconsItr::doAction() {
     // kdDebug() << "FavIconsItr::doAction()" << endl;
     curItem()->setTmpStatus(i18n("Updating favicon..."));
     if (!m_updater) {
-        m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater");
-        connect(m_updater, TQT_SIGNAL( done(bool) ),
-                this,      TQT_SLOT( slotDone(bool) ) );
+        m_updater = new FavIconUpdater(tdeApp, "FavIconUpdater");
+        connect(m_updater, TQ_SIGNAL( done(bool) ),
+                this,      TQ_SLOT( slotDone(bool) ) );
     }
     if (curBk().url().protocol().startsWith("http")) {
         m_updater->downloadIcon(curBk());
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 104db0048..60c2636ea 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -178,7 +178,7 @@ TQString GaleonImportCommand::requestFilename() const {
             i18n("*.xbel|Galeon Bookmark Files (*.xbel)"));
 }
 
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 TQString KDE2ImportCommand::requestFilename() const {
     return KFileDialog::getOpenFileName(
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp
index f4cf038fd..2248dea8e 100644
--- a/konqueror/keditbookmarks/kbookmarkmerger.cpp
+++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp
@@ -27,7 +27,7 @@
 #include <kbookmarkmanager.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <dcopclient.h>
 
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fd5cf222..f5a8474cc 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -229,8 +229,8 @@ void ListView::selected(KEBListViewItem * item, bool s)
     }
     //FIXME do it once somewhere
     if (!KEBApp::self()->bkInfo()->connected()) {
-        connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ),
-                                          TQT_SLOT( slotBkInfoUpdateListViewItem() ));
+        connect(KEBApp::self()->bkInfo(), TQ_SIGNAL( updateListViewItem() ),
+                                          TQ_SLOT( slotBkInfoUpdateListViewItem() ));
         KEBApp::self()->bkInfo()->setConnected(true);
     }
 
@@ -716,21 +716,21 @@ void KEBListView::init() {
     setDragEnabled(true);
     setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single);
     setAllColumnsShowFocus(true);
-    connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
-            this, TQT_SLOT(slotColumnSizeChanged(int, int, int)));
+    connect(header(), TQ_SIGNAL(sizeChange(int, int, int)),
+            this, TQ_SLOT(slotColumnSizeChanged(int, int, int)));
 }
 
 void KEBListView::makeConnections() {
-    connect(this, TQT_SIGNAL( moved() ),
-            TQT_SLOT( slotMoved() ));
-    connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ),
-            TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) ));
-    connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ),
-            TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) ));
-    connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ),
-            TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) ));
-    connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
-            TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ));
+    connect(this, TQ_SIGNAL( moved() ),
+            TQ_SLOT( slotMoved() ));
+    connect(this, TQ_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ),
+            TQ_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) ));
+    connect(this, TQ_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ),
+            TQ_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) ));
+    connect(this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ),
+            TQ_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) ));
+    connect(this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
+            TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ));
 }
 
 void KEBListView::readonlyFlagInit(bool readonly) {
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 94e08a357..8635e88d3 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -26,11 +26,11 @@
 #include <dcopref.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kuniqueapplication.h>
+#include <tdeapplication.h>
 
 #include <tdemessagebox.h>
 #include <twin.h>
@@ -61,7 +61,7 @@ static void continueInWindow(TQString _wname) {
     TQCString wname = _wname.latin1();
     int id = -1;
 
-    QCStringList apps = kapp->dcopClient()->registeredApplications();
+    QCStringList apps = tdeApp->dcopClient()->registeredApplications();
     for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) {
         TQCString &clientId = *it;
 
@@ -93,7 +93,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
     int ret = KMessageBox::warningYesNo(0, 
             i18n("Another instance of %1 is already running, do you really "
                 "want to open another instance or continue work in the same instance?\n"
-                "Please note that, unfortunately, duplicate views are read-only.").arg(kapp->caption()), 
+                "Please note that, unfortunately, duplicate views are read-only.").arg(tdeApp->caption()), 
             i18n("Warning"),
             i18n("Run Another"),     /* yes */
             i18n("Continue in Same") /*  no */);
@@ -110,7 +110,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) {
 
 #include <tdeactioncollection.h>
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv) {
     TDELocale::setMainCatalogue("konqueror");
     TDEAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION,
             I18N_NOOP("Konqueror Bookmarks Editor"),
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 767c15a50..707491741 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -88,10 +88,10 @@ void TestLinkItr::doAction() {
     m_job->addMetaData("errorPage", "true");
     m_job->addMetaData( TQString("cookies"), TQString("none") );
 
-    connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)),
-            this, TQT_SLOT( slotJobResult(TDEIO::Job *)));
-    connect(m_job, TQT_SIGNAL( data( TDEIO::Job *,  const TQByteArray &)),
-            this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &)));
+    connect(m_job, TQ_SIGNAL( result( TDEIO::Job *)),
+            this, TQ_SLOT( slotJobResult(TDEIO::Job *)));
+    connect(m_job, TQ_SIGNAL( data( TDEIO::Job *,  const TQByteArray &)),
+            this, TQ_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &)));
 
     curItem()->setTmpStatus(i18n("Checking..."));
     TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index cc8161f4e..c37b8f480 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -58,8 +58,8 @@ CmdHistory* CmdHistory::s_self = 0;
 
 CmdHistory::CmdHistory(TDEActionCollection *collection)
     : m_commandHistory(collection) {
-    connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ),
-            TQT_SLOT( slotCommandExecuted(KCommand *) ));
+    connect(&m_commandHistory, TQ_SIGNAL( commandExecuted(KCommand *) ),
+            TQ_SLOT( slotCommandExecuted(KCommand *) ));
     assert(!s_self);
     s_self = this; // this is hacky
 }
@@ -138,8 +138,8 @@ void CurrentMgr::createManager(const TQString &filename) {
 
     m_mgr = KBookmarkManager::managerForFile(filename, false);
 
-    connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-            TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
+    connect(m_mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+            TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
 }
 
 void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) {
@@ -219,8 +219,8 @@ KEBApp::KEBApp(
     TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine");
     quicksearch->setStretchableWidget(searchLineEdit);
     lbl->setBuddy(searchLineEdit);
-    connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear()));
-    connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions()));
+    connect(resetQuickSearch, TQ_SIGNAL(activated()), searchLineEdit, TQ_SLOT(clear()));
+    connect(searchLineEdit, TQ_SIGNAL(searchUpdated()), TQ_SLOT(updateActions()));
 
     ListView::createListViews(vsplitter);
     ListView::self()->initListViews();
@@ -245,8 +245,8 @@ KEBApp::KEBApp(
 
     m_dcopIface = new KBookmarkEditorIface();
 
-    connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
-                               TQT_SLOT( slotClipboardDataChanged() ));
+    connect(tdeApp->clipboard(), TQ_SIGNAL( dataChanged() ),
+                               TQ_SLOT( slotClipboardDataChanged() ));
 
     ListView::self()->connectSignals();
 
@@ -317,7 +317,7 @@ void KEBApp::slotClipboardDataChanged() {
     // kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
     if (!m_readOnly) {
         m_canPaste = KBookmarkDrag::canDecode(
-                        kapp->clipboard()->data(TQClipboard::Clipboard));
+                        tdeApp->clipboard()->data(TQClipboard::Clipboard));
         updateActions();
     }
 }
@@ -337,8 +337,8 @@ void KEBApp::notifyCommandExecuted() {
 void KEBApp::slotConfigureToolbars() {
     saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL( newToolbarConfig() ),
-                  TQT_SLOT( slotNewToolbarConfig() ));
+    connect(&dlg, TQ_SIGNAL( newToolbarConfig() ),
+                  TQ_SLOT( slotNewToolbarConfig() ));
     dlg.exec();
 }
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 9a0280dfa..377026411 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -95,10 +95,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
         part->setProperty("javaEnabled", TQVariant(false));
         part->setProperty("autoloadImages", TQVariant(false));
 
-        connect(part, TQT_SIGNAL( canceled(const TQString &) ),
-                this, TQT_SLOT( slotCompleted() ));
-        connect(part, TQT_SIGNAL( completed() ),
-                this, TQT_SLOT( slotCompleted() ));
+        connect(part, TQ_SIGNAL( canceled(const TQString &) ),
+                this, TQ_SLOT( slotCompleted() ));
+        connect(part, TQ_SIGNAL( completed() ),
+                this, TQ_SLOT( slotCompleted() ));
 
         KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part);
         assert(ext);
@@ -106,8 +106,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
         m_browserIface = new FavIconBrowserInterface(this, "browseriface");
         ext->setBrowserInterface(m_browserIface);
 
-        connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ),
-                this, TQT_SLOT( setIconURL(const KURL &) ));
+        connect(ext, TQ_SIGNAL( setIconURL(const KURL &) ),
+                this, TQ_SLOT( setIconURL(const KURL &) ));
 
         m_part = part;
     }
@@ -115,7 +115,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
     if (!m_timer) {
         // Timeout to stop the updating hanging
       m_timer = new TQTimer(this);
-      connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) );
+      connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) );
     }
     m_timer->start(15000,false);
     m_webGrabber = new FavIconWebGrabber(m_part, bk.url());
@@ -149,10 +149,10 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url
 
     TDEIO::Job *job = TDEIO::get(m_url, false, false);
     job->addMetaData( TQString("cookies"), TQString("none") );
-    connect(job, TQT_SIGNAL( result( TDEIO::Job *)),
-            this, TQT_SLOT( slotFinished(TDEIO::Job *) ));
-    connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ),
-            this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ));
+    connect(job, TQ_SIGNAL( result( TDEIO::Job *)),
+            this, TQ_SLOT( slotFinished(TDEIO::Job *) ));
+    connect(job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ),
+            this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ));
 }
 
 void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) {
diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp
index d87a73971..3f2c4cce9 100644
--- a/konqueror/konq_actions.cpp
+++ b/konqueror/konq_actions.cpp
@@ -90,7 +90,7 @@ KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject*
 
 int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
   // Go menu
@@ -98,10 +98,10 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
   {
     m_goMenu = (TQPopupMenu*)widget;
     // Forward signal (to main view)
-    connect( m_goMenu, TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SIGNAL( menuAboutToShow() ) );
-    connect( m_goMenu, TQT_SIGNAL( activated( int ) ),
-             this, TQT_SLOT( slotActivated( int ) ) );
+    connect( m_goMenu, TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SIGNAL( menuAboutToShow() ) );
+    connect( m_goMenu, TQ_SIGNAL( activated( int ) ),
+             this, TQ_SLOT( slotActivated( int ) ) );
     //kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl;
     // Store how many items the menu already contains.
     // This means, the KonqBidiHistoryAction has to be plugged LAST in a menu !
@@ -242,7 +242,7 @@ void KonqLogoAction::updateIcon(int id)
 
 int KonqLogoAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
 /*
@@ -261,12 +261,12 @@ int KonqLogoAction::plug( TQWidget *widget, int index )
 
     int id_ = getToolButtonID();
 
-    bar->insertAnimatedWidget( id_, this, TQT_SIGNAL(activated()), TQString("trinity"), index );
+    bar->insertAnimatedWidget( id_, this, TQ_SIGNAL(activated()), TQString("trinity"), index );
     bar->alignItemRight( id_ );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -284,12 +284,12 @@ KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &ic
 {
     m_menu = new TQPopupMenu;
 
-    connect( m_menu, TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( slotPopupAboutToShow() ) );
-    connect( m_menu, TQT_SIGNAL( activated( int ) ),
-             this, TQT_SLOT( slotPopupActivated() ) );
-    connect( m_menu, TQT_SIGNAL( aboutToHide() ),
-             this, TQT_SLOT( slotPopupAboutToHide() ) );
+    connect( m_menu, TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( slotPopupAboutToShow() ) );
+    connect( m_menu, TQ_SIGNAL( activated( int ) ),
+             this, TQ_SLOT( slotPopupActivated() ) );
+    connect( m_menu, TQ_SIGNAL( aboutToHide() ),
+             this, TQ_SLOT( slotPopupAboutToHide() ) );
 }
 
 KonqViewModeAction::~KonqViewModeAction()
@@ -355,10 +355,10 @@ KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text,
 {
     setDelayed( false );
 
-    connect( popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotFillMenu() ));
-    //connect( popupMenu(), TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotClearMenu() ));
-    connect( popupMenu(), TQT_SIGNAL( activated( int ) ),
-	     TQT_SLOT( slotActivated(int) ));
+    connect( popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotFillMenu() ));
+    //connect( popupMenu(), TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotClearMenu() ));
+    connect( popupMenu(), TQ_SIGNAL( activated( int ) ),
+	     TQ_SLOT( slotActivated(int) ));
     // Need to do all this upfront for a correct initial state
     init();
 }
@@ -380,11 +380,11 @@ void KonqMostOftenURLSAction::parseHistory() // only ever called once
     KonqHistoryManager *mgr = KonqHistoryManager::kself();
     KonqHistoryIterator it( mgr->entries() );
 
-    connect( mgr, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * )),
-             TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * )));
-    connect( mgr, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry * )),
-             TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry * )));
-    connect( mgr, TQT_SIGNAL( cleared() ), TQT_SLOT( slotHistoryCleared() ));
+    connect( mgr, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * )),
+             TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * )));
+    connect( mgr, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry * )),
+             TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry * )));
+    connect( mgr, TQ_SIGNAL( cleared() ), TQ_SLOT( slotHistoryCleared() ));
 
     s_mostEntries = new MostOftenList; // exit() will clean this up for now
     for ( uint i = 0; it.current() && i < s_maxEntries; i++ ) {
diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp
index 8793441cd..edba44247 100644
--- a/konqueror/konq_combo.cpp
+++ b/konqueror/konq_combo.cpp
@@ -122,17 +122,17 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
     // Make the lineedit consume the Key_Enter event...
     setTrapReturnKey( true );
 
-    connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) );
-    connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) );
-    connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) );
-    connect( this, TQT_SIGNAL(activated( const TQString& )),
-             TQT_SLOT(slotActivated( const TQString& )) );
+    connect( KonqHistoryManager::kself(), TQ_SIGNAL(cleared()), TQ_SLOT(slotCleared()) );
+    connect( this, TQ_SIGNAL(cleared() ), TQ_SLOT(slotCleared()) );
+    connect( this, TQ_SIGNAL(highlighted( int )), TQ_SLOT(slotSetIcon( int )) );
+    connect( this, TQ_SIGNAL(activated( const TQString& )),
+             TQ_SLOT(slotActivated( const TQString& )) );
 
     setHistoryEditorEnabled( true ); 
-    connect( this, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(slotRemoved( const TQString& )) );
+    connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) );
 
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
 }
 
 KonqCombo::~KonqCombo()
@@ -157,8 +157,8 @@ void KonqCombo::setURL( const TQString& url )
         m_returnPressed = false;      
         TQByteArray data;
         TQDataStream s( data, IO_WriteOnly );
-        s << url << kapp->dcopClient()->defaultObject();
-        kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+        s << url << tdeApp->dcopClient()->defaultObject();
+        tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                   "addToCombo(TQString,TQCString)", data);
     }
     // important security consideration: always display the beginning
@@ -506,16 +506,16 @@ void KonqCombo::slotCleared()
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
+    s << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
 }
 
 void KonqCombo::slotRemoved( const TQString& item )
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << item << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+    s << item << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                "removeFromCombo(TQString,TQCString)", data);
 }
 
@@ -632,7 +632,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
         p.fillRect( re.right() - pix.width() - 3 , re.y(), pix.width() + 4, re.height(), 
 		    TQBrush( useColor ? color : edit->paletteBackgroundColor() ));
         p.drawPixmap( re.right() - pix.width() -1 , re.y() + ( re.height() - pix.height() ) / 2, pix );
-        p.setClipping( FALSE );
+        p.setClipping( false );
     }
     else {
         TQRect r = edit->geometry();
diff --git a/konqueror/konq_extensionmanager.cpp b/konqueror/konq_extensionmanager.cpp
index b00522252..861fe0fff 100644
--- a/konqueror/konq_extensionmanager.cpp
+++ b/konqueror/konq_extensionmanager.cpp
@@ -52,9 +52,9 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai
 	(new TQVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true);
 	d->pluginSelector = new KPluginSelector(plainPage());
 	setMainWidget(d->pluginSelector);
-	connect(d->pluginSelector, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(setChanged(bool)));
-	connect(d->pluginSelector, TQT_SIGNAL(configCommitted(const TQCString &)),
-	        KSettings::Dispatcher::self(), TQT_SLOT(reparseConfiguration(const TQCString &)));
+	connect(d->pluginSelector, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(setChanged(bool)));
+	connect(d->pluginSelector, TQ_SIGNAL(configCommitted(const TQCString &)),
+	        KSettings::Dispatcher::self(), TQ_SLOT(reparseConfiguration(const TQCString &)));
 
 	d->mainWindow = mainWindow;
 	d->activePart = activePart;
@@ -100,8 +100,8 @@ void KonqExtensionManager::apply()
 		setChanged(false);
 		if( d->mainWindow )
 		{
-			KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance());
-			TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow));
+			KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, TDEGlobal::instance());
+			TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
 			TQPtrListIterator<KParts::Plugin> it(plugins);
 			KParts::Plugin *plugin;
 			while((plugin = it.current()) != 0)
diff --git a/konqueror/konq_factory.cpp b/konqueror/konq_factory.cpp
index e35f5b7c7..0a69c1c8c 100644
--- a/konqueror/konq_factory.cpp
+++ b/konqueror/konq_factory.cpp
@@ -64,10 +64,10 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha
   else
   {
     if ( m_createBrowser )
-      obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "Browser/View", m_args );
+      obj = m_factory->create( parentWidget, name, "Browser/View", m_args );
 
     if ( !obj )
-      obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "KParts::ReadOnlyPart", m_args );
+      obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args );
   }
 
   if ( !obj->inherits( "KParts::ReadOnlyPart" ) )
diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp
index cf0960f4d..d42e203d8 100644
--- a/konqueror/konq_frame.cpp
+++ b/konqueror/konq_frame.cpp
@@ -90,8 +90,8 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
                           "directory tree with an icon view or detailed view, and possibly a "
                           "terminal emulator window." ) );
     addWidget( m_pLinkedViewCheckBox, 0, true /*permanent->right align*/ );
-    connect( m_pLinkedViewCheckBox, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(linkedViewClicked(bool)) );
+    connect( m_pLinkedViewCheckBox, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(linkedViewClicked(bool)) );
 
     m_progressBar = new KProgress( this );
     m_progressBar->setMaximumHeight(fontMetrics().height());
@@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu()
 
    // We have to ship the remove view action ourselves,
    // since this may not be the active view (passive view)
-   TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
+   TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQ_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
    //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() );
    actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() );
 
@@ -242,7 +242,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond )
 void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne)
 {
    if (newOne!=0)
-      connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&)));
+      connect(newOne,TQ_SIGNAL(setStatusBarText(const TQString &)),this,TQ_SLOT(slotDisplayStatusText(const TQString&)));
    slotDisplayStatusText( TQString::null );
 }
 
@@ -274,7 +274,7 @@ void KonqFrameStatusBar::updateActiveStatus()
 
     bool hasFocus = m_pParentKonqFrame->isActivePart();
 
-    const TQColorGroup& activeCg = kapp->palette().active();
+    const TQColorGroup& activeCg = tdeApp->palette().active();
     setPaletteBackgroundColor( hasFocus ? activeCg.midlight() : activeCg.mid() );
 
     static TQPixmap indicator_viewactive( UserIcon( "indicator_viewactive" ) );
@@ -302,8 +302,8 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer,
    // the frame statusbar
    m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar");
    m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
-   connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked()));
-   connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) );
+   connect(m_pStatusBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStatusBarClicked()));
+   connect( m_pStatusBar, TQ_SIGNAL( linkedViewClicked( bool ) ), this, TQ_SLOT( slotLinkedViewClicked( bool ) ) );
    m_separator = 0;
    m_pParentContainer = parentContainer;
 }
@@ -420,8 +420,8 @@ void KonqFrame::setView( KonqView* child )
    m_pView = child;
    if (m_pView)
    {
-     connect(m_pView,TQT_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)),
-             m_pStatusBar,TQT_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)));
+     connect(m_pView,TQ_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)),
+             m_pStatusBar,TQ_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)));
    }
 }
 
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index 77dd99689..735561720 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -161,7 +161,7 @@ class KonqFrameBase
   virtual void printFrameInfo( const TQString& spaces );
 
   virtual void reparentFrame( TQWidget* parent,
-                              const TQPoint & p, bool showIt=FALSE ) = 0;
+                              const TQPoint & p, bool showIt=false ) = 0;
 
   virtual KonqFrameContainerBase* parentContainer() { return m_pParentContainer; }
   virtual void setParentContainer(KonqFrameContainerBase* parent) { m_pParentContainer = parent; }
@@ -251,7 +251,7 @@ public:
   virtual void setTabIcon( const KURL &url, TQWidget* sender );
 
   virtual void reparentFrame(TQWidget * parent,
-                     const TQPoint & p, bool showIt=FALSE );
+                     const TQPoint & p, bool showIt=false );
 
   //virtual KonqFrameContainerBase* parentContainer();
   virtual TQWidget* widget() { return this; }
@@ -317,7 +317,7 @@ public:
   virtual TQCString frameType() { return TQCString("ContainerBase"); }
 
   virtual void reparentFrame(TQWidget * parent,
-                             const TQPoint & p, bool showIt=FALSE ) = 0;
+                             const TQPoint & p, bool showIt=false ) = 0;
 
   virtual KonqFrameBase* activeChild() { return m_pActiveChild; }
 
@@ -385,7 +385,7 @@ public:
 
   //inherited
   virtual void reparentFrame(TQWidget * parent,
-                             const TQPoint & p, bool showIt=FALSE );
+                             const TQPoint & p, bool showIt=false );
 
   //make this one public
   int idAfter( TQWidget* w ){ return TQSplitter::idAfter( w ); }
diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp
index fd7a1c29d..2e3703151 100644
--- a/konqueror/konq_guiclients.cpp
+++ b/konqueror/konq_guiclients.cpp
@@ -157,7 +157,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const
   action.setAttribute( "group", "preview" );
 
   (void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0,
-                     TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
+                     m_mainWindow, TQ_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
 }
 
 ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
@@ -202,8 +202,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
     if ( (*cIt)->icon() != "unknown" )
       action->setIcon( (*cIt)->icon() );
 
-    connect( action, TQT_SIGNAL( toggled( bool ) ),
-             this, TQT_SLOT( slotToggleView( bool ) ) );
+    connect( action, TQ_SIGNAL( toggled( bool ) ),
+             this, TQ_SLOT( slotToggleView( bool ) ) );
 
     m_actions.insert( name, action );
 
@@ -212,10 +212,10 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
     m_mapOrientation.insert( name, horizontal );
   }
 
-  connect( m_mainWindow, TQT_SIGNAL( viewAdded( KonqView * ) ),
-           this, TQT_SLOT( slotViewAdded( KonqView * ) ) );
-  connect( m_mainWindow, TQT_SIGNAL( viewRemoved( KonqView * ) ),
-           this, TQT_SLOT( slotViewRemoved( KonqView * ) ) );
+  connect( m_mainWindow, TQ_SIGNAL( viewAdded( KonqView * ) ),
+           this, TQ_SLOT( slotViewAdded( KonqView * ) ) );
+  connect( m_mainWindow, TQ_SIGNAL( viewRemoved( KonqView * ) ),
+           this, TQ_SLOT( slotViewRemoved( KonqView * ) ) );
 }
 
 ToggleViewGUIClient::~ToggleViewGUIClient()
diff --git a/konqueror/konq_main.cpp b/konqueror/konq_main.cpp
index ee1fc71db..df43f2403 100644
--- a/konqueror/konq_main.cpp
+++ b/konqueror/konq_main.cpp
@@ -27,7 +27,7 @@
 
 #include <tdetempfile.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
 #include <dcopclient.h>
@@ -48,7 +48,7 @@ static const TDECmdLineOptions options[] =
   TDECmdLineLastOption
 };
 
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
 {
   TDECmdLineArgs::init( argc, argv, KonqFactory::aboutData() );
 
@@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
   KTempFile crashlog_file(locateLocal("tmp", "konqueror-crash-"), ".log");
   KonqMainWindow::s_crashlog_file = crashlog_file.file();
 
-  if ( kapp->isRestored() )
+  if ( tdeApp->isRestored() )
   {
     int n = 1;
     while ( KonqMainWindow::canBeRestored( n ) )
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index ab8d56c77..07033960f 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -87,7 +87,7 @@
 #include <kprotocolinfo.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdesycoca.h>
 #include <tdetempfile.h>
 #include <kurlrequesterdlg.h>
@@ -98,7 +98,7 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeio/scheduler.h>
 #include <tdeio/netaccess.h>
 #include <tdeaccelmanager.h>
@@ -186,13 +186,13 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
   KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this );
   m_pBookmarksOwner = extOwner;
   connect( extOwner,
-           TQT_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ),
+           TQ_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ),
            extOwner,
-           TQT_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) );
+           TQ_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) );
 
   // init history-manager, load history, get completion object
   if ( !s_pCompletion ) {
-    KonqHistoryManager *mgr = new KonqHistoryManager( TQT_TQOBJECT(kapp), "history mgr" );
+    KonqHistoryManager *mgr = new KonqHistoryManager( tdeApp, "history mgr" );
     s_pCompletion = mgr->completionObject();
 
 
@@ -201,7 +201,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
     int mode = KonqSettings::settingsCompletionMode();
     s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode );
   }
-  connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory()));
+  connect(KParts::HistoryProvider::self(), TQ_SIGNAL(cleared()), TQ_SLOT(slotClearComboHistory()));
 
   KonqPixmapProvider *prov = KonqPixmapProvider::self();
   if ( !s_comboConfig ) {
@@ -210,17 +210,17 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
       s_comboConfig->setGroup( "Location Bar" );
       prov->load( s_comboConfig, "ComboIconCache" );
   }
-  connect( prov, TQT_SIGNAL( changed() ), TQT_SLOT( slotIconsChanged() ) );
+  connect( prov, TQ_SIGNAL( changed() ), TQ_SLOT( slotIconsChanged() ) );
 
   initCombo();
   initActions();
 
   setInstance( TDEGlobal::instance() );
 
-  connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ),
-           this, TQT_SLOT( slotDatabaseChanged() ) );
+  connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ),
+           this, TQ_SLOT( slotDatabaseChanged() ) );
 
-  connect( kapp, TQT_SIGNAL( tdedisplayFontChanged()), TQT_SLOT(slotReconfigure()));
+  connect( tdeApp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure()));
 
   //load the xmlui file specified in the profile or the default konqueror.rc
   setXMLFile( xmluiFile );
@@ -229,7 +229,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
 
   createGUI( 0L );
 
-  connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) );
+  connect(toolBarMenuAction(),TQ_SIGNAL(activated()),this,TQ_SLOT(slotForceSaveMainWindowSettings()) );
 
   if ( !m_toggleViewGUIClient->empty() )
     plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
@@ -255,8 +255,8 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
 
   KonqUndoManager::incRef();
 
-  connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
-           this, TQT_SLOT( slotUndoAvailable( bool ) ) );
+  connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ),
+           this, TQ_SLOT( slotUndoAvailable( bool ) ) );
   m_bNeedApplyKonqMainWindowSettings = true;
 
   if ( !initialURL.isEmpty() )
@@ -347,7 +347,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
   if ( res && (element.tagName() == tagToolBar) && (element.attribute( "name" ) == nameBookmarkBar) )
   {
     assert( res->inherits( "TDEToolBar" ) );
-    if (!kapp->authorizeTDEAction("bookmarks"))
+    if (!tdeApp->authorizeTDEAction("bookmarks"))
     {
         delete res;
         return 0;
@@ -360,8 +360,8 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
         m_bookmarkBarActionCollection = new TDEActionCollection( this );
         m_bookmarkBarActionCollection->setHighlightingEnabled( true );
         connectActionCollection( m_bookmarkBarActionCollection );
-        DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) );
-        connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) );
+        DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res );
+        connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT(initBookmarkBar()) );
     }
   }
 
@@ -370,18 +370,18 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
 
 void KonqMainWindow::initBookmarkBar()
 {
-  TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) );
+  TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) );
 
   if (!bar) return;
 
   delete m_paBookmarkBar;
-  m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, TQT_TQOBJECT(this) );
+  m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this );
   connect( m_paBookmarkBar,
-           TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
-           this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
+           TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
+           this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
   connect( m_paBookmarkBar,
-	   TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
-	   this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
+	   TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
+	   this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
 
   // hide if empty
   if (bar->count() == 0 )
@@ -699,14 +699,14 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
       if ( view == m_currentView )
         startAnimation();
 
-      connect( run, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRunFinished() ) );
+      connect( run, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRunFinished() ) );
   }
 }
 
 bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView *childView, KonqOpenURLRequest& req )
 {
   // Second argument is referring URL
-  if ( !kapp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
+  if ( !tdeApp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
   {
      TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, _url.prettyURL());
      KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg );
@@ -844,7 +844,7 @@ bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView
           if ( f.open(IO_ReadOnly) )
             {
               f.close();
-              KSimpleConfig config( urlDotDir.path(), true );
+              TDESimpleConfig config( urlDotDir.path(), true );
               config.setGroup( "URL properties" );
               HTMLAllowed = config.readBoolEntry( "HTMLAllowed", m_bHTMLAllowed );
               serviceName = config.readEntry( "ViewMode", serviceName );
@@ -1060,7 +1060,7 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts
 TQObject *KonqMainWindow::lastFrame( KonqView *view )
 {
   TQObject *nextFrame, *viewFrame;
-  nextFrame = TQT_TQOBJECT(view->frame());
+  nextFrame = view->frame();
   viewFrame = 0;
   while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) {
     viewFrame = nextFrame;
@@ -1253,7 +1253,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
     }
 
     TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" );
-    KSimpleConfig cfg( locate( "data", profileName ), true );
+    TDESimpleConfig cfg( locate( "data", profileName ), true );
     cfg.setGroup( "Profile" );
 
     if ( windowArgs.x != -1 )
@@ -1401,7 +1401,7 @@ void KonqMainWindow::slotSendURL()
     subject = m_currentView->caption();
   else
     subject = fileNameList;
-  kapp->invokeMailer(TQString::null,TQString::null,TQString::null,
+  tdeApp->invokeMailer(TQString::null,TQString::null,TQString::null,
                      subject, body);
 }
 
@@ -1441,7 +1441,7 @@ void KonqMainWindow::slotSendFile()
     subject = m_currentView->caption();
   else
     subject = fileNameList;
-  kapp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
+  tdeApp->invokeMailer(TQString::null, TQString::null, TQString::null, subject,
                      TQString::null, //body
                      TQString::null,
                      urls); // attachments
@@ -1535,8 +1535,8 @@ void KonqMainWindow::slotToolFind()
     findPart->widget()->show();
     findPart->widget()->setFocus();
 
-    connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ),
-             this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) );
+    connect( dirPart, TQ_SIGNAL( findClosed(KonqDirPart *) ),
+             this, TQ_SLOT( slotFindClosed(KonqDirPart *) ) );
   }
   else if ( sender()->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below
   {
@@ -1550,7 +1550,7 @@ void KonqMainWindow::slotToolFind()
           "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ );
       mw->m_paFindFiles->setChecked(true);
       // Delay it after the openURL call (hacky!)
-      TQTimer::singleShot( 1, mw, TQT_SLOT(slotToolFind()));
+      TQTimer::singleShot( 1, mw, TQ_SLOT(slotToolFind()));
       m_paFindFiles->setChecked(false);
   }
 }
@@ -1714,7 +1714,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
       u.addPath(".directory");
       if ( u.isLocalFile() )
       {
-          KSimpleConfig config( u.path() ); // if we have no write access, just drop it
+          TDESimpleConfig config( u.path() ); // if we have no write access, just drop it
           config.setGroup( "URL properties" );
           config.writeEntry( "ViewMode", modeName );
           config.sync();
@@ -1740,7 +1740,7 @@ void KonqMainWindow::showHTML( KonqView * _view, bool b, bool _activateView )
       u.addPath(".directory");
       if ( u.isLocalFile() )
       {
-          KSimpleConfig config( u.path() ); // No checks for access
+          TDESimpleConfig config( u.path() ); // No checks for access
           config.setGroup( "URL properties" );
           config.writeEntry( "HTMLAllowed", b );
           config.sync();
@@ -1864,14 +1864,14 @@ void KonqMainWindow::slotReloadStop() {
 }
 
 void KonqMainWindow::toggleReloadStopButton(bool isReload) {
-  //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" );
+  //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" );
   if (isReload) {
     m_paReloadStop->setIcon("process-stop");
     m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>"
                                         "All network transfers will be stopped and Konqueror will display the content "
                                         "that has been received so far." ) );
     m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) );
-  //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" );
+  //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload" );
   } else {
     m_paReloadStop->setIcon("reload");
     m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document<p>"
@@ -1978,7 +1978,7 @@ void KonqMainWindow::slotGoHistory()
   // Show the sidebar
   if (!static_cast<TDEToggleAction*>(a)->isChecked()) {
     a->activate();
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistory()));
     return;
   }
 
@@ -2020,7 +2020,7 @@ void KonqMainWindow::slotConfigure()
         for( TQStringList::ConstIterator it = modules.begin();
                 it != end; ++it )
         {
-            if ( kapp->authorizeControlModule( *it ) )
+            if ( tdeApp->authorizeControlModule( *it ) )
             {
                 m_configureDialog->addModule( *it );
             }
@@ -2042,8 +2042,8 @@ void KonqMainWindow::slotConfigureToolbars()
   if ( autoSaveSettings() )
     saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" );
   KEditToolbar dlg(factory());
-  connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
-  connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar()));
+  connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig()));
+  connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(initBookmarkBar()));
   dlg.exec();
 }
 
@@ -2104,14 +2104,14 @@ void KonqMainWindow::slotRunFinished()
 
   if ( !run->mailtoURL().isEmpty() )
   {
-      kapp->invokeMailer( run->mailtoURL() );
+      tdeApp->invokeMailer( run->mailtoURL() );
   }
 
   if ( run->hasError() ) { // we had an error
       TQByteArray data;
       TQDataStream s( data, IO_WriteOnly );
-      s << run->url().prettyURL() << kapp->dcopClient()->defaultObject();
-      kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+      s << run->url().prettyURL() << tdeApp->dcopClient()->defaultObject();
+      tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
 				"removeFromCombo(TQString,TQCString)", data);
   }
 
@@ -2239,7 +2239,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part )
     unplugViewModeActions();
     createGUI( 0L );
     KParts::MainWindow::setCaption( "" );
-    KParts::MainWindow::setIcon( kapp->icon());
+    KParts::MainWindow::setIcon( tdeApp->icon());
     return;
   }
 
@@ -2342,8 +2342,8 @@ void KonqMainWindow::insertChildView( KonqView *childView )
   kdDebug(1202) << "KonqMainWindow::insertChildView " << childView << endl;
   m_mapViews.insert( childView->part(), childView );
 
-  connect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ),
-           this, TQT_SLOT( slotViewCompleted( KonqView * ) ) );
+  connect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ),
+           this, TQ_SLOT( slotViewCompleted( KonqView * ) ) );
 
   if ( !m_pViewManager->isLoadingProfile() ) // see KonqViewManager::loadViewProfile
     viewCountChanged();
@@ -2355,8 +2355,8 @@ void KonqMainWindow::removeChildView( KonqView *childView )
 {
   kdDebug(1202) << "KonqMainWindow::removeChildView childView " << childView << endl;
 
-  disconnect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ),
-              this, TQT_SLOT( slotViewCompleted( KonqView * ) ) );
+  disconnect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ),
+              this, TQ_SLOT( slotViewCompleted( KonqView * ) ) );
 
 #ifndef NDEBUG
   dumpViewList();
@@ -2714,7 +2714,7 @@ void KonqMainWindow::slotBreakOffTabPopup()
 
   //Can't do this safely here as the tabbar may disappear and we're
   //hanging off here.
-  TQTimer::singleShot(0, this, TQT_SLOT( slotBreakOffTabPopupDelayed() ) );
+  TQTimer::singleShot(0, this, TQ_SLOT( slotBreakOffTabPopupDelayed() ) );
 }
 
 void KonqMainWindow::slotBreakOffTabPopupDelayed()
@@ -2858,7 +2858,7 @@ void KonqMainWindow::slotRemoveTabPopup()
   }
 
   //Can't do immediately - may kill the tabbar, and we're in an event path down from it
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveTabPopupDelayed() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveTabPopupDelayed() ) );
 }
 
 void KonqMainWindow::slotRemoveTabPopupDelayed()
@@ -2896,7 +2896,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup()
   m_pViewManager->showTab( originalView );
 
   //Can't do immediately - kills the tabbar, and we're in an event path down from it
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveOtherTabsPopupDelayed() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveOtherTabsPopupDelayed() ) );
 }
 
 void KonqMainWindow::slotRemoveOtherTabsPopupDelayed()
@@ -2980,7 +2980,7 @@ void KonqMainWindow::slotRemoveLocalProperties()
       if ( f.open(IO_ReadWrite) )
       {
           f.close();
-          KSimpleConfig config( u.path() );
+          TDESimpleConfig config( u.path() );
           config.deleteGroup( "URL properties" ); // Bye bye
           config.sync();
           // TODO: Notify the view...
@@ -3128,13 +3128,13 @@ void KonqMainWindow::slotUpAboutToShow()
 void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state)
 {
     m_goState = state;
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) );
 }
 
 void KonqMainWindow::slotUp()
 {
     m_goState = TQt::LeftButton;
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) );
 }
 
 void KonqMainWindow::slotUpDelayed()
@@ -3192,7 +3192,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state )
     // Only start 1 timer.
     m_goBuffer = steps;
     m_goState = state;
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistoryDelayed()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistoryDelayed()));
   }
 }
 
@@ -3284,10 +3284,10 @@ void KonqMainWindow::initCombo()
 
   m_combo->init( s_pCompletion );
 
-  connect( m_combo, TQT_SIGNAL(activated(const TQString&,int)),
-           this, TQT_SLOT(slotURLEntered(const TQString&,int)) );
-  connect( m_combo, TQT_SIGNAL(showPageSecurity()),
-           this, TQT_SLOT(showPageSecurity()) );
+  connect( m_combo, TQ_SIGNAL(activated(const TQString&,int)),
+           this, TQ_SLOT(slotURLEntered(const TQString&,int)) );
+  connect( m_combo, TQ_SIGNAL(showPageSecurity()),
+           this, TQ_SLOT(showPageSecurity()) );
 
   m_pURLCompletion = new KURLCompletion();
   m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() );
@@ -3296,18 +3296,18 @@ void KonqMainWindow::initCombo()
   // We do want completion of user names, right?
   //m_pURLCompletion->setReplaceHome( false );  // Leave ~ alone! Will be taken care of by filters!!
 
-  connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-           TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion )));
-  connect( m_combo, TQT_SIGNAL( completion( const TQString& )),
-           TQT_SLOT( slotMakeCompletion( const TQString& )));
-  connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )),
-           TQT_SLOT( slotSubstringcompletion( const TQString& )));
-  connect( m_combo, TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ),
-           TQT_SLOT( slotRotation( TDECompletionBase::KeyBindingType )));
-  connect( m_combo, TQT_SIGNAL( cleared() ),
-           TQT_SLOT ( slotClearHistory() ) );
-  connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ),
-           TQT_SLOT( slotMatch(const TQString&) ));
+  connect( m_combo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+           TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion )));
+  connect( m_combo, TQ_SIGNAL( completion( const TQString& )),
+           TQ_SLOT( slotMakeCompletion( const TQString& )));
+  connect( m_combo, TQ_SIGNAL( substringCompletion( const TQString& )),
+           TQ_SLOT( slotSubstringcompletion( const TQString& )));
+  connect( m_combo, TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ),
+           TQ_SLOT( slotRotation( TDECompletionBase::KeyBindingType )));
+  connect( m_combo, TQ_SIGNAL( cleared() ),
+           TQ_SLOT ( slotClearHistory() ) );
+  connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ),
+           TQ_SLOT( slotMatch(const TQString&) ));
 
   m_combo->lineEdit()->installEventFilter(this);
 
@@ -3315,8 +3315,8 @@ void KonqMainWindow::initCombo()
   if ( !bookmarkCompletionInitialized )
   {
       bookmarkCompletionInitialized = true;
-      DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, TQT_TQOBJECT(m_combo->lineEdit()) );
-      connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) );
+      DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() );
+      connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT( bookmarksIntoCompletion() ) );
   }
 }
 
@@ -3504,22 +3504,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
           duplicate->setEnabled( false );
 
       if (slotNames.contains("cut()"))
-        disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
+        disconnect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) );
       if (slotNames.contains("copy()"))
-        disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
+        disconnect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) );
       if (slotNames.contains("paste()"))
-        disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
+        disconnect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) );
       if (slotNames.contains("del()"))
-        disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
-      disconnect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-                  this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+        disconnect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) );
+      disconnect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+                  this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
-      connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
-      connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
-      connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
-      connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
-      connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
-      connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
+      connect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) );
+      connect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) );
+      connect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) );
+      connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
+      connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) );
+      connect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) );
 
       m_paTrash->setEnabled(false);
       m_paDelete->setEnabled(false);
@@ -3545,22 +3545,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
           duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() );
 
       if (slotNames.contains("cut()"))
-        connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) );
+        connect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) );
       if (slotNames.contains("copy()"))
-        connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) );
+        connect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) );
       if (slotNames.contains("paste()"))
-        connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) );
+        connect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) );
       if (slotNames.contains("del()"))
-        connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) );
-      connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-               this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+        connect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) );
+      connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+               this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
-      disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) );
-      disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) );
-      disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) );
-      disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
-      disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) );
-      disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) );
+      disconnect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) );
+      disconnect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) );
+      disconnect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) );
+      disconnect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
+      disconnect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) );
+      disconnect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) );
 
       if ( ext )
       {
@@ -3580,6 +3580,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
       }
     }
   }
+
+  else if (ev->type() == TQEvent::MouseButtonRelease)
+  {
+    TQMouseEvent *mouseEv = static_cast<TQMouseEvent*>(ev);
+    switch (mouseEv->button())
+    {
+      case TQMouseEvent::HistoryBackButton:
+        slotBack();
+        return true;
+
+      case TQMouseEvent::HistoryForwardButton:
+        slotForward();
+        return true;
+    }
+  }
+
   return KParts::MainWindow::eventFilter( obj, ev );
 }
 
@@ -3666,9 +3682,9 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
     // happens only with the hackish non-_NET_WM_STATE_FULLSCREEN way
     setWFlags( WDestructiveClose );
     // Qt bug (see below)
-    setAcceptDrops( FALSE );
+    setAcceptDrops( false );
     topData()->dnd = 0;
-    setAcceptDrops( TRUE );
+    setAcceptDrops( true );
   }
   else
   {
@@ -3694,9 +3710,9 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
     // Qt bug, the flags aren't restored. They know about it.
     setWFlags( WType_TopLevel | WDestructiveClose );
     // Other Qt bug
-    setAcceptDrops( FALSE );
+    setAcceptDrops( false );
     topData()->dnd = 0;
-    setAcceptDrops( TRUE );
+    setAcceptDrops( true );
   }
 }
 
@@ -3758,7 +3774,7 @@ void KonqMainWindow::comboAction( int action, const TQString& url, const TQCStri
     }
 
     // only one instance should save...
-    if ( combo && objId == kapp->dcopClient()->defaultObject() )
+    if ( combo && objId == tdeApp->dcopClient()->defaultObject() )
       combo->saveItems();
 }
 
@@ -3815,77 +3831,77 @@ void KonqMainWindow::initActions()
 
   // File menu
   m_pMenuNew = new KNewMenu ( actionCollection(), this, "new_menu" );
-  TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
-                    this, TQT_SLOT(slotFileNewAboutToShow()) );
+  TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()),
+                    this, TQ_SLOT(slotFileNewAboutToShow()) );
 
   (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" );
   (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" );
-  (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
-  (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
-  (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
-  (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
-  if (kapp->authorize("shell_access"))
+  (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
+  (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
+  (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQ_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
+  (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
+  if (tdeApp->authorize("shell_access"))
   {
-     (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
+     (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQ_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
   }
-  (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
+  (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQ_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
 
-  m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
+  m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQ_SLOT( slotToolFind() ), actionCollection(), "findfile" );
 
   m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
-  (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" );
+  (void) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit" );
 
-  m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
-  m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" );
-  m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" );
+  m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQ_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
+  m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQ_SLOT( slotLockView() ), actionCollection(), "lock" );
+  m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQ_SLOT( slotLinkView() ), actionCollection(), "link" );
 
   // Go menu
   m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" );
-  connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) );
-  connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) );
-  connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) );
+  connect( m_paUp, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) );
+  connect( m_paUp->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUpAboutToShow() ) );
+  connect( m_paUp->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUpActivated( int ) ) );
 
   TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
   m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" );
-  connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) );
-  connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) );
-  connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) );
+  connect( m_paBack, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) );
+  connect( m_paBack->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotBackAboutToShow() ) );
+  connect( m_paBack->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotBackActivated( int ) ) );
 
   m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" );
-  connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) );
-  connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) );
-  connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) );
+  connect( m_paForward, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) );
+  connect( m_paForward->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotForwardAboutToShow() ) );
+  connect( m_paForward->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotForwardActivated( int ) ) );
 
   m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" );
-  connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) );
-  connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) );
+  connect( m_paHistory, TQ_SIGNAL( menuAboutToShow() ), this, TQ_SLOT( slotGoMenuAboutToShow() ) );
+  connect( m_paHistory, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotGoHistoryActivated( int ) ) );
 
   m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" );
-  connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
-	   TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
-
-  (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
-  (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
-  (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
-  (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
-  (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
-  //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
-  (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
-  (void) new TDEAction( i18n( "Autostart" ), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
+  connect( m_paHome, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
+	   TQ_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
+
+  (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQ_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
+  (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQ_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
+  (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQ_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+  (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQ_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
+  (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQ_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
+  //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQ_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
+  (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQ_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
+  (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQ_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
   KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" );
-  connect( mostOften, TQT_SIGNAL( activated( const KURL& )),
-	   TQT_SLOT( slotOpenURL( const KURL& )));
-  (void) new TDEAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
+  connect( mostOften, TQ_SIGNAL( activated( const KURL& )),
+	   TQ_SLOT( slotOpenURL( const KURL& )));
+  (void) new TDEAction( i18n( "History" ), "history", 0, this, TQ_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
 
   // Settings menu
 
-  m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
-  m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
+  m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQ_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
+  m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQ_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
    // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like...
-  m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
+  m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQ_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
 
 
   m_configureModules << "tde-filebehavior.desktop" << "tde-fileappearance.desktop" <<
@@ -3899,42 +3915,42 @@ void KonqMainWindow::initActions()
       "tde-tdehtml_plugins.desktop" << "tde-kcmkonqyperformance.desktop";
 
 
-  if (!kapp->authorizeControlModules(configModules()).isEmpty())
-     KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() );
+  if (!tdeApp->authorizeControlModules(configModules()).isEmpty())
+     KStdAction::preferences (this, TQ_SLOT (slotConfigure()), actionCollection() );
 
-  KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
-  KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+  KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
+  KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() );
 
-  m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
-  m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
+  m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQ_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
+  m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQ_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
 
   // Window menu
-  m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
-  m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
-  m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" );
-  m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
-  m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
-  m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
-  m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
-  m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
-
-  m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
-  m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
+  m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQ_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
+  m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
+  m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQ_SLOT( slotAddTab() ), actionCollection(), "newtab" );
+  m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQ_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
+  m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQ_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
+  m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQ_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
+  m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQ_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
+  m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQ_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
+
+  m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQ_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
+  m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQ_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
 
   TQCString actionname;
   for (int i=1;i<13;i++) {
     actionname.sprintf("activate_tab_%02d", i);
-    new TDEAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname);
+    new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQ_SLOT(slotActivateTab()), actionCollection(), actionname);
   }
 
-  m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
-  m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
+  m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQ_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
+  m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQ_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
 
 #ifndef NDEBUG
-  (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
+  (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQ_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
 #endif
 
-  m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
+  m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQ_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
   m_pamLoadViewProfile = new TDEActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" );
 
   m_pViewManager->setProfiles( m_pamLoadViewProfile );
@@ -3943,19 +3959,19 @@ void KonqMainWindow::initActions()
   TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut();
   fullScreenShortcut.append( KKey( Key_F11 ) );
   m_ptaFullScreen->setShortcut( fullScreenShortcut );
-  connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool )));
+  connect( m_ptaFullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool )));
 
   TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
   reloadShortcut.append(KKey(CTRL + Key_R));
-  m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
-  m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
+  m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReload() ), actionCollection(), "reload" );
+  m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQ_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
 
-  m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
+  m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
 
-  m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
+  m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), actionCollection(), "undo" );
   //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() );
-  connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
-           m_paUndo, TQT_SLOT( setText( const TQString & ) ) );
+  connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ),
+           m_paUndo, TQ_SLOT( setText( const TQString & ) ) );
 
   // Those are connected to the browserextension directly
   m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" );
@@ -3965,24 +3981,24 @@ void KonqMainWindow::initActions()
 
   m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" );
   m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" );
-  m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" );
+  m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" );
 
   m_paRename = new TDEAction( i18n( "&Rename" ), "edit_rename", Key_F2, actionCollection(), "rename" );
   m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" );
-  connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-           TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+  connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+           this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
   m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" );
   // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default.
-  m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
-  m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
+  m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQ_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
+  m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQ_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
   // This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff.
-  m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" );
-  m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
+  m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQ_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" );
+  m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
 
   // Location bar
   m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") );
-  (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
+  (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQ_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
   m_locationLabel->setBuddy( m_combo );
 
   KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0,
@@ -3996,8 +4012,8 @@ void KonqMainWindow::initActions()
   TDEAction *clearLocation = new TDEAction( i18n( "Clear Location Bar" ),
 					TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
 					CTRL+Key_L, actionCollection(), "clear_location" );
-  connect( clearLocation, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-           TQT_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+  connect( clearLocation, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+           TQ_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) );
   clearLocation->setWhatsThis( i18n( "Clear Location bar<p>"
 				     "Clears the content of the location bar." ) );
 
@@ -4013,21 +4029,21 @@ void KonqMainWindow::initActions()
 
   m_pBookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), m_pBookmarksOwner, m_pamBookmarks->popupMenu(), m_bookmarksActionCollection, true );
   connect( m_pBookmarkMenu,
-           TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
-           this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
+           TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
+           this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
   connect( m_pBookmarkMenu,
-	   TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
-	   this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
+	   TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ),
+	   this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) ));
 
   TDEAction *addBookmark = actionCollection()->action("add_bookmark");
   if (addBookmark)
      addBookmark->setText(i18n("Bookmark This Location"));
 
-  m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() );
+  m_paShowMenuBar = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenuBar() ), actionCollection() );
 
-  (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" );
+  (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQ_SLOT( slotIntro() ), actionCollection(), "konqintro" );
 
-  TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" );
+  TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQ_SLOT( goURL() ), actionCollection(), "go_url" );
   goUrl->setWhatsThis( i18n( "Go<p>"
 			     "Goes to the page that has been entered into the location bar." ) );
 
@@ -4120,13 +4136,13 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm
     TQValueList<KURL>::Iterator it = list.begin();
     for (; it != list.end(); ++it )
       popupItems.append( new KFileItem( (*it), TQString::null, KFileItem::Unknown) );
-    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQT_SLOT( slotPopupNewTabRight() ) );
+    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQ_SLOT( slotPopupNewTabRight() ) );
   }
   else
   {
     popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) );
-    pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) );
-    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) );
+    pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQ_SLOT( slotPopupNewWindow() ) );
+    pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQ_SLOT( slotPopupNewTabRight() ) );
   }
 }
 
@@ -4345,7 +4361,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
       if ( slotNames.contains( it.key()+"()" ) )
       {
           if ( it.key() != "trash" )
-              connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ );
+              connect( act, TQ_SIGNAL( activated() ), ext, it.data() /* TQ_SLOT(slot name) */ );
           act->setEnabled( ext->isActionEnabled( it.key() ) );
           const TQString text = ext->actionText( it.key() );
           if ( !text.isEmpty() )
@@ -4541,7 +4557,7 @@ void KonqMainWindow::setCaption( const TQString &caption )
   {
     kdDebug(1202) << "KonqMainWindow::setCaption(" << caption << ")" << endl;
 
-    // Keep an unmodified copy of the caption (before kapp->makeStdCaption is applied)
+    // Keep an unmodified copy of the caption (before tdeApp->makeStdCaption is applied)
     m_currentView->setCaption( caption );
     KParts::MainWindow::setCaption( m_currentView->caption() );
   }
@@ -4701,7 +4717,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
   popupMenuCollection.insert( m_paDelete );
 
   // The pasteto action is used when clicking on a dir, to paste into it.
-  TDEAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
+  TDEAction *actPaste = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
   actPaste->setEnabled( m_paPaste->isEnabled() );
   popupMenuCollection.insert( actPaste );
 
@@ -4774,10 +4790,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
   if (doTabHandling)
   {
       if (_args.forcesNewWindow()) {
-        actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
+        actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQ_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
         actNewWindow->setToolTip( i18n( "Open the document in current window" ) );
       }
-      actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
+      actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
       actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
 
       //Set tab_new_x to point to the correct icon based on NewTabsInFront
@@ -4788,12 +4804,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
       else
         tab_new_x = "tab_new_bg" ;
 
-      TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
+      TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQ_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
       actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
-      TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
+      TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
       actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
-      actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
-      actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
+      actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+      actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
       actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
       actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
       doTabHandling = true;
@@ -4843,15 +4859,15 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
 
   if ( be )
   {
-    TQObject::connect( this, TQT_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQT_SLOT(close()) );
-    TQObject::connect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)),
-                      this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) );
+    TQObject::connect( this, TQ_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQ_SLOT(close()) );
+    TQObject::connect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)),
+                      this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) );
   }
 
-  TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
-                       this, TQT_SLOT(slotFileNewAboutToShow()) );
+  TQObject::disconnect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()),
+                       this, TQ_SLOT(slotFileNewAboutToShow()) );
 
-  TQGuardedPtr<TQObject> guard(TQT_TQOBJECT(this)); // #149736
+  TQGuardedPtr<TQObject> guard(this); // #149736
   pPopupMenu->exec( _global );
 
   delete pPopupMenu;
@@ -4868,13 +4884,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
       return;
   }
 
-  TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
-                       this, TQT_SLOT(slotFileNewAboutToShow()) );
+  TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()),
+                       this, TQ_SLOT(slotFileNewAboutToShow()) );
 
   if ( be )
   {
-    TQObject::disconnect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)),
-                         this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) );
+    TQObject::disconnect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)),
+                         this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) );
   }
 
   delete konqyMenuClient;
@@ -4932,7 +4948,7 @@ void KonqMainWindow::slotOpenEmbedded()
 
   m_popupEmbeddingServices.clear();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenEmbeddedDoIt() ) );
 }
 
 void KonqMainWindow::slotOpenEmbeddedDoIt()
@@ -5034,7 +5050,7 @@ void KonqMainWindow::updateOpenWithActions()
 
   m_openWithActions.clear();
 
-  if (!kapp->authorizeTDEAction("openwith"))
+  if (!tdeApp->authorizeTDEAction("openwith"))
      return;
 
   const TDETrader::OfferList & services = m_currentView->appServiceOffers();
@@ -5045,8 +5061,8 @@ void KonqMainWindow::updateOpenWithActions()
     TDEAction *action = new TDEAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() );
     action->setIcon( (*it)->icon() );
 
-    connect( action, TQT_SIGNAL( activated() ),
-             this, TQT_SLOT( slotOpenWith() ) );
+    connect( action, TQ_SIGNAL( activated() ),
+             this, TQ_SLOT( slotOpenWith() ) );
 
     m_openWithActions.append( action );
   }
@@ -5099,7 +5115,7 @@ void KonqMainWindow::updateViewModeActions()
   if ( services.count() <= 1 )
     return;
 
-  m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) );
+  m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), this );
 
   // a temporary map, just like the m_viewModeToolBarServices map, but
   // mapping to a KonqViewModeAction object. It's just temporary as we
@@ -5132,14 +5148,14 @@ void KonqMainWindow::updateViewModeActions()
       TQString icon = (*it)->icon();
       if ( icon != TQString::fromLatin1( "unknown" ) )
           // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon)
-          action = new TDERadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
+          action = new TDERadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() );
       else
-          action = new TDERadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
+          action = new TDERadioAction( itname, 0, this, (*it)->desktopEntryName().ascii() );
 
       action->setExclusiveGroup( "KonqMainWindow_ViewModes" );
 
-      connect( action, TQT_SIGNAL( toggled( bool ) ),
-               this, TQT_SLOT( slotViewModeToggle( bool ) ) );
+      connect( action, TQ_SIGNAL( toggled( bool ) ),
+               this, TQ_SLOT( slotViewModeToggle( bool ) ) );
 
       m_viewModeActions.append( action );
       action->plug( m_viewModeMenu->popupMenu() );
@@ -5186,15 +5202,15 @@ void KonqMainWindow::updateViewModeActions()
 
           KonqViewModeAction *tbAction = new KonqViewModeAction( text,
                                                                  icon,
-                                                                 TQT_TQOBJECT(this),
+                                                                 this,
                                                                  name );
 
           tbAction->setExclusiveGroup( "KonqMainWindow_ToolBarViewModes" );
 
           tbAction->setChecked( action->isChecked() );
 
-          connect( tbAction, TQT_SIGNAL( toggled( bool ) ),
-                   this, TQT_SLOT( slotViewModeToggle( bool ) ) );
+          connect( tbAction, TQ_SIGNAL( toggled( bool ) ),
+                   this, TQ_SLOT( slotViewModeToggle( bool ) ) );
 
           m_toolBarViewModeActions.append( tbAction );
 
@@ -5278,7 +5294,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject()
 
 void KonqMainWindow::updateBookmarkBar()
 {
-  TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) );
+  TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) );
 
   if (!bar) return;
 
@@ -5293,7 +5309,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
   kdDebug(1202) << "KonqMainWindow::closeEvent begin" << endl;
   // This breaks session management (the window is withdrawn in twin)
   // so let's do this only when closed by the user.
-  if ( static_cast<KonquerorApplication *>(kapp)->closedByUser() )
+  if ( static_cast<KonquerorApplication *>(tdeApp)->closedByUser() )
   {
     if ( viewManager()->docContainer() && viewManager()->docContainer()->frameType()=="Tabs" )
     {
@@ -5385,7 +5401,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
           TQApplication::sendEvent( (*it)->part()->widget(), e );
   }
   KParts::MainWindow::closeEvent( e );
-  if( isPreloaded() && !kapp->sessionSaving())
+  if( isPreloaded() && !tdeApp->sessionSaving())
   { // queryExit() refused closing, hide instead
       hide();
   }
@@ -5394,7 +5410,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
 
 bool KonqMainWindow::queryExit()
 {
-    if( kapp->sessionSaving()) // *sigh*
+    if( tdeApp->sessionSaving()) // *sigh*
         return true;
     return !stayPreloaded();
 }
@@ -5518,18 +5534,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
 
 void KonqMainWindow::connectActionCollection( TDEActionCollection *coll )
 {
-    connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
-             this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
-    connect( coll, TQT_SIGNAL( clearStatusText() ),
-             this, TQT_SLOT( slotClearStatusText() ) );
+    connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
+             this, TQ_SLOT( slotActionStatusText( const TQString & ) ) );
+    connect( coll, TQ_SIGNAL( clearStatusText() ),
+             this, TQ_SLOT( slotClearStatusText() ) );
 }
 
 void KonqMainWindow::disconnectActionCollection( TDEActionCollection *coll )
 {
-    disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
-                this, TQT_SLOT( slotActionStatusText( const TQString & ) ) );
-    disconnect( coll, TQT_SIGNAL( clearStatusText() ),
-                this, TQT_SLOT( slotClearStatusText() ) );
+    disconnect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
+                this, TQ_SLOT( slotActionStatusText( const TQString & ) ) );
+    disconnect( coll, TQ_SIGNAL( clearStatusText() ),
+                this, TQ_SLOT( slotClearStatusText() ) );
 }
 
 //
@@ -5796,14 +5812,14 @@ void KonqMainWindow::setPreloadedFlag( bool preloaded )
     s_preloaded = preloaded;
     if( s_preloaded )
     {
-        kapp->disableSessionManagement(); // dont restore preloaded konqy's
+        tdeApp->disableSessionManagement(); // dont restore preloaded konqy's
         return; // was registered before calling this
     }
     delete s_preloadedWindow; // preloaded state was abandoned without reusing the window
     s_preloadedWindow = NULL;
-    kapp->enableSessionManagement(); // enable SM again
+    tdeApp->enableSessionManagement(); // enable SM again
     DCOPRef ref( "kded", "konqy_preloader" );
-    ref.send( "unregisterPreloadedKonqy", kapp->dcopClient()->appId());
+    ref.send( "unregisterPreloadedKonqy", tdeApp->dcopClient()->appId());
 }
 
 void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
@@ -5812,7 +5828,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
     if( window == NULL )
         return;
     window->viewManager()->clear();
-    TDEIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) );
+    TDEIO::Scheduler::unregisterWindow( window );
 }
 
 // used by preloading - this KonqMainWindow will be reused, reset everything
@@ -5847,7 +5863,7 @@ void KonqMainWindow::resetWindow()
 // Qt remembers the iconic state if the window was withdrawn while on another virtual desktop
     clearWState( WState_Minimized );
     ignoreInitialGeometry();
-    kapp->setTopWidget( this ); // set again the default window icon
+    tdeApp->setTopWidget( this ); // set again the default window icon
 }
 
 bool KonqMainWindow::event( TQEvent* e )
@@ -5885,12 +5901,12 @@ bool KonqMainWindow::stayPreloaded()
         return false;
     DCOPRef ref( "kded", "konqy_preloader" );
     if( !ref.callExt( "registerPreloadedKonqy", DCOPRef::NoEventLoop, 5000,
-        kapp->dcopClient()->appId(), tqt_xscreen()))
+        tdeApp->dcopClient()->appId(), tqt_xscreen()))
     {
         return false;
     }
     KonqMainWindow::setPreloadedFlag( true );
-    kdDebug(1202) << "Konqy kept for preloading :" << kapp->dcopClient()->appId() << endl;
+    kdDebug(1202) << "Konqy kept for preloading :" << tdeApp->dcopClient()->appId() << endl;
     KonqMainWindow::setPreloadedWindow( this );
     return true;
 }
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 281407cf8..e9e86ed52 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -282,7 +282,7 @@ public:
   void printFrameInfo( const TQString &spaces );
 
   void reparentFrame( TQWidget* parent,
-                              const TQPoint & p, bool showIt=FALSE );
+                              const TQPoint & p, bool showIt=false );
 
   KonqFrameContainerBase* parentContainer()const;
   void setParentContainer(KonqFrameContainerBase* parent);
@@ -474,7 +474,7 @@ protected slots:
   // Connected to KSycoca
   void slotDatabaseChanged();
 
-  // Connected to KApp
+  // Connected to TDEApp
   void slotReconfigure();
 
   void slotForceSaveMainWindowSettings();
diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp
index e24426c8d..673048b0f 100644
--- a/konqueror/konq_misc.cpp
+++ b/konqueror/konq_misc.cpp
@@ -27,7 +27,7 @@
 #include <tdemessagebox.h>
 #include <kurifilter.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <twin.h>
 #include <kprotocolinfo.h>
 #include <kurldrag.h>
@@ -129,7 +129,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path,
   else if( KonqMainWindow::isPreloaded() && KonqMainWindow::preloadedWindow() != NULL )
   {
       mainWindow = KonqMainWindow::preloadedWindow();
-      TDEStartupInfo::setWindowStartupId( mainWindow->winId(), kapp->startupId());
+      TDEStartupInfo::setWindowStartupId( mainWindow->winId(), tdeApp->startupId());
       KonqMainWindow::setPreloadedWindow( NULL );
       KonqMainWindow::setPreloadedFlag( false );
       mainWindow->resetWindow();
@@ -269,7 +269,7 @@ void KonqDraggableLabel::dropEvent( TQDropEvent* ev )
 {
   _savedLst.clear();
   if ( KURLDrag::decode( ev, _savedLst ) ) {
-    TQTimer::singleShot(0, this, TQT_SLOT(delayedOpenURL()));
+    TQTimer::singleShot(0, this, TQ_SLOT(delayedOpenURL()));
   }
 }
 
diff --git a/konqueror/konq_profiledlg.cpp b/konqueror/konq_profiledlg.cpp
index f7241713b..d3d6f5384 100644
--- a/konqueror/konq_profiledlg.cpp
+++ b/konqueror/konq_profiledlg.cpp
@@ -32,9 +32,9 @@
 #include <kdebug.h>
 #include <kstdguiitem.h>
 #include <tdeio/global.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kseparator.h>
 #include <kpushbutton.h>
 
@@ -49,7 +49,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
   {
     TQFileInfo info( *pIt );
     TQString profileName = TDEIO::decodeFileName( info.baseName() );
-    KSimpleConfig cfg( *pIt, true );
+    TDESimpleConfig cfg( *pIt, true );
     if ( cfg.hasGroup( "Profile" ) )
     {
       cfg.setGroup( "Profile" );
@@ -100,8 +100,8 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
 
   box->setStretchFactor( m_pListView, 1 );
 
-  connect( m_pListView, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ),
-            TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) );
+  connect( m_pListView, TQ_SIGNAL( itemRenamed( TQListViewItem * ) ),
+            TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) );
 
   loadAllProfiles( preselectProfile );
   m_pListView->setMinimumSize( m_pListView->sizeHint() );
@@ -112,11 +112,11 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
   m_cbSaveSize = new TQCheckBox( i18n("Save &window size in profile"), box );
   m_cbSaveSize->setChecked( KonqSettings::saveWindowSizeInProfile() );
 
-  connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-           this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+  connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+           this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
 
-  connect( m_pProfileNameLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
+  connect( m_pProfileNameLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
 
   enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 );
   enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 );
@@ -211,7 +211,7 @@ void KonqProfileDlg::slotItemRenamed( TQListViewItem * item )
     if ( it != m_mapEntries.end() )
     {
       TQString fileName = it.data();
-      KSimpleConfig cfg( fileName );
+      TDESimpleConfig cfg( fileName );
       cfg.setGroup( "Profile" );
       cfg.writeEntry( "Name", newName );
       cfg.sync();
diff --git a/konqueror/konq_run.cpp b/konqueror/konq_run.cpp
index ecd03d3c4..01cff73c6 100644
--- a/konqueror/konq_run.cpp
+++ b/konqueror/konq_run.cpp
@@ -150,8 +150,8 @@ void KonqRun::init()
     // (in case it goes to scanFile, this will be done below)
     TDEIO::StatJob *job = dynamic_cast<TDEIO::StatJob*>( m_job );
     if ( job && !job->error() && m_pView ) {
-        connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-                 m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+        connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+                 m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
     }
 }
 
@@ -162,11 +162,11 @@ void KonqRun::scanFile()
     // BrowserRun changes
     TDEIO::TransferJob *job = dynamic_cast<TDEIO::TransferJob*>( m_job );
     if ( job && !job->error() ) {
-        connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )),
-                 TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) ));
+        connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL& )),
+                 TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) ));
         if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") {
-            connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-                     m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+            connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+                     m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
 	}
     }
 }
diff --git a/konqueror/konq_tabs.cpp b/konqueror/konq_tabs.cpp
index b22610cc2..0506648ff 100644
--- a/konqueror/konq_tabs.cpp
+++ b/konqueror/konq_tabs.cpp
@@ -78,61 +78,61 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
   m_pActiveChild = 0L;
   m_pViewManager = viewManager;
 
-  connect( this, TQT_SIGNAL( currentChanged ( TQWidget * ) ),
-           this, TQT_SLOT( slotCurrentChanged( TQWidget* ) ) );
+  connect( this, TQ_SIGNAL( currentChanged ( TQWidget * ) ),
+           this, TQ_SLOT( slotCurrentChanged( TQWidget* ) ) );
 
   m_pPopupMenu = new TQPopupMenu( this );
   m_pPopupMenu->insertItem( SmallIcon( "tab_new" ),
                             i18n("&New Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotAddTab() ),
+                            TQ_SLOT( slotAddTab() ),
                             m_pViewManager->mainWindow()->action("newtab")->shortcut() );
   m_pPopupMenu->insertItem( SmallIconSet( "reload" ),
                             i18n( "&Reload Tab" ),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotReloadPopup() ),
+                            TQ_SLOT( slotReloadPopup() ),
                             m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID );
   m_pPopupMenu->insertItem( SmallIconSet( "tab_duplicate" ),
                             i18n("&Duplicate Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotDuplicateTabPopup() ),
+                            TQ_SLOT( slotDuplicateTabPopup() ),
                             m_pViewManager->mainWindow()->action("duplicatecurrenttab")->shortcut(),
                             DUPLICATE_ID );
   m_pPopupMenu->insertItem( SmallIconSet( "tab_breakoff" ),
                             i18n("D&etach Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotBreakOffTabPopup() ),
+                            TQ_SLOT( slotBreakOffTabPopup() ),
                             m_pViewManager->mainWindow()->action("breakoffcurrenttab")->shortcut(),
                             BREAKOFF_ID );
   m_pPopupMenu->insertSeparator();
   m_pPopupMenu->insertItem( SmallIconSet( "tab_move_left" ),
                             i18n("Move Tab &Left"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotMoveTabLeft() ),
+                            TQ_SLOT( slotMoveTabLeft() ),
                             m_pViewManager->mainWindow()->action("tab_move_left")->shortcut(),
                             MOVE_LEFT_ID );
   m_pPopupMenu->insertItem( SmallIconSet( "tab_move_right" ),
                             i18n("Move Tab &Right"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotMoveTabRight() ),
+                            TQ_SLOT( slotMoveTabRight() ),
                             m_pViewManager->mainWindow()->action("tab_move_right")->shortcut(),
                             MOVE_RIGHT_ID );
   m_pPopupMenu->insertSeparator();
   m_pSubPopupMenuTab = new TQPopupMenu( this );
   m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID );
-  connect( m_pSubPopupMenuTab, TQT_SIGNAL( activated ( int ) ),
-           this, TQT_SLOT( slotSubPopupMenuTabActivated( int ) ) );
+  connect( m_pSubPopupMenuTab, TQ_SIGNAL( activated ( int ) ),
+           this, TQ_SLOT( slotSubPopupMenuTabActivated( int ) ) );
   m_pPopupMenu->insertSeparator();
   m_pPopupMenu->insertItem( SmallIconSet( "tab_remove" ),
                             i18n("&Close Tab"),
                             m_pViewManager->mainWindow(),
-                            TQT_SLOT( slotRemoveTabPopup() ),
+                            TQ_SLOT( slotRemoveTabPopup() ),
                             m_pViewManager->mainWindow()->action("removecurrenttab")->shortcut(),
                             CLOSETAB_ID );
-  connect( this, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ),
-           TQT_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) );
-  connect( this, TQT_SIGNAL( contextMenu( const TQPoint & ) ),
-           TQT_SLOT(slotContextMenu( const TQPoint & ) ) );
+  connect( this, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ),
+           TQ_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) );
+  connect( this, TQ_SIGNAL( contextMenu( const TQPoint & ) ),
+           TQ_SLOT(slotContextMenu( const TQPoint & ) ) );
 
   m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab();
 
@@ -146,14 +146,14 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
   setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() );
   if (KonqSettings::tabPosition()=="Bottom")
     setTabPosition(TQTabWidget::Bottom);
-  connect( this, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(slotCloseRequest( TQWidget * )));
-  connect( this, TQT_SIGNAL( removeTabPopup() ),
-           m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTabPopup() ) );
+  connect( this, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(slotCloseRequest( TQWidget * )));
+  connect( this, TQ_SIGNAL( removeTabPopup() ),
+           m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTabPopup() ) );
 
   if ( KonqSettings::addTabButton() ) {
     m_leftWidget = new TQToolButton( this );
-    connect( m_leftWidget, TQT_SIGNAL( clicked() ),
-             m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) );
+    connect( m_leftWidget, TQ_SIGNAL( clicked() ),
+             m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) );
     m_leftWidget->setIconSet( SmallIcon( "tab_new" ) );
     m_leftWidget->adjustSize();
     TQToolTip::add(m_leftWidget, i18n("Open a new tab"));
@@ -161,8 +161,8 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
   }
   if ( KonqSettings::closeTabButton() ) {
     m_rightWidget = new TQToolButton( this );
-    connect( m_rightWidget, TQT_SIGNAL( clicked() ),
-             m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTab() ) );
+    connect( m_rightWidget, TQ_SIGNAL( clicked() ),
+             m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTab() ) );
     m_rightWidget->setIconSet( SmallIconSet( "tab_remove" ) );
     m_rightWidget->adjustSize();
     TQToolTip::add(m_rightWidget, i18n("Close the current tab"));
@@ -171,23 +171,23 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon
 
   setAutomaticResizeTabs( true );
   setTabReorderingEnabled( true );
-  connect( this, TQT_SIGNAL( movedTab( int, int ) ),
-           TQT_SLOT( slotMovedTab( int, int ) ) );
-  connect( this, TQT_SIGNAL( mouseMiddleClick() ),
-           TQT_SLOT( slotMouseMiddleClick() ) );
-  connect( this, TQT_SIGNAL( mouseMiddleClick( TQWidget * ) ),
-           TQT_SLOT( slotMouseMiddleClick( TQWidget * ) ) );
-  connect( this, TQT_SIGNAL( mouseDoubleClick() ),
-           m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) );
-
-  connect( this, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )),
-           TQT_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) );
-  connect( this, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )),
-           TQT_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) );
-  connect( this, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )),
-           TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) );
-  connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )),
-           TQT_SLOT( slotInitiateDrag( TQWidget * ) ) );
+  connect( this, TQ_SIGNAL( movedTab( int, int ) ),
+           TQ_SLOT( slotMovedTab( int, int ) ) );
+  connect( this, TQ_SIGNAL( mouseMiddleClick() ),
+           TQ_SLOT( slotMouseMiddleClick() ) );
+  connect( this, TQ_SIGNAL( mouseMiddleClick( TQWidget * ) ),
+           TQ_SLOT( slotMouseMiddleClick( TQWidget * ) ) );
+  connect( this, TQ_SIGNAL( mouseDoubleClick() ),
+           m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) );
+
+  connect( this, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )),
+           TQ_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) );
+  connect( this, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )),
+           TQ_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) );
+  connect( this, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )),
+           TQ_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) );
+  connect( this, TQ_SIGNAL( initiateDrag( TQWidget * )),
+           TQ_SLOT( slotInitiateDrag( TQWidget * ) ) );
 
   setMouseWheelScroll(KonqSettings::tabsCycleWheel());
 }
@@ -466,7 +466,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
     m_pSubPopupMenuTab->insertItem( SmallIcon( "reload_all_tabs" ),
                                     i18n( "&Reload All Tabs" ),
                                     m_pViewManager->mainWindow(),
-                                    TQT_SLOT( slotReloadAllTabs() ),
+                                    TQ_SLOT( slotReloadAllTabs() ),
                                     m_pViewManager->mainWindow()->action("reload_all_tabs")->shortcut() );
     m_pSubPopupMenuTab->insertSeparator();
     for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next())
@@ -488,7 +488,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab()
       m_pSubPopupMenuTab->insertItem( SmallIconSet( "tab_remove_other" ),
 				      i18n( "Close &Other Tabs" ),
 				      m_pViewManager->mainWindow(),
-				      TQT_SLOT( slotRemoveOtherTabsPopup() ),
+				      TQ_SLOT( slotRemoveOtherTabsPopup() ),
 				      m_pViewManager->mainWindow()->action("removeothertabs")->shortcut() );
 }
 
diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h
index bfc15dbb0..59e172e89 100644
--- a/konqueror/konq_tabs.h
+++ b/konqueror/konq_tabs.h
@@ -81,7 +81,7 @@ public:
 
   //inherited
   virtual void reparentFrame(TQWidget * parent,
-                             const TQPoint & p, bool showIt=FALSE );
+                             const TQPoint & p, bool showIt=false );
 
   void moveTabBackward(int index);
   void moveTabForward(int index);
diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp
index 0bacb9c5b..8ae65ec6b 100644
--- a/konqueror/konq_view.cpp
+++ b/konqueror/konq_view.cpp
@@ -45,7 +45,7 @@
 #include <tqmetaobject.h>
 #include <tqobjectlist.h>
 #include <config.h>
-#include <tqucomextra_p.h>
+#include <private/tqucomextra_p.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 
@@ -127,7 +127,7 @@ KonqView::~KonqView()
   {
     finishedWithCurrentURL();
     if ( isPassiveMode() )
-      disconnect( m_pPart, TQT_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQT_SLOT( slotObjectDestroyed() ) );
+      disconnect( m_pPart, TQ_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQ_SLOT( slotObjectDestroyed() ) );
 
     delete m_pPart;
   }
@@ -372,16 +372,16 @@ bool KonqView::changeViewMode( const TQString &serviceType,
 void KonqView::connectPart(  )
 {
   //kdDebug(1202) << "KonqView::connectPart" << endl;
-  connect( m_pPart, TQT_SIGNAL( started( TDEIO::Job * ) ),
-           this, TQT_SLOT( slotStarted( TDEIO::Job * ) ) );
-  connect( m_pPart, TQT_SIGNAL( completed() ),
-           this, TQT_SLOT( slotCompleted() ) );
-  connect( m_pPart, TQT_SIGNAL( completed(bool) ),
-           this, TQT_SLOT( slotCompleted(bool) ) );
-  connect( m_pPart, TQT_SIGNAL( canceled( const TQString & ) ),
-           this, TQT_SLOT( slotCanceled( const TQString & ) ) );
-  connect( m_pPart, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-           this, TQT_SLOT( setCaption( const TQString & ) ) );
+  connect( m_pPart, TQ_SIGNAL( started( TDEIO::Job * ) ),
+           this, TQ_SLOT( slotStarted( TDEIO::Job * ) ) );
+  connect( m_pPart, TQ_SIGNAL( completed() ),
+           this, TQ_SLOT( slotCompleted() ) );
+  connect( m_pPart, TQ_SIGNAL( completed(bool) ),
+           this, TQ_SLOT( slotCompleted(bool) ) );
+  connect( m_pPart, TQ_SIGNAL( canceled( const TQString & ) ),
+           this, TQ_SLOT( slotCanceled( const TQString & ) ) );
+  connect( m_pPart, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+           this, TQ_SLOT( setCaption( const TQString & ) ) );
 
   KParts::BrowserExtension *ext = browserExtension();
 
@@ -389,8 +389,8 @@ void KonqView::connectPart(  )
   {
       ext->setBrowserInterface( m_browserIface );
 
-      connect( ext, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ),
-               m_pMainWindow, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+      connect( ext, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ),
+               m_pMainWindow, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
 
       if ( m_bPopupMenuEnabled )
       {
@@ -398,59 +398,59 @@ void KonqView::connectPart(  )
           enablePopupMenu( true );
       }
 
-      connect( ext, TQT_SIGNAL( setLocationBarURL( const TQString & ) ),
-               this, TQT_SLOT( setLocationBarURL( const TQString & ) ) );
+      connect( ext, TQ_SIGNAL( setLocationBarURL( const TQString & ) ),
+               this, TQ_SLOT( setLocationBarURL( const TQString & ) ) );
 
-      connect( ext, TQT_SIGNAL( setIconURL( const KURL & ) ),
-               this, TQT_SLOT( setIconURL( const KURL & ) ) );
+      connect( ext, TQ_SIGNAL( setIconURL( const KURL & ) ),
+               this, TQ_SLOT( setIconURL( const KURL & ) ) );
 
-      connect( ext, TQT_SIGNAL( setPageSecurity( int ) ),
-               this, TQT_SLOT( setPageSecurity( int ) ) );
+      connect( ext, TQ_SIGNAL( setPageSecurity( int ) ),
+               this, TQ_SLOT( setPageSecurity( int ) ) );
 
-      connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
-               m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) );
+      connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
+               m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) );
 
-      connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
-               m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) );
+      connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
+               m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) );
 
-      connect( ext, TQT_SIGNAL( loadingProgress( int ) ),
-               m_pKonqFrame->statusbar(), TQT_SLOT( slotLoadingProgress( int ) ) );
+      connect( ext, TQ_SIGNAL( loadingProgress( int ) ),
+               m_pKonqFrame->statusbar(), TQ_SLOT( slotLoadingProgress( int ) ) );
 
-      connect( ext, TQT_SIGNAL( speedProgress( int ) ),
-               m_pKonqFrame->statusbar(), TQT_SLOT( slotSpeedProgress( int ) ) );
+      connect( ext, TQ_SIGNAL( speedProgress( int ) ),
+               m_pKonqFrame->statusbar(), TQ_SLOT( slotSpeedProgress( int ) ) );
 
-      connect( ext, TQT_SIGNAL( selectionInfo( const KFileItemList & ) ),
-               this, TQT_SLOT( slotSelectionInfo( const KFileItemList & ) ) );
+      connect( ext, TQ_SIGNAL( selectionInfo( const KFileItemList & ) ),
+               this, TQ_SLOT( slotSelectionInfo( const KFileItemList & ) ) );
 
-      connect( ext, TQT_SIGNAL( mouseOverInfo( const KFileItem * ) ),
-               this, TQT_SLOT( slotMouseOverInfo( const KFileItem * ) ) );
+      connect( ext, TQ_SIGNAL( mouseOverInfo( const KFileItem * ) ),
+               this, TQ_SLOT( slotMouseOverInfo( const KFileItem * ) ) );
 
-      connect( ext, TQT_SIGNAL( openURLNotify() ),
-               this, TQT_SLOT( slotOpenURLNotify() ) );
+      connect( ext, TQ_SIGNAL( openURLNotify() ),
+               this, TQ_SLOT( slotOpenURLNotify() ) );
 
-      connect( ext, TQT_SIGNAL( enableAction( const char *, bool ) ),
-               this, TQT_SLOT( slotEnableAction( const char *, bool ) ) );
+      connect( ext, TQ_SIGNAL( enableAction( const char *, bool ) ),
+               this, TQ_SLOT( slotEnableAction( const char *, bool ) ) );
 
-      connect( ext, TQT_SIGNAL( setActionText( const char *, const TQString& ) ),
-               this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) );
+      connect( ext, TQ_SIGNAL( setActionText( const char *, const TQString& ) ),
+               this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) );
 
-      connect( ext, TQT_SIGNAL( moveTopLevelWidget( int, int ) ),
-               this, TQT_SLOT( slotMoveTopLevelWidget( int, int ) ) );
+      connect( ext, TQ_SIGNAL( moveTopLevelWidget( int, int ) ),
+               this, TQ_SLOT( slotMoveTopLevelWidget( int, int ) ) );
 
-      connect( ext, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ),
-               this, TQT_SLOT( slotResizeTopLevelWidget( int, int ) ) );
+      connect( ext, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ),
+               this, TQ_SLOT( slotResizeTopLevelWidget( int, int ) ) );
 
-      connect( ext, TQT_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ),
-               this, TQT_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) );
+      connect( ext, TQ_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ),
+               this, TQ_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) );
 
       if (service()->desktopEntryName() != "konq_sidebartng") {
-          connect( ext, TQT_SIGNAL( infoMessage( const TQString & ) ),
-               m_pKonqFrame->statusbar(), TQT_SLOT( message( const TQString & ) ) );
+          connect( ext, TQ_SIGNAL( infoMessage( const TQString & ) ),
+               m_pKonqFrame->statusbar(), TQ_SLOT( message( const TQString & ) ) );
 
           connect( ext,
-                   TQT_SIGNAL( addWebSideBar(const KURL&, const TQString&) ),
+                   TQ_SIGNAL( addWebSideBar(const KURL&, const TQString&) ),
                    m_pMainWindow,
-                   TQT_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) );
+                   TQ_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) );
       }
 
       callExtensionBoolMethod( "setSaveViewPropertiesLocally(bool)", m_pMainWindow->saveViewPropertiesLocally() );
@@ -472,7 +472,7 @@ void KonqView::connectPart(  )
 
   m_pPart->widget()->installEventFilter( this );
 
-  if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
+  if (m_pPart->widget()->inherits("TQScrollView"))
   {
     (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
   }
@@ -480,8 +480,8 @@ void KonqView::connectPart(  )
   // KonqDirPart signal
   if ( m_pPart->inherits("KonqDirPart") )
   {
-      connect( m_pPart, TQT_SIGNAL( findOpen( KonqDirPart * ) ),
-               m_pMainWindow, TQT_SLOT( slotFindOpen( KonqDirPart * ) ) );
+      connect( m_pPart, TQ_SIGNAL( findOpen( KonqDirPart * ) ),
+               m_pMainWindow, TQ_SLOT( slotFindOpen( KonqDirPart * ) ) );
   }
 }
 
@@ -532,9 +532,9 @@ void KonqView::slotStarted( TDEIO::Job * job )
         job->setWindow (m_pMainWindow->topLevelWidget ());
       }
 
-      connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
-      connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) );
-      connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
+      connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
+      connect( job, TQ_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) );
+      connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
   }
 }
 
@@ -1165,39 +1165,39 @@ void KonqView::enablePopupMenu( bool b )
   if ( b ) {
     m_bPopupMenuEnabled = true;
 
-    connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
 
-    connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
+    connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
   }
   else // disable context popup
   {
     m_bPopupMenuEnabled = false;
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) );
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
 
-    disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-             m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+    disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+             m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
   }
   enableBackRightClick( m_bBackRightClick );
 }
@@ -1207,11 +1207,11 @@ void KonqView::enableBackRightClick( bool b )
 {
     m_bBackRightClick = b;
     if ( b )
-        connect( this, TQT_SIGNAL( backRightClick() ),
-                 m_pMainWindow, TQT_SLOT( slotBack() ) );
+        connect( this, TQ_SIGNAL( backRightClick() ),
+                 m_pMainWindow, TQ_SLOT( slotBack() ) );
     else
-        disconnect( this, TQT_SIGNAL( backRightClick() ),
-                    m_pMainWindow, TQT_SLOT( slotBack() ) );
+        disconnect( this, TQ_SIGNAL( backRightClick() ),
+                    m_pMainWindow, TQ_SLOT( slotBack() ) );
 }
 
 void KonqView::reparseConfiguration()
@@ -1220,10 +1220,6 @@ void KonqView::reparseConfiguration()
     bool b = KonqSettings::backRightClick();
     if ( m_bBackRightClick != b )
     {
-        if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
-        {
-            (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
-        }
         enableBackRightClick( b );
     }
 }
@@ -1271,7 +1267,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
                  !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me
                  ev->source() != m_pPart->widget() &&
                  children &&
-                 children->findRef( TQT_TQOBJECT(ev->source()) ) == -1 )
+                 children->findRef( ev->source() ) == -1 )
                 ev->acceptAction();
 
             delete children;
@@ -1289,6 +1285,21 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
             emit ext->openURLRequest( lstDragURLs.first() ); // this will call m_pMainWindow::slotOpenURLRequest delayed
     }
 
+    else if (e->type() == TQEvent::MouseButtonRelease)
+    {
+        TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(e);
+        switch (mouseEvent->button())
+        {
+            case TQMouseEvent::HistoryBackButton:
+                go(-1);
+                return true;
+
+            case TQMouseEvent::HistoryForwardButton:
+                go(1);
+                return true;
+        }
+    }
+
     if ( m_bBackRightClick )
     {
         if ( e->type() == TQEvent::ContextMenu )
diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp
index 5c5bdc29b..c57b643cd 100644
--- a/konqueror/konq_viewmgr.cpp
+++ b/konqueror/konq_viewmgr.cpp
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 
 #include <tdeaccelgen.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeglobalsettings.h>
@@ -55,8 +55,8 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow )
   m_bLoadingProfile = false;
 
   m_activePartChangedTimer = new TQTimer(this);
-  connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged()));
-  connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) );
+  connect(m_activePartChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitActivePartChanged()));
+  connect( this, TQ_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQ_SLOT( slotActivePartChanged ( KParts::Part * ) ) );
 }
 
 KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName )
@@ -139,7 +139,7 @@ KonqView* KonqViewManager::splitView ( TQt::Orientation orientation,
 
   //kdDebug(1202) << "Create new Container" << endl;
   KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer );
-  connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+  connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
   parentContainer->insertChildFrame( newContainer, index );
   if ( moveNewContainer ) {
@@ -231,7 +231,7 @@ KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation,
   m_pMainWindow->removeChildFrame( mainFrame );
 
   KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L);
-  connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+  connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
   m_pMainWindow->insertChildFrame( newContainer );
 
@@ -286,7 +286,7 @@ void KonqViewManager::convertDocContainer()
 
   KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this);
   parentContainer->insertChildFrame( newContainer );
-  connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) );
+  connect( newContainer, TQ_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQ_SLOT(slotCtrlTabPressed()) );
 
   m_pDocContainer->widget()->reparent( newContainer, pos );
   newContainer->insertChildFrame( m_pDocContainer );
@@ -882,7 +882,7 @@ void KonqViewManager::slotPassiveModePartDeleted()
   // Passive mode parts aren't registered to the part manager,
   // so we have to handle suicidal ones ourselves
   KParts::ReadOnlyPart * part = const_cast<KParts::ReadOnlyPart *>( static_cast<const KParts::ReadOnlyPart *>( sender() ) );
-  disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
+  disconnect( part, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) );
   kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl;
   KonqView * view = m_pMainWindow->childView( part );
   kdDebug(1202) << "view=" << view << endl;
@@ -1038,8 +1038,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
                               m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode );
   //kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl;
 
-  TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
-                    m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
+  TQObject::connect( v, TQ_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ),
+                    m_pMainWindow, TQ_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) );
 
   m_pMainWindow->insertChildView( v );
 
@@ -1063,7 +1063,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
   else
   {
     // Passive views aren't registered, but we still want to detect the suicidal ones
-    connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) );
+    connect( v->part(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) );
   }
 
   //kdDebug(1202) << "KonqViewManager::setupView done" << endl;
@@ -1081,7 +1081,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString
   if ( TQFile::exists( path ) )
     TQFile::remove( path );
 
-  KSimpleConfig cfg( path );
+  TDESimpleConfig cfg( path );
   cfg.setGroup( "Profile" );
   if ( !profileName.isEmpty() )
       cfg.writePathEntry( "Name", profileName );
@@ -1599,7 +1599,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
     else
     {
       KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent );
-      connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+      connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
       int tabindex = -1;
       if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible
@@ -1628,7 +1628,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
     //kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl;
 
     KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this );
-    connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed()));
+    connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed()));
 
     parent->insertChildFrame( newContainer );
     m_pDocContainer = newContainer;
@@ -1666,10 +1666,10 @@ void KonqViewManager::setProfiles( TDEActionMenu *profiles )
 
   if ( m_pamProfiles )
   {
-    connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ),
-             this, TQT_SLOT( slotProfileActivated( int ) ) );
-    connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( slotProfileListAboutToShow() ) );
+    connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( activated( int ) ),
+             this, TQ_SLOT( slotProfileActivated( int ) ) );
+    connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( slotProfileListAboutToShow() ) );
   }
   //KonqMainWindow::enableAllActions will call it anyway
   //profileListDirty();
@@ -1704,7 +1704,7 @@ void KonqViewManager::profileListDirty( bool broadcast )
     return;
   }
 
-  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() );
+  tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", TQByteArray() );
 }
 
 void KonqViewManager::slotProfileActivated( int id )
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index 49d206664..efc655a40 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -42,7 +42,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
     {
         (void) new TDEAction( i18n("&Speak Text"),
             "kttsd", 0,
-            this, TQT_SLOT(slotReadOut()),
+            this, TQ_SLOT(slotReadOut()),
             actionCollection(), "tools_kttsd" );
     }
     else
@@ -63,11 +63,11 @@ void TDEHTMLPluginKTTSD::slotReadOut()
     else
     {
         // If KTTSD not running, start it.
-        DCOPClient *client = kapp->dcopClient();
+        DCOPClient *client = tdeApp->dcopClient();
         if (!client->isApplicationRegistered("kttsd"))
         {
             TQString error;
-            if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error))
+            if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error))
                 TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error );
         }
 
diff --git a/konqueror/listview/konq_infolistviewwidget.cpp b/konqueror/listview/konq_infolistviewwidget.cpp
index e835f1cb3..8ec62c79a 100644
--- a/konqueror/listview/konq_infolistviewwidget.cpp
+++ b/konqueror/listview/konq_infolistviewwidget.cpp
@@ -37,8 +37,8 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
 {
     m_metaInfoJob = 0;
 
-    m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT(slotSelectMimeType()),
+    m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this,
+                                     TQ_SLOT(slotSelectMimeType()),
                                      parent->actionCollection(), "view_as" );
 
     kdDebug(1203) << "created info list view\n";
@@ -237,10 +237,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
     else
     {
         m_metaInfoJob = TDEIO::fileMetaInfo(list);
-        connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
-             this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
-             this, TQT_SLOT( slotMetaInfoResult()));
+        connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)),
+             this, TQ_SLOT( slotMetaInfo( const KFileItem*)));
+        connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)),
+             this, TQ_SLOT( slotMetaInfoResult()));
     }
 }
 
@@ -257,10 +257,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list)
     else
     {
         m_metaInfoJob = TDEIO::fileMetaInfo(list);
-        connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
-             this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
-             this, TQT_SLOT( slotMetaInfoResult()));
+        connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)),
+             this, TQ_SLOT( slotMetaInfo( const KFileItem*)));
+        connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)),
+             this, TQ_SLOT( slotMetaInfoResult()));
     }
     KonqBaseListViewWidget::slotRefreshItems(list);
 }
@@ -313,10 +313,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult()
     else
     {
         m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo);
-        connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
-             this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
-        connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
-             this, TQT_SLOT( slotMetaInfoResult()));
+        connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)),
+             this, TQ_SLOT( slotMetaInfo( const KFileItem*)));
+        connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)),
+             this, TQ_SLOT( slotMetaInfoResult()));
         m_metaInfoTodo.clear();
     }
 }
diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp
index 5a06068ca..33424ca52 100644
--- a/konqueror/listview/konq_listview.cpp
+++ b/konqueror/listview/konq_listview.cpp
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 #include <konq_sort_constants.h>
 
@@ -289,20 +289,20 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char
    // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/
    m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType);
 
-   connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
-            m_extension, TQT_SLOT( updateActions() ) );
-   connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
-            this, TQT_SLOT( slotSelectionChanged() ) );
+   connect( m_pListView, TQ_SIGNAL( selectionChanged() ),
+            m_extension, TQ_SLOT( updateActions() ) );
+   connect( m_pListView, TQ_SIGNAL( selectionChanged() ),
+            this, TQ_SLOT( slotSelectionChanged() ) );
 
-   connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ),
-            m_extension, TQT_SLOT( updateActions() ) );
-   connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int)));
-   connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int)));
-   connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged()));
+   connect( m_pListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ),
+            m_extension, TQ_SLOT( updateActions() ) );
+   connect(m_pListView->header(),TQ_SIGNAL(indexChange(int,int,int)),this,TQ_SLOT(headerDragged(int,int,int)));
+   connect(m_pListView->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotHeaderClicked(int)));
+   connect(m_pListView->header(),TQ_SIGNAL(sizeChange(int,int,int)),TQ_SLOT(slotHeaderSizeChanged()));
 
    // signals from konqdirpart (for BC reasons)
-   connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) );
-   connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) );
+   connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) );
+   connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) );
 
    loadPlugins( this, this, instance() );
 }
@@ -393,7 +393,7 @@ void KonqListView::slotSelect()
    for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ )
    {
       if ((m_pListView->automaticSelection()) && (it->isSelected())) {
-         it->setSelected(FALSE);
+         it->setSelected(false);
          //the following line is to prevent that more than one item were selected
          //and now get deselected and automaticSelection() was true, this shouldn't happen
          //but who knows, aleXXX
@@ -401,11 +401,11 @@ void KonqListView::slotSelect()
       }
       if ( it->isVisible() ) {
          if ( re.exactMatch( it->text(0) ) ) {
-            it->setSelected(TRUE);
+            it->setSelected(true);
          }
       }
       else {
-         it->setSelected(FALSE);
+         it->setSelected(false);
       }
    }
    m_pListView->blockSignals( false );
@@ -422,22 +422,22 @@ void KonqListView::slotUnselect()
    if ( !ok )
       return;
 
-   TQRegExp re( pattern, TRUE, TRUE );
+   TQRegExp re( pattern, true, true );
 
-   m_pListView->blockSignals(TRUE);
+   m_pListView->blockSignals(true);
 
    for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) {
       if ( it->isVisible() ) {
          if ( re.exactMatch( it->text(0) ) ) {
-            it->setSelected(FALSE);
+            it->setSelected(false);
          }
       }
       else {
-         it->setSelected(FALSE);
+         it->setSelected(false);
       }
    }
 
-   m_pListView->blockSignals(FALSE);
+   m_pListView->blockSignals(false);
    m_pListView->deactivateAutomaticSelection();
    emit m_pListView->selectionChanged();
    m_pListView->viewport()->update();
@@ -445,14 +445,14 @@ void KonqListView::slotUnselect()
 
 void KonqListView::slotSelectAll()
 {
-   m_pListView->selectAll(TRUE);
+   m_pListView->selectAll(true);
    m_pListView->deactivateAutomaticSelection();
    emit m_pListView->selectionChanged();
 }
 
 void KonqListView::slotUnselectAll()
 {
-    m_pListView->selectAll(FALSE);
+    m_pListView->selectAll(false);
    m_pListView->deactivateAutomaticSelection();
     emit m_pListView->selectionChanged();
 }
@@ -463,7 +463,7 @@ void KonqListView::slotInvertSelection()
    if ((m_pListView->automaticSelection())
        && (m_pListView->currentItem()!=0)
        && (m_pListView->currentItem()->isSelected()))
-      m_pListView->currentItem()->setSelected(FALSE);
+      m_pListView->currentItem()->setSelected(false);
 
    m_pListView->invertSelection();
     m_pListView->deactivateAutomaticSelection();
@@ -563,7 +563,7 @@ void KonqListView::slotHeaderClicked(int sec)
    if (nameOfSortColumn!=m_pListView->sortedByColumn)
    {
       m_pListView->sortedByColumn=nameOfSortColumn;
-      m_pListView->setAscending(TRUE);
+      m_pListView->setAscending(true);
    }
    else
    {
@@ -789,7 +789,7 @@ void KonqListView::headerDragged(int sec, int from, int to)
    kdDebug(1202)<<"section: "<<sec<<" fromIndex: "<<from<<" toIndex "<<to<<endl;
    //at this point the columns aren't moved yet, so I let the listview
    //rearrange the stuff and use a single shot timer
-   TQTimer::singleShot(200,this,TQT_SLOT(slotSaveAfterHeaderDrag()));
+   TQTimer::singleShot(200,this,TQ_SLOT(slotSaveAfterHeaderDrag()));
 }
 
 const KFileItem * KonqListView::currentItem()
@@ -863,7 +863,7 @@ void KonqListView::slotHeaderSizeChanged()
    if ( !m_headerTimer )
    {
       m_headerTimer = new TQTimer( this );
-      connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) );
+      connect( m_headerTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSaveColumnWidths() ) );
    }
    else
       m_headerTimer->stop();
@@ -885,33 +885,33 @@ void KonqListView::slotKFindClosed()
 
 void KonqListView::setupActions()
 {
-   m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" );
+   m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQ_SLOT(slotColumnToggled()), actionCollection(), "show_time" );
    m_paShowTime->setCheckedState(i18n("Hide &Modification Time"));
-   m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" );
+   m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_type" );
    m_paShowType->setCheckedState(i18n("Hide &File Type"));
-   m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" );
+   m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" );
    m_paShowMimeType->setCheckedState(i18n("Hide MimeType"));
-   m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" );
+   m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" );
    m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time"));
-   m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" );
+   m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" );
    m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time"));
-   m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" );
+   m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" );
    m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination"));
-   m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" );
+   m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_size" );
    m_paShowSize->setCheckedState(i18n("Hide Filesize"));
-   m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" );
+   m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_owner" );
    m_paShowOwner->setCheckedState(i18n("Hide Owner"));
-   m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" );
+   m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_group" );
    m_paShowGroup->setCheckedState(i18n("Hide Group"));
-   m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" );
+   m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" );
    m_paShowPermissions->setCheckedState(i18n("Hide Permissions"));
-   m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" );
+   m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_url" );
 
-   m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" );
-  m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" );
-  m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
-  m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );
-  m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );
+   m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" );
+  m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" );
+  m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" );
+  m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );
+  m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );
 
   // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts
   // can be set from the 'Configure Shortcuts..." dialog.
@@ -929,16 +929,16 @@ void KonqListView::setupActions()
   m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item"));
   m_paRenameMovePrev->setEnabled(false);
 
-  m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" );
+  m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" );
 //  m_paShowDot->setCheckedState(i18n("Hide &Hidden Files"));
 
-  m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
+  m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQ_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );
 
   m_paSortAlternate = new TDEAction( i18n( "&Alternate Sort Order" ), CTRL+Key_S, this,
-    TQT_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order");
+    TQ_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order");
   m_paSortAlternate->setToolTip( i18n( "Sort by PREVIOUS sort column" ) );
   m_paSortReverse = new TDEAction( i18n( "&Reverse Sort Order" ), CTRL+Key_R, this,
-    TQT_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order");
+    TQ_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order");
   m_paSortReverse->setToolTip( i18n( "Reverse sort order of current sort column" ) );
 
   /*
@@ -948,17 +948,17 @@ void KonqListView::setupActions()
   TextSortOrder initialOrder = m_pProps->getSortOrder();
 
   m_paOrderUnicodeUnmodified = new TDEToggleAction( i18n( "&Unicode based" ), ALT+Key_1, this,
-    TQT_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" );
+    TQ_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" );
   m_paOrderUnicodeUnmodified->setToolTip( i18n( "Strict numeric Unicode based order" ) );
   m_paOrderUnicodeUnmodified->setChecked( initialOrder == UNICODE_UNMODIFIED );
 
   m_paOrderUnicodeCaseInsensitive = new TDEToggleAction( i18n( "Unicode based, &case insensitive" ), ALT+Key_2, this,
-    TQT_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" );
+    TQ_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" );
   m_paOrderUnicodeCaseInsensitive->setToolTip( i18n( "Unicode based order but with lower/upper case ASCII letters adjacent" ) );
   m_paOrderUnicodeCaseInsensitive->setChecked(initialOrder == UNICODE_CASEINSENSITIVE);
 
   m_paOrderLocale = new TDEToggleAction( i18n( "&Locale based" ), ALT+Key_3, this,
-    TQT_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" );
+    TQ_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" );
   m_paOrderLocale->setToolTip( i18n( "Locale based order, usually \"friendly\"" ) );
   m_paOrderLocale->setChecked(initialOrder == LOCALE_UNMODIFIED);
 
@@ -968,12 +968,12 @@ void KonqListView::setupActions()
   m_paOrderLocale->setExclusiveGroup( "sortOrder" );
 
   m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), CTRL+SHIFT+Key_F, this,
-    TQT_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first");
+    TQ_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first");
   m_paDisplayDirectoriesFirst->setToolTip( i18n( "Always display directories before non-directories" ) );
   m_paDisplayDirectoriesFirst->setChecked(m_pProps->isDirsFirst());
 
   m_paDisplayHiddenFirst = new TDEToggleAction( i18n("Group &Hidden First"), CTRL+SHIFT+Key_H, this,
-    TQT_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first");
+    TQ_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first");
   m_paDisplayHiddenFirst->setToolTip( i18n( "Always display hidden files before non-hidden files" ) );
   m_paDisplayHiddenFirst->setChecked(m_pProps->isHiddenFirst());
 
diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg
index 5c31c5cea..81e9af735 100644
--- a/konqueror/listview/konq_listview.kcfg
+++ b/konqueror/listview/konq_listview.kcfg
@@ -49,7 +49,7 @@
       <whatsthis></whatsthis>
     </entry>
     <entry key="FileNameColumnWidth" type="Int">
-      <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default>
+      <default code="true">25 * tdeApp->fontMetrics().width( "m" )</default>
       <label>Width of the FileName Column</label>
       <whatsthis></whatsthis>
     </entry>
diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp
index 5a2ff1261..e1b1a5a66 100644
--- a/konqueror/listview/konq_listviewwidget.cpp
+++ b/konqueror/listview/konq_listviewwidget.cpp
@@ -121,57 +121,57 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
 
    initConfig();
 #if 0
-   connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),
-            this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
+   connect( this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),
+            this, TQ_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
 #endif
-   connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )),
-            this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) );
-   connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
-            this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
-   connect( this, TQT_SIGNAL(executed( TQListViewItem * )),
-            this, TQT_SLOT(slotExecuted( TQListViewItem * )) );
-   connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )),
-            this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) );
-   connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
-            this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
-   connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
-            this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
-   connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )),
-            this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
-   connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )),
-            this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
-   connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
-
-   connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )),
-            this, TQT_SIGNAL(viewportAdjusted()) );
-   connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )),
-            this, TQT_SIGNAL(viewportAdjusted()) );
+   connect( this, TQ_SIGNAL(returnPressed( TQListViewItem * )),
+            this, TQ_SLOT(slotReturnPressed( TQListViewItem * )) );
+   connect( this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
+            this, TQ_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
+   connect( this, TQ_SIGNAL(executed( TQListViewItem * )),
+            this, TQ_SLOT(slotExecuted( TQListViewItem * )) );
+   connect( this, TQ_SIGNAL(currentChanged( TQListViewItem * )),
+            this, TQ_SLOT(slotCurrentChanged( TQListViewItem * )) );
+   connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
+            this, TQ_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
+   connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
+            this, TQ_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
+   connect( this, TQ_SIGNAL(renameNext( TQListViewItem *, int )),
+            this, TQ_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
+   connect( this, TQ_SIGNAL(renamePrev( TQListViewItem *, int )),
+            this, TQ_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
+   connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) );
+
+   connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged( int )),
+            this, TQ_SIGNAL(viewportAdjusted()) );
+   connect( verticalScrollBar(), TQ_SIGNAL(valueChanged( int )),
+            this, TQ_SIGNAL(viewportAdjusted()) );
 
    // Connect the directory lister
-   connect( m_dirLister, TQT_SIGNAL(started( const KURL & )),
-            this, TQT_SLOT(slotStarted()) );
-   connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) );
-   connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) );
-   connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) );
-   connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ),
-            this, TQT_SLOT(slotNewItems( const KFileItemList & )) );
-   connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )),
-            this, TQT_SLOT(slotDeleteItem( KFileItem * )) );
-   connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )),
-            this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) );
-   connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )),
-            this, TQT_SLOT(slotRedirection( const KURL & )) );
-   connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )),
-            m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
-
-   connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )),
-            m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) );
-   connect( m_dirLister, TQT_SIGNAL(percent( int )),
-            m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) );
-   connect( m_dirLister, TQT_SIGNAL(speed( int )),
-            m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) );
-
-   connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) );
+   connect( m_dirLister, TQ_SIGNAL(started( const KURL & )),
+            this, TQ_SLOT(slotStarted()) );
+   connect( m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()) );
+   connect( m_dirLister, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) );
+   connect( m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()) );
+   connect( m_dirLister, TQ_SIGNAL(newItems( const KFileItemList & ) ),
+            this, TQ_SLOT(slotNewItems( const KFileItemList & )) );
+   connect( m_dirLister, TQ_SIGNAL(deleteItem( KFileItem * )),
+            this, TQ_SLOT(slotDeleteItem( KFileItem * )) );
+   connect( m_dirLister, TQ_SIGNAL(refreshItems( const KFileItemList & )),
+            this, TQ_SLOT( slotRefreshItems( const KFileItemList & )) );
+   connect( m_dirLister, TQ_SIGNAL(redirection( const KURL & )),
+            this, TQ_SLOT(slotRedirection( const KURL & )) );
+   connect( m_dirLister, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )),
+            m_pBrowserView, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )) );
+
+   connect( m_dirLister, TQ_SIGNAL(infoMessage( const TQString& )),
+            m_pBrowserView->extension(), TQ_SIGNAL(infoMessage( const TQString& )) );
+   connect( m_dirLister, TQ_SIGNAL(percent( int )),
+            m_pBrowserView->extension(), TQ_SIGNAL(loadingProgress( int )) );
+   connect( m_dirLister, TQ_SIGNAL(speed( int )),
+            m_pBrowserView->extension(), TQ_SIGNAL(speedProgress( int )) );
+
+   connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(slotUpdateBackground()) );
 
    viewport()->setMouseTracking( true );
    viewport()->setFocusPolicy( TQWidget::WheelFocus );
@@ -412,7 +412,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) {
 		TQRect r( m_rubber->normalize() );
 		delete m_rubber;
 		m_rubber = 0;
-		repaintContents( r, FALSE );
+		repaintContents( r, false );
 	}
 
 	delete m_selected;
@@ -449,11 +449,11 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) {
 		TQRect r( m_rubber->normalize() );
 		delete m_rubber;
 		m_rubber = 0;
-		repaintContents( r, FALSE );
+		repaintContents( r, false );
 	}
 
 	if ( m_scrollTimer ) {
-		disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) );
+		disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) );
 		m_scrollTimer->stop();
 		delete m_scrollTimer;
 		m_scrollTimer = 0;
@@ -619,7 +619,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 
    TQRect rr;
    TQRect nr = m_rubber->normalize();
-   bool changed = FALSE;
+   bool changed = false;
 
    if ( cur )
    {
@@ -657,7 +657,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 	    {
                setSelected( cur, true );
                setActiveMultiSelectItem( at );
-               changed = TRUE;
+               changed = true;
                rr = rr.unite( itemRect( cur ) );
 	    }
          }
@@ -665,7 +665,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 	 {
             if ( cur->isSelected() )
 	    {
-               changed = TRUE;
+               changed = true;
                rr = rr.unite( itemRect( cur ) );
 	    }
 
@@ -695,7 +695,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 	    {
                setSelected( cur, true );
                setActiveMultiSelectItem( at );
-               changed = TRUE;
+               changed = true;
                rr = rr.unite( itemRect( cur ) );
 	    }
 	 }
@@ -703,7 +703,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 	 {
             if ( cur->isSelected() )
 	    {
-               changed = TRUE;
+               changed = true;
               rr = rr.unite( itemRect( cur ) );
 	    }
 
@@ -762,15 +762,15 @@ void KonqBaseListViewWidget::slotAutoScroll()
       {
          m_scrollTimer = new TQTimer( this );
 
-         connect( m_scrollTimer, TQT_SIGNAL( timeout() ),
-                  this, TQT_SLOT( slotAutoScroll() ) );
+         connect( m_scrollTimer, TQ_SIGNAL( timeout() ),
+                  this, TQ_SLOT( slotAutoScroll() ) );
          m_scrollTimer->start( 100, false );
       }
    }
    else if ( m_scrollTimer )
    {
-      disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ),
-                  this, TQT_SLOT( slotAutoScroll() ) );
+      disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ),
+                  this, TQ_SLOT( slotAutoScroll() ) );
       m_scrollTimer->stop();
       delete m_scrollTimer;
       m_scrollTimer = 0;
@@ -1563,7 +1563,7 @@ void KonqBaseListViewWidget::slotUpdateBackground()
       if ( !m_backgroundTimer )
       {
          m_backgroundTimer = new TQTimer( this );
-         connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) );
+         connect( m_backgroundTimer, TQ_SIGNAL( timeout() ), viewport(), TQ_SLOT( update() ) );
       }
       else
          m_backgroundTimer->stop();
diff --git a/konqueror/listview/konq_textviewwidget.cpp b/konqueror/listview/konq_textviewwidget.cpp
index d814d2fbc..0bf67cf81 100644
--- a/konqueror/listview/konq_textviewwidget.cpp
+++ b/konqueror/listview/konq_textviewwidget.cpp
@@ -40,7 +40,7 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi
    // I know, but I want to have it this way and I use it all the time.
    // If I want to have free space, I disable some columns.
    // If people don't like it, they can use a different view type. Alex
-   setAllColumnsShowFocus(TRUE);
+   setAllColumnsShowFocus(true);
    setRootIsDecorated(false);
 
    colors[KTVI_REGULAR]=TQt::black;
@@ -55,7 +55,7 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi
    colors[KTVI_CHARDEV]=TQt::blue;
    colors[KTVI_BLOCKDEV]=TQt::blue;
 
-   m_showIcons=FALSE;
+   m_showIcons=false;
 }
 
 KonqTextViewWidget::~KonqTextViewWidget()
diff --git a/konqueror/listview/konq_treeviewwidget.cpp b/konqueror/listview/konq_treeviewwidget.cpp
index 77adc4b61..02c297c88 100644
--- a/konqueror/listview/konq_treeviewwidget.cpp
+++ b/konqueror/listview/konq_treeviewwidget.cpp
@@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWi
    setRootIsDecorated( true );
    setTreeStepSize( 20 );
 
-   connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
-            this, TQT_SLOT( slotCompleted( const KURL & ) ) );
-   connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ),
-            this, TQT_SLOT( slotClear( const KURL & ) ) );
-   connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
-            this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+   connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ),
+            this, TQ_SLOT( slotCompleted( const KURL & ) ) );
+   connect( m_dirLister, TQ_SIGNAL( clear( const KURL & ) ),
+            this, TQ_SLOT( slotClear( const KURL & ) ) );
+   connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ),
+            this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
 }
 
 KonqTreeViewWidget::~KonqTreeViewWidget()
diff --git a/konqueror/pics/tiles/CMakeLists.txt b/konqueror/pics/tiles/CMakeLists.txt
index e6ffc586d..471d92173 100644
--- a/konqueror/pics/tiles/CMakeLists.txt
+++ b/konqueror/pics/tiles/CMakeLists.txt
@@ -10,6 +10,6 @@
 #################################################
 
 install( FILES
-    bluemorning.png canvas.png kde4ever.png
+    bluemorning.png canvas.png trinity4ever.png
     kenwimer.png noise.png paper_flieder.png redfiber.png
   DESTINATION ${DATA_INSTALL_DIR}/konqueror/tiles )
diff --git a/konqueror/pics/tiles/Makefile.am b/konqueror/pics/tiles/Makefile.am
index 013770f95..ac5a71331 100644
--- a/konqueror/pics/tiles/Makefile.am
+++ b/konqueror/pics/tiles/Makefile.am
@@ -1,3 +1,3 @@
 tilesdir = $(kde_datadir)/konqueror/tiles
-tiles_DATA = bluemorning.png canvas.png kde4ever.png \
+tiles_DATA = bluemorning.png canvas.png trinity4ever.png \
              kenwimer.png noise.png paper_flieder.png redfiber.png
diff --git a/konqueror/pics/tiles/kde4ever.png b/konqueror/pics/tiles/kde4ever.png
deleted file mode 100644
index 7386433a9..000000000
--- a/konqueror/pics/tiles/kde4ever.png
+++ /dev/null
diff --git a/konqueror/pics/tiles/trinity4ever.png b/konqueror/pics/tiles/trinity4ever.png
new file mode 100755
index 000000000..5a9e84e6e
--- /dev/null
+++ b/konqueror/pics/tiles/trinity4ever.png
diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp
index 5d87a8b07..4b9e375d7 100644
--- a/konqueror/preloader/preloader.cpp
+++ b/konqueror/preloader/preloader.cpp
@@ -30,10 +30,10 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj )
     : KDEDModule( obj )
     {
     reconfigure();
-    connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )),
-        TQT_SLOT( appRemoved( const TQCString& )));
-    connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()),
-	TQT_SLOT( checkAlwaysPreloaded()));
+    connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
+        TQ_SLOT( appRemoved( const TQCString& )));
+    connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()),
+	TQ_SLOT( checkAlwaysPreloaded()));
     }
 
 KonqyPreloader::~KonqyPreloader()
@@ -109,7 +109,7 @@ void KonqyPreloader::updateCount()
 	{
 	if( !check_always_preloaded_timer.isActive())
 	    {
-	    if( kapp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
+	    if( tdeApp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
 		TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
 		{
 		kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
@@ -143,7 +143,7 @@ void KonqyPreloader::unloadAllPreloaded()
     }
     
 extern "C"
-KDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj )
+TDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj )
     {
     return new KonqyPreloader( obj );
     }
diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop
index d3977c74c..2de229109 100644
--- a/konqueror/profile_kde_devel.desktop
+++ b/konqueror/profile_kde_devel.desktop
@@ -10,14 +10,14 @@ ViewT0_PassiveMode=false
 ViewT0_ServiceName=tdehtml
 ViewT0_ServiceType=text/html
 ViewT0_ToggleView=false
-ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/tdelibs/html/main.html
+ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/tdelibs/
 ViewT1_LinkedView=false
 ViewT1_LockedLocation=false
 ViewT1_PassiveMode=false
 ViewT1_ServiceName=tdehtml
 ViewT1_ServiceType=text/html
 ViewT1_ToggleView=false
-ViewT1_URL=http://www.trinitydesktop.org/docs/qt3/index-2.html
+ViewT1_URL=http://www.trinitydesktop.org/docs/qt3/
 ViewT2_LinkedView=false
 ViewT2_LockedLocation=false
 ViewT2_PassiveMode=false
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 913444098..c44aaa342 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -50,16 +50,16 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent,
 {
   m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset",
 			   actionCollection(), "changeremoteencoding");
-  connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()),
-	  this, TQT_SLOT(slotAboutToShow()));
+  connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()),
+	  this, TQ_SLOT(slotAboutToShow()));
   m_menu->setEnabled(false);
   m_menu->setDelayed(false);
 
   m_part = dynamic_cast<KonqDirPart*>(parent);
   if (m_part)
     // if parent is not a KonqDirPart, our menu will never show
-    TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()),
-		     this, TQT_SLOT(slotAboutToOpenURL()));
+    TQObject::connect(m_part, TQ_SIGNAL(aboutToOpenURL()),
+		     this, TQ_SLOT(slotAboutToOpenURL()));
 }
 
 KRemoteEncodingPlugin::~KRemoteEncodingPlugin()
@@ -117,11 +117,11 @@ KRemoteEncodingPlugin::fillMenu()
   TQStringList::ConstIterator it;
   int count = 0;
   for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it)
-    menu->insertItem(*it, this, TQT_SLOT(slotItemSelected(int)), 0, ++count);
+    menu->insertItem(*it, this, TQ_SLOT(slotItemSelected(int)), 0, ++count);
   menu->insertSeparator();
 
-  menu->insertItem(i18n("Reload"), this, TQT_SLOT(slotReload()), 0, ++count);
-  menu->insertItem(i18n("Default"), this, TQT_SLOT(slotDefault()), 0, ++count);
+  menu->insertItem(i18n("Reload"), this, TQ_SLOT(slotReload()), 0, ++count);
+  menu->insertItem(i18n("Default"), this, TQ_SLOT(slotDefault()), 0, ++count);
   m_idDefault = count;
 }
 
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index b4ea0cb5d..80c854fcf 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.cpp
+++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp
@@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString&
 
    m_shell->setFocus();
 
-   connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished()));
-   connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton()));
-   connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()));
+   connect(cancelButton, TQ_SIGNAL(clicked()), m_shell, TQ_SLOT(slotFinished()));
+   connect(m_shell, TQ_SIGNAL(finished()), this, TQ_SLOT(disableStopButton()));
+   connect(closeButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()));
 }
 
 KShellCommandDialog::~KShellCommandDialog()
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index e5e8dabe4..d4d6f45f9 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -84,11 +84,11 @@ int KShellCommandExecutor::exec()
       return 0;
    }
 
-   m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, TQT_TQOBJECT(this));
-   m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, TQT_TQOBJECT(this));
+   m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this);
+   m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this);
    m_writeNotifier->setEnabled(false);
-   connect (m_readNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(readDataFromShell()));
-   connect (m_writeNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(writeDataToShell()));
+   connect (m_readNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(readDataFromShell()));
+   connect (m_writeNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(writeDataToShell()));
 
    return 1;
 }
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 407d6f297..6245c2bd9 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -20,7 +20,7 @@
 #include <kinputdialog.h>
 #include <tdemessagebox.h>
 #include <konq_dirpart.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeapplication.h>
 #include "kshellcmddialog.h"
 #include <kgenericfactory.h>
@@ -30,11 +30,11 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
 	                          const TQStringList & )
     : KParts::Plugin( parent, name )
 {
-    if (!kapp->authorize("shell_access"))
+    if (!tdeApp->authorize("shell_access"))
        return;
 
     new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this,
-                 TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" );
+                 TQ_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" );
 }
 
 void KShellCmdPlugin::slotExecuteShellCommand()
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index bfff3c8e7..7be580b8b 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -32,13 +32,13 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
 	// this should be your custom internal widget
 	m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
 	m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
-	connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)),
-		this, TQT_SIGNAL(started(TDEIO::Job*)));
-	connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
-	connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
-		m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
-        TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget));
-	setWidget(TQT_TQWIDGET(m_widget));
+	connect(m_widget,TQ_SIGNAL(started(TDEIO::Job *)),
+		this, TQ_SIGNAL(started(TDEIO::Job*)));
+	connect(m_widget,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed()));
+	connect(m_extension, TQ_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
+		m_widget, TQ_SLOT(addWebSideBar(const KURL&, const TQString&)));
+        TDEAcceleratorManager::setNoAccel(m_widget);
+	setWidget(m_widget);
 }
 
 TDEInstance *KonqSidebar::getInstance()
@@ -79,7 +79,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev)
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 TDEInstance*  KonqSidebarFactory::s_instance = 0L;
 TDEAboutData* KonqSidebarFactory::s_about = 0L;
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 367e7324d..7941fb1c9 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -30,7 +30,7 @@
 
 class KonqSidebarPluginPrivate;
 
-class KDE_EXPORT KonqSidebarPlugin : public TQObject
+class TDE_EXPORT KonqSidebarPlugin : public TQObject
 {
 	TQ_OBJECT
 	public:
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 2e741b2f9..94734851c 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -25,11 +25,11 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 #include <tqstringlist.h>
-#include <tqucomextra_p.h>
+#include <private/tqucomextra_p.h>
 
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
@@ -39,11 +39,11 @@
 #include <tdefileitem.h>
 #include <tdeio/netaccess.h>
 #include <tdepopupmenu.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kurlrequesterdlg.h>
 #include <kinputdialog.h>
 #include <tdefiledialog.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdeapplication.h>
 #include "konqsidebar.h"
 
@@ -60,8 +60,8 @@ addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu,
 	m_universal=universal;
 	m_currentProfile = currentProfile;
 	menu = addmenu;
-	connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu()));
-	connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int)));
+	connect(menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(aboutToShowAddMenu()));
+	connect(menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activatedAddMenu(int)));
 }
 
 void addBackEnd::aboutToShowAddMenu()
@@ -88,9 +88,9 @@ void addBackEnd::aboutToShowAddMenu()
 
 	for (TQStringList::Iterator it = list.begin(); it != list.end(); ++it, i++ )
 	{
-		KDesktopFile *confFile;
+		TDEDesktopFile *confFile;
 
-		confFile = new KDesktopFile(*it, true);
+		confFile = new TDEDesktopFile(*it, true);
 		if (! confFile->tryExec()) {
 			delete confFile;
 			i--;
@@ -211,7 +211,7 @@ void addBackEnd::activatedAddMenu(int id)
 				if (!myFile.isEmpty())
 				{
 					kdDebug() <<"trying to save to file: "<<myFile << endl;
-					KSimpleConfig scf(myFile,false);
+					TDESimpleConfig scf(myFile,false);
 					scf.setGroup("Desktop Entry");
 					for (TQMap<TQString,TQString>::ConstIterator it = map.begin(); it != map.end(); ++it) {
 						kdDebug() <<"writing:"<<it.key()<<" / "<<it.data()<<endl;
@@ -268,7 +268,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
 	if (splitterWidget) {
 		splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint);
 		splitterWidget->setOpaqueResize( false );
-		connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter()));
+		connect(splitterWidget,TQ_SIGNAL(setRubberbandCalled()),TQ_SLOT(userMovedSplitter()));
 	}
 		
 	m_area = new KDockArea(this);
@@ -292,22 +292,22 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
 	if (!m_universalMode) {
 		m_menu->insertItem(SmallIconSet("remove"),
                                    i18n("Close Navigation Panel"),
-				par, TQT_SLOT(deleteLater()));
+				par, TQ_SLOT(deleteLater()));
 	}
-        connect(m_menu, TQT_SIGNAL(aboutToShow()),
-		this, TQT_SLOT(aboutToShowConfigMenu()));
-	connect(m_menu, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(activatedMenu(int)));
+        connect(m_menu, TQ_SIGNAL(aboutToShow()),
+		this, TQ_SLOT(aboutToShowConfigMenu()));
+	connect(m_menu, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(activatedMenu(int)));
 
 	m_buttonPopup = 0;
 	addBackEnd *ab = new addBackEnd(this, addMenu, universalMode,
                                         currentProfile,
                                         "Sidebar_Widget-addBackEnd");
 
-	connect(ab, TQT_SIGNAL(updateNeeded()),
-		this, TQT_SLOT(updateButtons()));
-	connect(ab, TQT_SIGNAL(initialCopyNeeded()),
-		this, TQT_SLOT(finishRollBack()));
+	connect(ab, TQ_SIGNAL(updateNeeded()),
+		this, TQ_SLOT(updateButtons()));
+	connect(ab, TQ_SIGNAL(initialCopyNeeded()),
+		this, TQ_SLOT(finishRollBack()));
 
 	initialCopy();
 
@@ -327,13 +327,13 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
         m_menu->setItemVisible(2, !m_immutableShowTabsLeft);
         m_menu->setItemVisible(3, !m_immutableShowExtraButtons);
 
-	connect(&m_configTimer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(saveConfig()));
+	connect(&m_configTimer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(saveConfig()));
 	m_somethingVisible = !m_openViews.isEmpty();
 	doLayout();
-	TQTimer::singleShot(0,this,TQT_SLOT(createButtons()));
-	connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
-		this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*)));
+	TQTimer::singleShot(0,this,TQ_SLOT(createButtons()));
+	connect(m_area, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
+		this, TQ_SLOT(dockWidgetHasUndocked(KDockWidget*)));
 }
 
 void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
@@ -349,7 +349,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 	// Go through list to see which ones exist.  Check them for the URL
 	TQStringList files = TQDir(list).entryList("websidebarplugin*.desktop");
 	for (TQStringList::Iterator it = files.begin(); it != files.end(); ++it){
-		KSimpleConfig scf(list + *it, false);
+		TDESimpleConfig scf(list + *it, false);
 		scf.setGroup("Desktop Entry");
 		if (scf.readPathEntry("URL", TQString::null) == url.url()) {
 			// We already have this one!
@@ -363,7 +363,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 	TQString myFile = findFileName(&tmpl,m_universalMode,m_currentProfile);
 
 	if (!myFile.isEmpty()) {
-		KSimpleConfig scf(myFile, false);
+		TDESimpleConfig scf(myFile, false);
 		scf.setGroup("Desktop Entry");
 		scf.writeEntry("Type", "Link");
 		scf.writePathEntry("URL", url.url());
@@ -373,7 +373,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 		scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web");
 		scf.sync();
 
-		TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+		TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 	}
 }
 
@@ -382,7 +382,7 @@ void Sidebar_Widget::finishRollBack()
 {
 	m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true);
         initialCopy();
-        TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+        TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 }
 
 
@@ -438,7 +438,7 @@ void Sidebar_Widget::initialCopy()
 		return; //oups;
 
 	int nVersion=-1;
-	KSimpleConfig lcfg(m_path+".version");
+	TDESimpleConfig lcfg(m_path+".version");
 	int lVersion=lcfg.readNumEntry("Version",0);
 
 
@@ -451,7 +451,7 @@ void Sidebar_Widget::initialCopy()
 
 	        if ( !dirtree_dir.isEmpty() && dirtree_dir != m_path )
         	{
-			KSimpleConfig gcfg(dirtree_dir+".version");
+			TDESimpleConfig gcfg(dirtree_dir+".version");
 			int gversion = gcfg.readNumEntry("Version", 1);
 			nVersion=(nVersion>gversion)?nVersion:gversion;
 			if (lVersion >= gversion)
@@ -504,11 +504,11 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 			kdDebug()<<"New Icon Name:"<<iconname<<endl;
 			if (!iconname.isEmpty())
 			{
-				KSimpleConfig ksc(m_path+m_currentButton->file);
+				TDESimpleConfig ksc(m_path+m_currentButton->file);
 				ksc.setGroup("Desktop Entry");
 				ksc.writeEntry("Icon",iconname);
 				ksc.sync();
-			        TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+			        TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -518,7 +518,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
                         dlg->fileDialog()->setMode( KFile::Directory );
 			if (dlg->exec())
 			{
-				KSimpleConfig ksc(m_path+m_currentButton->file);
+				TDESimpleConfig ksc(m_path+m_currentButton->file);
 				ksc.setGroup("Desktop Entry");
                                 if ( !dlg->selectedURL().isValid())
                                 {
@@ -531,7 +531,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
                                     //ksc.writeEntry("Name",newurl);
                                     ksc.writePathEntry("URL",newurl);
                                     ksc.sync();
-                                    TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+                                    TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
                                 }
 			}
                         delete dlg;
@@ -545,7 +545,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				TQFile f(m_path+m_currentButton->file);
 				if (!f.remove())
 					tqDebug("Error, file not deleted");
-				TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+				TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -560,13 +560,13 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 			if(ok)
 			{
 				// Write the name in the .desktop file of this side button.
-				KSimpleConfig ksc(m_path+m_currentButton->file);
+				TDESimpleConfig ksc(m_path+m_currentButton->file);
 				ksc.setGroup("Desktop Entry");
 				ksc.writeEntry("Name", name, true, false, true /*localized*/ );
 				ksc.sync();
 				
 				// Update the buttons with a TQTimer (why?)
-				TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+				TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -815,11 +815,11 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 	int lastbtn = m_buttons.count();
 	m_buttons.resize(m_buttons.size()+1);
 
-  	KSimpleConfig *confFile;
+  	TDESimpleConfig *confFile;
 
 	kdDebug() << "addButton:" << (m_path+desktoppath) << endl;
 
-	confFile = new KSimpleConfig(m_path+desktoppath,true);
+	confFile = new TDESimpleConfig(m_path+desktoppath,true);
 	confFile->setGroup("Desktop Entry");
 
     	TQString icon = confFile->readEntry("Icon");
@@ -834,11 +834,11 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 	{
 	  	m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name);
 		ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name,
-						icon, TQT_TQOBJECT(this));
+						icon, this);
 		/*int id=*/m_buttons.insert(lastbtn, bi);
 		KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
 		tab->installEventFilter(this);
-		connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int)));
+		connect(tab,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(showHidePage(int)));
 
 		// Set Whats This help
 		// This uses the comments in the .desktop files
@@ -852,7 +852,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 
 bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 {
-	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
+	if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) {
 		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton)
 		{
 			KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
@@ -882,8 +882,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 						m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3);
 						m_buttonPopup->insertSeparator();
 						m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4);
-						connect(m_buttonPopup, TQT_SIGNAL(activated(int)),
-							this, TQT_SLOT(buttonPopupActivate(int)));
+						connect(m_buttonPopup, TQ_SIGNAL(activated(int)),
+							this, TQ_SLOT(buttonPopupActivate(int)));
 					}
 					m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty());
 						m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName),
@@ -901,7 +901,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 
 void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
 {
-	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
+	if ( tdeApp->authorize( "action/konqsidebarmenu" ) ) {
 		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) {
 			m_menu->exec(TQCursor::pos());
 		}
@@ -943,8 +943,8 @@ KParts::BrowserExtension *Sidebar_Widget::getExtension()
 bool Sidebar_Widget::createView( ButtonInfo *data)
 {
 	bool ret = true;
-	KSimpleConfig *confFile;
-	confFile = new KSimpleConfig(data->file,true);
+	TDESimpleConfig *confFile;
+	confFile = new TDESimpleConfig(data->file,true);
 	confFile->setGroup("Desktop Entry");
 
 	data->dock = m_area->createDockWidget(confFile->readEntry("Name",i18n("Unknown")),0);
@@ -961,11 +961,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data)
 		KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/);
 		data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom);
 		connectModule(data->module);
-		connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)),
-			data->module, TQT_SLOT(openPreview(const KFileItemList&)));
+		connect(this, TQ_SIGNAL(fileSelection(const KFileItemList&)),
+			data->module, TQ_SLOT(openPreview(const KFileItemList&)));
 
-		connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)),
-			data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&)));
+		connect(this, TQ_SIGNAL(fileMouseOver(const KFileItem&)),
+			data->module, TQ_SLOT(openPreviewOnMouseOver(const KFileItem&)));
 	}
 
 	delete confFile;
@@ -998,14 +998,14 @@ void Sidebar_Widget::showHidePage(int page)
 			m_buttonBar->setTab(page,true);
 
 			connect(info->module,
-				TQT_SIGNAL(setIcon(const TQString&)),
+				TQ_SIGNAL(setIcon(const TQString&)),
 				m_buttonBar->tab(page),
-				TQT_SLOT(setIcon(const TQString&)));
+				TQ_SLOT(setIcon(const TQString&)));
 
 			connect(info->module,
-				TQT_SIGNAL(setCaption(const TQString&)),
+				TQ_SIGNAL(setCaption(const TQString&)),
 				m_buttonBar->tab(page),
-				TQT_SLOT(setText(const TQString&)));
+				TQ_SLOT(setText(const TQString&)));
 
 			if (m_singleWidgetMode)
 			{
@@ -1217,51 +1217,51 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
 void Sidebar_Widget::connectModule(TQObject *mod)
 {
 	if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) {
-		connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*)));
+		connect(mod,TQ_SIGNAL(started(TDEIO::Job *)),this, TQ_SIGNAL(started(TDEIO::Job*)));
 	}
 
 	if (mod->metaObject()->findSignal("completed()") != -1) {
-		connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
+		connect(mod,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed()));
 	}
 
 	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
-			const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
+		connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &,
+			const TQString &, mode_t)),this,TQ_SLOT(popupMenu( const
 			TQPoint &, const KURL&, const TQString &, mode_t)));
 	}
 
 	if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
+		connect(mod,TQ_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)),this,
-			TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
+			TQ_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)));
 	}
 
 	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
-			this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
+		connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+			this,TQ_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
 	}
 
 	if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
-		connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+		connect(mod,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
 	}
 
 	if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
 		connect(mod,
-			TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+			TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 			this,
-			TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
+			TQ_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
 	}
 
 	if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
-		connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
-			this,TQT_SLOT(enableAction(const char *, bool)));
+		connect(mod,TQ_SIGNAL(enableAction( const char *, bool)),
+			this,TQ_SLOT(enableAction(const char *, bool)));
 	}
 
 	if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
-		connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
+		connect(mod,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
 	}
 }
 
@@ -1323,7 +1323,7 @@ TQSplitter *Sidebar_Widget::splitter() const
 	TQObject *p = parent();
 	if (!p) return 0;
 	p = p->parent();
-	return static_cast<TQSplitter*>(TQT_TQWIDGET(p));
+	return static_cast<TQSplitter*>(p);
 }
 
 void Sidebar_Widget::userMovedSplitter()
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index 391db5101..7e31004ad 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -93,7 +93,7 @@ private:
 	TQWidget *m_parent;
 };
 
-class KDE_EXPORT Sidebar_Widget: public TQWidget
+class TDE_EXPORT Sidebar_Widget: public TQWidget
 {
 	TQ_OBJECT
 public:
diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp
index 2032fe202..7e1145854 100644
--- a/konqueror/sidebar/test/konqsidebartest.cpp
+++ b/konqueror/sidebar/test/konqsidebartest.cpp
@@ -15,11 +15,11 @@
  *                                                                         *
  ***************************************************************************/
 #include "konqsidebartest.moc"
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 extern "C"
 {
-    KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+    TDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
         return new SidebarTest(instance,par,widp,desktopname,name);
     }
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 208fe2ee6..5e9b29236 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
     formats << "text/uri-list" << "application/x-xbel" << "text/plain";
     tree()->setDropFormats(formats);
 
-    connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
-            this,   TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
-    connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
-            this,   TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
+            this,   TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
+            this,   TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
 
-    connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)),
-            this,   TQT_SLOT(slotOpenChange(TQListViewItem*)));
-    connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)),
-            this,   TQT_SLOT(slotOpenChange(TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)),
+            this,   TQ_SLOT(slotOpenChange(TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)),
+            this,   TQ_SLOT(slotOpenChange(TQListViewItem*)));
 
     m_collection = new TDEActionCollection( this, "bookmark actions" );
     (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this,
-                        TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
+                        TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder");
     (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
-                        TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
+                        TQ_SLOT( slotDelete() ), m_collection, "delete_folder");
     (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this,
-                        TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
+                        TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark");
     (void) new TDEAction( i18n("Properties"), "edit", 0, this,
-                        TQT_SLOT( slotProperties() ), m_collection, "item_properties");
+                        TQ_SLOT( slotProperties() ), m_collection, "item_properties");
     (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
-                        TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+                        TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
     (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
-                        TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
+                        TQ_SLOT( slotOpenTab() ), m_collection, "open_tab");
     (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
-                        TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
+                        TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
     (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
-                        TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
+                        TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location");
 
-    KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
+    KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ),
 			       m_collection, "edit_bookmarks" );
 
-    connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &) ) );
+    connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &) ) );
 }
 
 KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule()
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
     else
 	return;
 
-    DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+    DCOPRef ref(tdeApp->dcopClient()->appId(), tree()->topLevelWidget()->name());
 
     if (bookmark.isGroup()) {
         KBookmarkGroup group = bookmark.toGroup();
@@ -412,9 +412,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
 
     if ( !bookmark.isGroup() )
     {
-        kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+        tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
                                     TQClipboard::Selection );
-        kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
+        tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
                                     TQClipboard::Clipboard );
     }
 }
@@ -574,7 +574,7 @@ TQString BookmarkEditDialog::finalTitle() const
 
 extern "C"
 {
-   KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool)
+   TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool)
 	{
 		return new KonqSidebarBookmarkModule(par);
 	} 
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 8368d4d37..56f77ba40 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -113,7 +113,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup
     if (m_fileItem->isLink())
     {
         TQFont f( _painter->font() );
-        f.setItalic( TRUE );
+        f.setItalic( true );
         _painter->setFont( f );
     }
     TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index b1b6d0563..487bbf4dd 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -22,7 +22,7 @@
 #include "dirtree_item.h"
 #include <kdebug.h>
 #include <kprotocolinfo.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdirlister.h>
@@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule()
     // KDirLister may still emit canceled while being deleted.
     if (m_dirLister)
     {
-       disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
-                   this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
+       disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ),
+                   this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
        delete m_dirLister;
     }
 }
@@ -76,7 +76,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
     if(m_topLevelItem) // We can handle only one at a time !
         kdError() << "KonqSidebarDirTreeModule::addTopLevelItem: Impossible, we can have only one toplevel item !" << endl;
 
-    KDesktopFile cfg( item->path(), true );
+    TDEDesktopFile cfg( item->path(), true );
     cfg.setDollarExpansion(true);
 
     KURL targetURL;
@@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
 //	mimetypes<<TQString("inode/directory");
 //	m_dirLister->setMimeFilter(mimetypes);
 
-        connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-                 this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
-                 this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-                 this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-        connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
-                 this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
-                 this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
-                 this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+                 this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ),
+                 this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+                 this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+        connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ),
+                 this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ),
+                 this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ),
+                 this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
     }
 
 
@@ -624,7 +624,7 @@ void KonqSidebarDirTreeModule::followURL( const KURL & url )
 
 extern "C"
 {
-        KDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden)
+        TDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden)
 	{
 		return new KonqSidebarDirTreeModule(par,showHidden);
 	}
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 6f051a553..f941bd0f7 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
 	s_settings->readSettings( true );
     }
 
-    connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
+    connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() ));
 
     m_dict.setAutoDelete( true );
     m_currentTime = TQDateTime::currentDateTime();
@@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
 
     KonqHistoryManager *manager = KonqHistoryManager::kself();
 
-    connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() ));
-    connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() ));
+    connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() ));
+    connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() ));
 
-    connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
-	     TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
-    connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
-	     TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
+    connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
+	     TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
+    connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
+	     TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
 
-    connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )),
-	     TQT_SLOT( slotItemExpanded( TQListViewItem * )));
+    connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )),
+	     TQ_SLOT( slotItemExpanded( TQListViewItem * )));
 
     m_collection = new TDEActionCollection( this, "history actions" );
     (void) new TDEAction( i18n("New &Window"), "window-new", 0, this,
- 			TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
+ 			TQ_SLOT( slotNewWindow() ), m_collection, "open_new");
     (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this,
-			TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
+			TQ_SLOT( slotRemoveEntry() ), m_collection, "remove");
     (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this,
-			TQT_SLOT( slotClearHistory() ), m_collection, "clear");
+			TQ_SLOT( slotClearHistory() ), m_collection, "clear");
     (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this,
-			TQT_SLOT( slotPreferences()), m_collection, "preferences");
+			TQ_SLOT( slotPreferences()), m_collection, "preferences");
 
     TDERadioAction *sort;
     sort = new TDERadioAction( i18n("By &Name"), 0, this,
-			     TQT_SLOT( slotSortByName() ), m_collection, "byName");
+			     TQ_SLOT( slotSortByName() ), m_collection, "byName");
     sort->setExclusiveGroup("SortGroup");
     sort->setChecked( m_sortsByName );
 
     sort = new TDERadioAction( i18n("By &Date"), 0, this,
-			     TQT_SLOT( slotSortByDate() ), m_collection, "byDate");
+			     TQ_SLOT( slotSortByDate() ), m_collection, "byDate");
     sort->setExclusiveGroup("SortGroup");
     sort->setChecked( !m_sortsByName );
 
@@ -358,7 +358,7 @@ void KonqSidebarHistoryModule::slotClearHistory()
 
 extern "C"
 {
-	KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool)
+	TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool)
 	{
 		return new KonqSidebarHistoryModule(par);
 	}
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index eb1621ae9..951dce28b 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -98,7 +98,7 @@ void KonqSidebarHistorySettings::applySettings()
     delete config;
 
     // notify konqueror instances about the new configuration
-    kapp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqSidebarHistorySettings",
 			      "notifySettingsChanged()", TQByteArray() );
 }
 
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 70e42e113..056d0deb7 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name,
     dialog->comboOlder->insertItem( i18n("Days"),
                                     KonqSidebarHistorySettings::DAYS );
 
-    connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
-	     dialog->spinExpire, TQT_SLOT( setEnabled( bool )));
-    connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )),
-	     this, TQT_SLOT( slotExpireChanged( int )));
-
-    connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )),
-	     TQT_SLOT( slotNewerChanged( int )));
-    connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )),
-	     TQT_SLOT( slotOlderChanged( int )));
-
-    connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotGetFontNewer() ));
-    connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotGetFontOlder() ));
-    connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotClearHistory() ));
-
-    connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->comboNewer, TQT_SIGNAL( activated( int )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->comboOlder, TQT_SIGNAL( activated( int )),
-             TQT_SLOT( configChanged() ));
+    connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )),
+	     dialog->spinExpire, TQ_SLOT( setEnabled( bool )));
+    connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )),
+	     this, TQ_SLOT( slotExpireChanged( int )));
+
+    connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )),
+	     TQ_SLOT( slotNewerChanged( int )));
+    connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )),
+	     TQ_SLOT( slotOlderChanged( int )));
+
+    connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotGetFontNewer() ));
+    connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotGetFontOlder() ));
+    connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotClearHistory() ));
+
+    connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->comboNewer, TQ_SIGNAL( activated( int )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->comboOlder, TQ_SIGNAL( activated( int )),
+             TQ_SLOT( configChanged() ));
 
     dialog->show();
     topLayout->add(dialog);
@@ -155,13 +155,13 @@ void HistorySidebarConfig::save()
     TQByteArray dataAge;
     TQDataStream streamAge( dataAge, IO_WriteOnly );
     streamAge << age << "foo";
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxAge(TQ_UINT32, TQCString)", dataAge );
 
     TQByteArray dataCount;
     TQDataStream streamCount( dataCount, IO_WriteOnly );
     streamCount << count << "foo";
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxCount(TQ_UINT32, TQCString)", dataCount );
 
     m_settings->m_valueYoungerThan = dialog->spinNewer->value();
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index aa318826a..9132d531b 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -33,17 +33,17 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdirnotify_stub.h>
 #include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <kmimetype.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurldrag.h>
 
 #include <stdlib.h>
@@ -93,7 +93,7 @@ void KonqSidebarTree::loadModuleFactories()
 
   for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
   {
-    KSimpleConfig ksc(*it);
+    TDESimpleConfig ksc(*it);
     ksc.setGroup("Desktop Entry");
     TQString name    = ksc.readEntry("X-TDE-TreeModule");
     TQString libName = ksc.readEntry("X-TDE-TreeModule-Lib");
@@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
     m_part = parent;
 
     m_animationTimer = new TQTimer( this );
-    connect( m_animationTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAnimation() ) );
+    connect( m_animationTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAnimation() ) );
 
     m_currentBeforeDropItem = 0;
     m_dropItem = 0;
@@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
     setTreeStepSize(15);
 
     m_autoOpenTimer = new TQTimer( this );
-    connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAutoOpenFolder() ) );
-
-    connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-             this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-             this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
-    connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
-	     this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
-    connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-             this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
-
-    connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
-             this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
+    connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAutoOpenFolder() ) );
+
+    connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+             this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+             this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
+    connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
+	     this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
+    connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+             this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
+
+    connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
+             this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
 
 /*    assert( m_part->getInterfaces()->getInstance()->dirs );
     TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
@@ -390,7 +390,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
        TQString filename = findUniqueFilename(path, name);
        destUrl.setPath(filename);
 
-       KDesktopFile cfg(filename);
+       TDEDesktopFile cfg(filename);
        cfg.writeEntry("Encoding", "UTF-8");
        cfg.writeEntry("Type","Link");
        cfg.writeEntry("URL", url.url());
@@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir )
     kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl;
     if ( m_dirtreeDir.dir.isParentOf( dir ) )
         // We use a timer in case of DCOP re-entrance..
-        TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) );
 }
 
 void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
@@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
         //kdDebug(1201) <<  "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl;
         if ( m_dirtreeDir.dir.isParentOf( *it ) )
         {
-            TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
+            TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) );
             kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl;
             return;
         }
@@ -610,7 +610,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
 				// Version 7 includes update of network places
 				const int currentVersion = 7;
 				TQString key = TQString::fromLatin1("X-TDE-DirTreeVersionNumber");
-				KSimpleConfig versionCfg( path + "/.directory" );
+				TDESimpleConfig versionCfg( path + "/.directory" );
 				int versionNumber = versionCfg.readNumEntry( key, 0 );
 				kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
 				if ( versionNumber < currentVersion )
@@ -720,7 +720,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt
     if ( TQFile::exists( dotDirectoryFile ) )
     {
         kdDebug(1201) << "Reading the .directory" << endl;
-        KSimpleConfig cfg( dotDirectoryFile, true );
+        TDESimpleConfig cfg( dotDirectoryFile, true );
         cfg.setDesktopGroup();
         name = cfg.readEntry( "Name", name );
         icon = cfg.readEntry( "Icon", icon );
@@ -755,7 +755,7 @@ void KonqSidebarTree::loadTopLevelGroup( KonqSidebarTreeItem *parent, const TQSt
 
 void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent,  const TQString &filename )
 {
-    KDesktopFile cfg( filename, true );
+    TDEDesktopFile cfg( filename, true );
     cfg.setDollarExpansion(true);
 
     TQFileInfo inf( filename );
@@ -883,7 +883,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
 bool KonqSidebarTree::tabSupport()
 {
     // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror)
-   DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+   DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name());
     DCOPReply reply = ref.call("functions()");
     if (reply.isValid()) {
         QCStringList funcs;
@@ -908,22 +908,22 @@ void KonqSidebarTree::showToplevelContextMenu()
     if (!m_collection)
     {
         m_collection = new TDEActionCollection( this, "bookmark actions" );
-        (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
-        (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
-        (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotRename() ), m_collection, "rename");
-        (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotDelete() ), m_collection, "delete_link");
-        (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotProperties() ), m_collection, "item_properties");
-        (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
-        (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
-        (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this),
-                            TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
+        (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this,
+                            TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder");
+        (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
+                            TQ_SLOT( slotDelete() ), m_collection, "delete_folder");
+        (void) new TDEAction( i18n("Rename"), 0, this,
+                            TQ_SLOT( slotRename() ), m_collection, "rename");
+        (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this,
+                            TQ_SLOT( slotDelete() ), m_collection, "delete_link");
+        (void) new TDEAction( i18n("Properties"), "edit", 0, this,
+                            TQ_SLOT( slotProperties() ), m_collection, "item_properties");
+        (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
+                            TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+        (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
+                            TQ_SLOT( slotOpenTab() ), m_collection, "open_tab");
+        (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
+                            TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location");
     }
 
     TQPopupMenu *menu = new TQPopupMenu;
@@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
 void KonqSidebarTree::slotOpenTab()
 {
     if (!m_currentTopLevelItem) return;
-    DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+    DCOPRef ref(tdeApp->dcopClient()->appId(), topLevelWidget()->name());
     ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
 }
 
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
 {
     if (!m_currentTopLevelItem) return;
     KURL url = m_currentTopLevelItem->externalURL();
-    kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
-    kapp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
+    tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
+    tdeApp->clipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
 }
 
 ///////////////////////////////////////////////////////////////////
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 0ba22363f..bafcb973e 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -35,7 +35,7 @@ void KonqSidebarTreeTopLevelItem::init()
     TQString desktopFile = m_path;
     if ( isTopLevelGroup() )
         desktopFile += "/.directory";
-    KSimpleConfig cfg( desktopFile, true );
+    TDESimpleConfig cfg( desktopFile, true );
     cfg.setDesktopGroup();
     m_comment = cfg.readEntry( "Comment" );
 }
@@ -189,7 +189,7 @@ void KonqSidebarTreeTopLevelItem::rename( const TQString & name )
     TQString desktopFile = m_path;
     if ( isTopLevelGroup() )
         desktopFile += "/.directory";
-    KSimpleConfig cfg( desktopFile );
+    TDESimpleConfig cfg( desktopFile );
     cfg.setDesktopGroup();
     cfg.writeEntry( "Name", name );
     cfg.sync();
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 1903c2328..9baa24d1d 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -2,8 +2,8 @@
 #include "konqsidebar_tree.moc"
 #include "konq_sidebartree.h"
 #include <kdebug.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
 #include <tdelistviewsearchline.h>
@@ -17,7 +17,7 @@
 KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
                    KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
 	{
-		KSimpleConfig ksc(desktopName_);
+		TDESimpleConfig ksc(desktopName_);
 		ksc.setGroup("Desktop Entry");
 		int virt= ( (ksc.readEntry("X-TDE-TreeModule","")=="Virtual") ?VIRT_Folder:VIRT_Link);
 		if (virt==1) desktopName_=ksc.readEntry("X-TDE-RelURL","");
@@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg
 			TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline);
 			TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree);
 			slbl->setBuddy(listViewSearch);
-			connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
+			connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear()));
 		}
 		else
 			tree=new KonqSidebarTree(this,widget,virt,desktopName_);
 
-    		connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
+    		connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
 
-		connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
+		connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
 
-		connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
-			this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
+		connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
+			this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
 
-		connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
-			this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
+		connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+			this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
 
-		connect(tree,TQT_SIGNAL(enableAction( const char *, bool )),
-			this,TQT_SIGNAL(enableAction( const char *, bool)));
+		connect(tree,TQ_SIGNAL(enableAction( const char *, bool )),
+			this,TQ_SIGNAL(enableAction( const char *, bool)));
 
         }
 
@@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename()
 
 extern "C"
 {
-    KDE_EXPORT void*  create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+    TDE_EXPORT void*  create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
         return new KonqSidebar_Tree(inst,par,widp,desktopname,name);
     }
@@ -132,14 +132,14 @@ extern "C"
 
 extern "C"
 {
-   KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
+   TDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map)
    {
 	  TDEStandardDirs *dirs=TDEGlobal::dirs();
 	  TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
 	  TQStringList names;
 	  for (TQStringList::ConstIterator it=list.begin();it!=list.end();++it)
 	  {
-		KSimpleConfig sc(*it);
+		TDESimpleConfig sc(*it);
 		sc.setGroup("Desktop Entry");
 		names<<sc.readEntry("Name");
 	  }
@@ -150,7 +150,7 @@ extern "C"
 		{
 			int id=names.findIndex( item );
 			if (id==-1) return false;
-			KSimpleConfig ksc2(*list.at(id));
+			TDESimpleConfig ksc2(*list.at(id));
 			ksc2.setGroup("Desktop Entry");
 		        map->insert("Type","Link");
 			map->insert("Icon",ksc2.readEntry("Icon"));
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 44a94f02c..559f7bfeb 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -29,47 +29,47 @@
 #include <tdelocale.h>
 #include <konq_pixmapprovider.h>
 #include <tdeparts/browserextension.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
 	: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
 {
 	_htmlPart = new TDEHTMLSideBar(universalMode());
-	connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
-	connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
+	connect(_htmlPart, TQ_SIGNAL(reload()), this, TQ_SLOT(reload()));
+	connect(_htmlPart, TQ_SIGNAL(completed()), this, TQ_SLOT(pageLoaded()));
 	connect(_htmlPart,
-		TQT_SIGNAL(setWindowCaption(const TQString&)),
+		TQ_SIGNAL(setWindowCaption(const TQString&)),
 		this,
-		TQT_SLOT(setTitle(const TQString&)));
+		TQ_SLOT(setTitle(const TQString&)));
 	connect(_htmlPart,
-		TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
+		TQ_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
 		this,
-		TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
+		TQ_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart->browserExtension(),
-		TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+		TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
 		this,
-		TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
+		TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
 	connect(_htmlPart,
-		TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() ));
+		TQ_SIGNAL(setAutoReload()), this, TQ_SLOT( setAutoReload() ));
 	connect(_htmlPart,
-		TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
+		TQ_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
 		this,
-		TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
+		TQ_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart,
-		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+		TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 		this,
-		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
+		TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
 
 	_desktopName = desktopName;
 
-	KSimpleConfig ksc(_desktopName);
+	TDESimpleConfig ksc(_desktopName);
 	ksc.setGroup("Desktop Entry");
         reloadTimeout = ksc.readNumEntry("Reload", 0);
 	_url = ksc.readPathEntry("URL");
 	_htmlPart->openURL(_url );
 	// Must load this delayed
-	TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon()));
+	TQTimer::singleShot(0, this, TQ_SLOT(loadFavicon()));
 }
 
 
@@ -102,7 +102,7 @@ void KonqSideBarWebModule::setAutoReload(){
 	if( dlg.exec() == TQDialog::Accepted ) {
 		int msec = ( mins->value() * 60 + secs->value() ) * 1000;
 		reloadTimeout = msec;
-		KSimpleConfig ksc(_desktopName);
+		TDESimpleConfig ksc(_desktopName);
 		ksc.setGroup("Desktop Entry");
 		ksc.writeEntry("Reload", reloadTimeout);	
 		reload();
@@ -147,7 +147,7 @@ void KonqSideBarWebModule::loadFavicon() {
 	if (!icon.isEmpty()) {
 		emit setIcon(icon);
 
-		KSimpleConfig ksc(_desktopName);
+		TDESimpleConfig ksc(_desktopName);
 		ksc.setGroup("Desktop Entry");
 		if (icon != ksc.readPathEntry("Icon")) {
 			ksc.writePathEntry("Icon", icon);
@@ -165,7 +165,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) {
 	if (!title.isEmpty()) {
 		emit setCaption(title);
 
-		KSimpleConfig ksc(_desktopName);
+		TDESimpleConfig ksc(_desktopName);
 		ksc.setGroup("Desktop Entry");
 		if (title != ksc.readPathEntry("Name")) {
 			ksc.writePathEntry("Name", title);
@@ -176,20 +176,20 @@ void KonqSideBarWebModule::setTitle(const TQString& title) {
 
 void KonqSideBarWebModule::pageLoaded() {
 	if( reloadTimeout > 0 ) {
-		TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) );
+		TQTimer::singleShot( reloadTimeout, this, TQ_SLOT( reload() ) );
 	}
 }
 
 
 extern "C" {
-	KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
+	TDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
 		return new KonqSideBarWebModule(instance, parent, widget, desktopName, name);
 	}
 }
 
 
 extern "C" {
-	KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
+	TDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) {
 		Q_UNUSED(param);
 		TDEGlobal::dirs()->addResourceType("websidebardata", TDEStandardDirs::kde_default("data") + "konqsidebartng/websidebar");
 		KURL url;
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index e4669da89..072c3d822 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -41,9 +41,9 @@ class TDEHTMLSideBar : public TDEHTMLPart
 
 			setFormNotification(TDEHTMLPart::Only);
 			connect(this,
-				TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+				TQ_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 				this,
-				TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
+				TQ_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
 				);
 
 
@@ -51,22 +51,22 @@ class TDEHTMLSideBar : public TDEHTMLPart
 					"link context menu");
 			if (!universal) {
 				_linkMenu->insertItem(i18n("&Open Link"),
-						this, TQT_SLOT(loadPage()));
+						this, TQ_SLOT(loadPage()));
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, TQT_SLOT(loadNewWindow()));
+						this, TQ_SLOT(loadNewWindow()));
 			} else {
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, TQT_SLOT(loadPage()));
+						this, TQ_SLOT(loadPage()));
 			}
 			_menu = new TDEPopupMenu(widget(), "context menu");
 			_menu->insertItem(SmallIcon("reload"), i18n("&Reload"),
-					this, TQT_SIGNAL(reload()));
-			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, TQT_SIGNAL(setAutoReload()));
+					this, TQ_SIGNAL(reload()));
+			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, TQ_SIGNAL(setAutoReload()));
 
 			connect(this,
-				TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
+				TQ_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
 				this,
-				TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
+				TQ_SLOT(showMenu(const TQString&, const TQPoint&)));
 
 		}
 		virtual ~TDEHTMLSideBar() {}
diff --git a/konsole/README.ports b/konsole/README.ports
index 06c3b6c13..71f3ae154 100644
--- a/konsole/README.ports
+++ b/konsole/README.ports
@@ -19,7 +19,6 @@ Lars Doelle <lars.doelle@on-line.de>
 Platform Experts
 ----------------
 
-- Tru64   - Thomas Leitner <tom@radar.tu-graz.ac.at>
 - Solaris - Stephan Kulow <coolo@kde.org>
 - FreeBSD - ?
 - HP-UX   - ?
diff --git a/konsole/fonts/CMakeLists.txt b/konsole/fonts/CMakeLists.txt
index e61aa959b..379f357e2 100644
--- a/konsole/fonts/CMakeLists.txt
+++ b/konsole/fonts/CMakeLists.txt
@@ -19,14 +19,16 @@ install( CODE "execute_process( COMMAND mkfontdir \$ENV{DESTDIR}${DATA_INSTALL_D
 
 # FIXME generating fonts can be improved
 
-add_custom_target( console8x16.pcf.gz ALL )
-add_custom_command( TARGET console8x16.pcf.gz
+add_custom_target( konsole-font-8x16 ALL
+  DEPENDS console8x16.pcf.gz )
+add_custom_command( OUTPUT console8x16.pcf.gz
   COMMAND bdftopcf -o console8x16.pcf ${CMAKE_CURRENT_SOURCE_DIR}/console8x16.bdf
   COMMAND gzip -f --best console8x16.pcf
   DEPENDS console8x16.bdf )
 
-add_custom_target( 9x15.pcf.gz ALL )
-add_custom_command( TARGET 9x15.pcf.gz
+add_custom_target( konsole-font-9x15 ALL
+  DEPENDS 9x15.pcf.gz )
+add_custom_command( OUTPUT 9x15.pcf.gz
   COMMAND bdftopcf -o 9x15.pcf ${CMAKE_CURRENT_SOURCE_DIR}/9x15.bdf
   COMMAND gzip -f --best 9x15.pcf
   DEPENDS 9x15.bdf )
diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt
index 4f6c9285d..26fa93d70 100644
--- a/konsole/konsole/CMakeLists.txt
+++ b/konsole/konsole/CMakeLists.txt
@@ -78,5 +78,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${DL_LIBRARIES}
+  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${CMAKE_DL_LIBS}
 )
diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index 2148ec03c..5e7aefa5b 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -80,7 +80,7 @@
 #include <errno.h>
 #include <termios.h>
                      
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <kpty.h>
@@ -171,12 +171,12 @@ void TEPty::setWriteable(bool writeable)
 TEPty::TEPty()
 {
   m_bufferFull = false;
-  connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
-	  this, TQT_SLOT(dataReceived(TDEProcess *,char *, int)));
-  connect(this, TQT_SIGNAL(processExited(TDEProcess *)),
-          this, TQT_SLOT(donePty()));
-  connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)),
-          this, TQT_SLOT(writeReady()));
+  connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+	  this, TQ_SLOT(dataReceived(TDEProcess *,char *, int)));
+  connect(this, TQ_SIGNAL(processExited(TDEProcess *)),
+          this, TQ_SLOT(donePty()));
+  connect(this, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+          this, TQ_SLOT(writeReady()));
 
   setUsePty(All, false); // utmp will be overridden later
 }
diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h
index 05a453f31..6ebf19bd0 100644
--- a/konsole/konsole/TEPty.h
+++ b/konsole/konsole/TEPty.h
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tqsocketnotifier.h>
 #include <tqstrlist.h>
 #include <tqvaluelist.h>
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index f18278801..33dcf7f79 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -410,17 +410,17 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
   bY = bX = 1;
 
   cb = TQApplication::clipboard();
-  TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()),
-                    this, TQT_SLOT(onClearSelection()) );
+  TQObject::connect( (TQObject*)cb, TQ_SIGNAL(selectionChanged()),
+                    this, TQ_SLOT(onClearSelection()) );
 
   scrollbar = new TQScrollBar(this);
   scrollbar->setCursor( TQt::arrowCursor );
-  connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
+  connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int)));
 
   blinkT   = new TQTimer(this);
-  connect(blinkT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkEvent()));
+  connect(blinkT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkEvent()));
   blinkCursorT   = new TQTimer(this);
-  connect(blinkCursorT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursorEvent()));
+  connect(blinkCursorT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursorEvent()));
 
   setMouseMarks(true);
   setColorTable(base_color_table); // init color table
@@ -977,7 +977,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
         mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20);
         mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20);
         mResizeTimer = new TQTimer(this);
-        connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide()));
+        connect(mResizeTimer, TQ_SIGNAL(timeout()), mResizeWidget, TQ_SLOT(hide()));
      }
      TQString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines);
      mResizeLabel->setText(sizeStr);
@@ -1093,7 +1093,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
      pm.fill();
 
      TQPainter pm_paint;
-     pm_paint.begin(&pm, TQT_TQWIDGET(this));
+     pm_paint.begin(&pm, this);
      paintContents(pm_paint, contentsRect(), true);
      pm_paint.end();
      paint.drawPixmap(0, 0, pm);
@@ -1254,13 +1254,13 @@ void TEWidget::scrollChanged(int)
 void TEWidget::setScroll(int cursor, int slines)
 {
   //kdDebug(1211)<<"TEWidget::setScroll() disconnect()"<<endl;
-  disconnect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
+  disconnect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int)));
   //kdDebug(1211)<<"TEWidget::setScroll() setRange()"<<endl;
   scrollbar->setRange(0,slines);
   //kdDebug(1211)<<"TEWidget::setScroll() setSteps()"<<endl;
   scrollbar->setSteps(1,lines);
   scrollbar->setValue(cursor);
-  connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
+  connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int)));
   //kdDebug(1211)<<"TEWidget::setScroll() done"<<endl;
 }
 
@@ -1696,7 +1696,7 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
    }
 
   possibleTripleClick=true;
-  TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout()));
+  TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout()));
 }
 
 void TEWidget::wheelEvent( TQWheelEvent* ev )
@@ -1870,15 +1870,15 @@ void TEWidget::setSelection(const TQString& t)
 {
   // Disconnect signal while WE set the clipboard
   TQClipboard *cb = TQApplication::clipboard();
-  TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()),
-                     this, TQT_SLOT(onClearSelection()) );
+  TQObject::disconnect( cb, TQ_SIGNAL(selectionChanged()),
+                     this, TQ_SLOT(onClearSelection()) );
 
   cb->setSelectionMode( true );
   cb->setText(t);
   cb->setSelectionMode( false );
 
-  TQObject::connect( cb, TQT_SIGNAL(selectionChanged()),
-                     this, TQT_SLOT(onClearSelection()) );
+  TQObject::connect( cb, TQ_SIGNAL(selectionChanged()),
+                     this, TQ_SLOT(onClearSelection()) );
 }
 
 void TEWidget::copyClipboard()
@@ -1972,13 +1972,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
   }
   if ( e->type() == TQEvent::Enter )
   {
-    TQObject::disconnect( (TQObject*)cb, TQT_SIGNAL(dataChanged()),
-      this, TQT_SLOT(onClearSelection()) );
+    TQObject::disconnect( (TQObject*)cb, TQ_SIGNAL(dataChanged()),
+      this, TQ_SLOT(onClearSelection()) );
   }
   if ( e->type() == TQEvent::Leave )
   {
-    TQObject::connect( (TQObject*)cb, TQT_SIGNAL(dataChanged()),
-      this, TQT_SLOT(onClearSelection()) );
+    TQObject::connect( (TQObject*)cb, TQ_SIGNAL(dataChanged()),
+      this, TQ_SLOT(onClearSelection()) );
   }
   return TQFrame::eventFilter( obj, e );
 }
@@ -2124,7 +2124,7 @@ void TEWidget::Bell(bool visibleSession, TQString message)
     bellTimer.start(BELLVISUAL_DELAY,true);
     
     swapColorTable();
-    TQTimer::singleShot(200,this,TQT_SLOT(swapColorTable()));
+    TQTimer::singleShot(200,this,TQ_SLOT(swapColorTable()));
   }
 }
 
@@ -2270,7 +2270,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
       m_drop->insertItem( "cp", cp );
       m_drop->insertItem( "ln", ln );
       m_drop->insertItem( "mv", mv );
-      connect(m_drop, TQT_SIGNAL(activated(int)), TQT_SLOT(drop_menu_activated(int)));
+      connect(m_drop, TQ_SIGNAL(activated(int)), TQ_SLOT(drop_menu_activated(int)));
    };
     // The current behaviour when url(s) are dropped is
     // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index a9c026fea..1d303089d 100644
--- a/konsole/konsole/TEmuVt102.cpp
+++ b/konsole/konsole/TEmuVt102.cpp
@@ -81,10 +81,10 @@
 TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui)
 {
   //kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl;
-  TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
-                   this,TQT_SLOT(onMouse(int,int,int)));
-  TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-		   this, TQT_SLOT(sendString(const char*)));
+  TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)),
+                   this,TQ_SLOT(onMouse(int,int,int)));
+  TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+		   this, TQ_SLOT(sendString(const char*)));
   //kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl;
   initTokenizer();
   //kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl;
@@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui)
   if (static_cast<TEWidget *>( gui )==newgui) return;
 
   if ( gui ) {
-    TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
-                        this,TQT_SLOT(onMouse(int,int,int)));
-    TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-                        this, TQT_SLOT(sendString(const char*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(mouseSignal(int,int,int)),
+                        this,TQ_SLOT(onMouse(int,int,int)));
+    TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+                        this, TQ_SLOT(sendString(const char*)));
   }
   TEmulation::changeGUI(newgui);
-  TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)),
-                   this,TQT_SLOT(onMouse(int,int,int)));
-  TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-		   this, TQT_SLOT(sendString(const char*)));
+  TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)),
+                   this,TQ_SLOT(onMouse(int,int,int)));
+  TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+		   this, TQ_SLOT(sendString(const char*)));
 }
 
 /*!
@@ -1204,8 +1204,8 @@ void TEmuVt102::setConnect(bool c)
   TEmulation::setConnect(c);
   if (gui)
   {
-    TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-                        this, TQT_SLOT(sendString(const char*)));
+    TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+                        this, TQ_SLOT(sendString(const char*)));
   }
   if (c)
   { // refresh mouse mode
@@ -1219,8 +1219,8 @@ void TEmuVt102::setConnect(bool c)
     else
       scrolllock_set_off();
 #endif
-    TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)),
-                     this, TQT_SLOT(sendString(const char*)));
+    TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)),
+                     this, TQ_SLOT(sendString(const char*)));
   }
 }
 
diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp
index 943d2f205..4a4c709e4 100644
--- a/konsole/konsole/TEmulation.cpp
+++ b/konsole/konsole/TEmulation.cpp
@@ -110,8 +110,8 @@ TEmulation::TEmulation(TEWidget* w)
   screen[1] = new TEScreen(gui->Lines(),gui->Columns());
   scr = screen[0];
 
-  TQObject::connect(&bulk_timer1, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) );
-  TQObject::connect(&bulk_timer2, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) );
+  TQObject::connect(&bulk_timer1, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) );
+  TQObject::connect(&bulk_timer2, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) );
   connectGUI();
   setKeymap(0); // Default keymap
 }
@@ -121,28 +121,28 @@ TEmulation::TEmulation(TEWidget* w)
 
 void TEmulation::connectGUI()
 {
-  TQObject::connect(gui,TQT_SIGNAL(changedHistoryCursor(int)),
-                   this,TQT_SLOT(onHistoryCursorChange(int)));
-  TQObject::connect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                   this,TQT_SLOT(onKeyPress(TQKeyEvent*)));
-  TQObject::connect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                   this,TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-  TQObject::connect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                   this,TQT_SLOT(onFocusIn(TQFocusEvent*)));
-  TQObject::connect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
-		   this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) );
-  TQObject::connect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)),
-		   this,TQT_SLOT(onSelectionExtend(const int,const int)) );
-  TQObject::connect(gui,TQT_SIGNAL(endSelectionSignal(const bool)),
-		   this,TQT_SLOT(setSelection(const bool)) );
-  TQObject::connect(gui,TQT_SIGNAL(copySelectionSignal()),
-		   this,TQT_SLOT(copySelection()) );
-  TQObject::connect(gui,TQT_SIGNAL(clearSelectionSignal()),
-		   this,TQT_SLOT(clearSelection()) );
-  TQObject::connect(gui,TQT_SIGNAL(isBusySelecting(bool)),
-		   this,TQT_SLOT(isBusySelecting(bool)) );
-  TQObject::connect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)),
-		   this,TQT_SLOT(testIsSelected(const int, const int, bool &)) );
+  TQObject::connect(gui,TQ_SIGNAL(changedHistoryCursor(int)),
+                   this,TQ_SLOT(onHistoryCursorChange(int)));
+  TQObject::connect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                   this,TQ_SLOT(onKeyPress(TQKeyEvent*)));
+  TQObject::connect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                   this,TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+  TQObject::connect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                   this,TQ_SLOT(onFocusIn(TQFocusEvent*)));
+  TQObject::connect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
+		   this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) );
+  TQObject::connect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)),
+		   this,TQ_SLOT(onSelectionExtend(const int,const int)) );
+  TQObject::connect(gui,TQ_SIGNAL(endSelectionSignal(const bool)),
+		   this,TQ_SLOT(setSelection(const bool)) );
+  TQObject::connect(gui,TQ_SIGNAL(copySelectionSignal()),
+		   this,TQ_SLOT(copySelection()) );
+  TQObject::connect(gui,TQ_SIGNAL(clearSelectionSignal()),
+		   this,TQ_SLOT(clearSelection()) );
+  TQObject::connect(gui,TQ_SIGNAL(isBusySelecting(bool)),
+		   this,TQ_SLOT(isBusySelecting(bool)) );
+  TQObject::connect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)),
+		   this,TQ_SLOT(testIsSelected(const int, const int, bool &)) );
 }
 
 /*!
@@ -153,28 +153,28 @@ void TEmulation::changeGUI(TEWidget* newgui)
   if (static_cast<TEWidget *>( gui )==newgui) return;
 
   if ( gui ) {
-    TQObject::disconnect(gui,TQT_SIGNAL(changedHistoryCursor(int)),
-                     this,TQT_SLOT(onHistoryCursorChange(int)));
-    TQObject::disconnect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                     this,TQT_SLOT(onKeyPress(TQKeyEvent*)));
-    TQObject::disconnect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                     this,TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-    TQObject::disconnect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                     this,TQT_SLOT(onFocusIn(TQFocusEvent*)));
-    TQObject::disconnect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
-                     this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)),
-                     this,TQT_SLOT(onSelectionExtend(const int,const int)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(endSelectionSignal(const bool)),
-                     this,TQT_SLOT(setSelection(const bool)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(copySelectionSignal()),
-                     this,TQT_SLOT(copySelection()) );
-    TQObject::disconnect(gui,TQT_SIGNAL(clearSelectionSignal()),
-                     this,TQT_SLOT(clearSelection()) );
-    TQObject::disconnect(gui,TQT_SIGNAL(isBusySelecting(bool)),
-                     this,TQT_SLOT(isBusySelecting(bool)) );
-    TQObject::disconnect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)),
-                     this,TQT_SLOT(testIsSelected(const int, const int, bool &)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(changedHistoryCursor(int)),
+                     this,TQ_SLOT(onHistoryCursorChange(int)));
+    TQObject::disconnect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                     this,TQ_SLOT(onKeyPress(TQKeyEvent*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                     this,TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                     this,TQ_SLOT(onFocusIn(TQFocusEvent*)));
+    TQObject::disconnect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)),
+                     this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)),
+                     this,TQ_SLOT(onSelectionExtend(const int,const int)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(endSelectionSignal(const bool)),
+                     this,TQ_SLOT(setSelection(const bool)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(copySelectionSignal()),
+                     this,TQ_SLOT(copySelection()) );
+    TQObject::disconnect(gui,TQ_SIGNAL(clearSelectionSignal()),
+                     this,TQ_SLOT(clearSelection()) );
+    TQObject::disconnect(gui,TQ_SIGNAL(isBusySelecting(bool)),
+                     this,TQ_SLOT(isBusySelecting(bool)) );
+    TQObject::disconnect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)),
+                     this,TQ_SLOT(testIsSelected(const int, const int, bool &)) );
   }
   gui=newgui;
   connectGUI();
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 7a2b3f566..6400598f6 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <tqintdict.h>
 #include <tqfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include <stdio.h>
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 7ff81454c..1c435165c 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -99,7 +99,7 @@ Time to start a requirement list.
 
 #include <tdefontdialog.h>
 #include <kkeydialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqpainter.h>
 #include <tdemenubar.h>
 #include <tdemessagebox.h>
@@ -132,7 +132,7 @@ Time to start a requirement list.
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <ktip.h>
-#include <kprocctrl.h>
+#include <tdeprocctrl.h>
 #include <ktabwidget.h>
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
@@ -184,7 +184,7 @@ void KonsoleFontSelectAction::slotActivated(int index) {
 }
 
 template class TQPtrDict<TESession>;
-template class TQIntDict<KSimpleConfig>;
+template class TQIntDict<TDESimpleConfig>;
 template class TQPtrDict<TDERadioAction>;
 
 #define DEFAULT_HISTORY_SIZE 1000
@@ -290,16 +290,16 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 ,m_filterData(0)
 {
   isRestored = b_inRestore;
-  connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose()));
+  connect( &m_closeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCouldNotClose()));
 
   no2command.setAutoDelete(true);
   menubar = menuBar();
 
   TDEAcceleratorManager::setNoAccel( menubar );
 
-  sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
-  connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
-          this, TQT_SLOT( newSessionTabbar( int ) ) );
+  sessionNumberMapper = new TQSignalMapper( this );
+  connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ),
+          this, TQ_SLOT( newSessionTabbar( int ) ) );
 
   colors = new ColorSchemaList();
   colors->checkSchemas();
@@ -317,7 +317,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
   if (currentSize != size())
      defaultSize = size();
 
-  KSimpleConfig *co;
+  TDESimpleConfig *co;
   if (!type.isEmpty())
     setDefaultSession(type+".desktop");
   co = defaultSession();
@@ -331,7 +331,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 
   if (isRestored) {
     n_tabbar = wanted_tabbar;
-    TDEConfig *c = TDEApplication::kApplication()->sessionConfig();
+    TDEConfig *c = tdeApp->sessionConfig();
 //    c->setDesktopGroup();      // Reads from wrong group
     b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false);
   }
@@ -359,9 +359,9 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
     if (te) te->setScrollbarLocation(TEWidget::SCRNONE);
   }
 
-//  connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged()));
+//  connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged()));
 
-  kapp->dcopClient()->setDefaultObject( "konsole" );
+  tdeApp->dcopClient()->setDefaultObject( "konsole" );
 }
 
 
@@ -476,23 +476,23 @@ void Konsole::makeGUI()
    if (m_menuCreated) return;
 
    if (m_tabbarSessionsCommands)
-      disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-   disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+   disconnect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_options)
-      disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_help)
-      disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_rightButton)
-      disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-   disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-   disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+   disconnect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+   disconnect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_bookmarks)
-      disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_bookmarksSession)
-      disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+      disconnect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
    if (m_tabbarSessionsCommands)
-      connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions()));
-   connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions()));
+      connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions()));
+   connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions()));
    m_menuCreated=true;
 
    // Remove the empty separator Qt inserts if the menu is empty on popup,
@@ -506,7 +506,7 @@ void Konsole::makeGUI()
    TDEActionCollection* actions = actionCollection();
 
    // Send Signal Menu -------------------------------------------------------------
-   if (kapp->authorizeTDEAction("send_signal"))
+   if (tdeApp->authorizeTDEAction("send_signal"))
    {
       m_signals = new TDEPopupMenu(this);
       m_signals->insertItem( i18n( "&Suspend Task" )   + " (STOP)", SIGSTOP);
@@ -517,7 +517,7 @@ void Konsole::makeGUI()
       m_signals->insertItem( i18n( "&Kill Task" )      + " (KILL)", SIGKILL);
       m_signals->insertItem( i18n( "User Signal &1")   + " (USR1)", SIGUSR1);
       m_signals->insertItem( i18n( "User Signal &2")   + " (USR2)", SIGUSR2);
-      connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int)));
+      connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int)));
       TDEAcceleratorManager::manage( m_signals );
    }
 
@@ -571,28 +571,28 @@ void Konsole::makeGUI()
 
    //bookmarks menu
    if (bookmarkHandler)
-      connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )),
-            TQT_SLOT( enterURL( const TQString&, const TQString& )));
+      connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString&, const TQString& )),
+            TQ_SLOT( enterURL( const TQString&, const TQString& )));
    if (bookmarkHandlerSession)
-      connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )),
-            TQT_SLOT( newSession( const TQString&, const TQString& )));
+      connect( bookmarkHandlerSession, TQ_SIGNAL( openURL( const TQString&, const TQString& )),
+            TQ_SLOT( newSession( const TQString&, const TQString& )));
    if (m_bookmarks)
-      connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check()));
+      connect(m_bookmarks, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check()));
    if (m_bookmarksSession)
-      connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check()));
+      connect(m_bookmarksSession, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check()));
 
    // Schema Options Menu -----------------------------------------------------
    m_schema = new TDEPopupMenu(this);
    m_schema->setCheckable(true);
    TDEAcceleratorManager::manage( m_schema );
-   connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
-   connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
+   connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int)));
+   connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check()));
 
    // Keyboard Options Menu ---------------------------------------------------
    m_keytab = new TDEPopupMenu(this);
    m_keytab->setCheckable(true);
    TDEAcceleratorManager::manage( m_keytab );
-   connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
+   connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int)));
 
    //options menu
    if (m_options)
@@ -601,16 +601,16 @@ void Konsole::makeGUI()
       showMenubar->plug ( m_options );
 
       // Tabbar
-      selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this),
-                                       TQT_SLOT(slotSelectTabbar()), actions, "tabbar" );
+      selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this,
+                                       TQ_SLOT(slotSelectTabbar()), actions, "tabbar" );
       TQStringList tabbaritems;
       tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom");
       selectTabbar->setItems(tabbaritems);
       selectTabbar->plug(m_options);
 
       // Scrollbar
-      selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this),
-                                       TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" );
+      selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this,
+                                       TQ_SLOT(slotSelectScrollbar()), actions, "scrollbar" );
       TQStringList scrollitems;
       scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
       selectScrollbar->setItems(scrollitems);
@@ -625,8 +625,8 @@ void Konsole::makeGUI()
       }
 
       // Select Bell
-      selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this),
-                                  TQT_SLOT(slotSelectBell()), actions, "bell");
+      selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
+                                  TQ_SLOT(slotSelectBell()), actions, "bell");
       TQStringList bellitems;
       bellitems << i18n("System &Bell")
                 << i18n("System &Notification")
@@ -640,46 +640,46 @@ void Konsole::makeGUI()
                                                   SmallIconSet( "text" ),
                                                   actions, 0L );
       m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ),
-                           SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this),
-                           TQT_SLOT( biggerFont() ), actions,
+                           SmallIconSet( "fontsizeup" ), 0, this,
+                           TQ_SLOT( biggerFont() ), actions,
                            "enlarge_font" ) );
       m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ),
-                           SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this),
-                           TQT_SLOT( smallerFont() ), actions,
+                           SmallIconSet( "fontsizedown" ), 0, this,
+                           TQ_SLOT( smallerFont() ), actions,
                            "shrink_font" ) );
       m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ),
-                           SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this),
-                           TQT_SLOT( slotSelectFont() ), actions,
+                           SmallIconSet( "font-x-generic" ), 0, this,
+                           TQ_SLOT( slotSelectFont() ), actions,
                            "select_font" ) );
       if ( b_installBitmapFonts )
       {
          m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ),
-                              SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this),
-                              TQT_SLOT( slotInstallBitmapFonts() ), actions,
+                              SmallIconSet( "font-x-generic" ), 0, this,
+                              TQ_SLOT( slotInstallBitmapFonts() ), actions,
                               "install_fonts" ) );
       }
       m_fontsizes->plug(m_options);
 
       // encoding menu, start with default checked !
-      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
+      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQ_SLOT(slotSetEncoding()), actions, "set_encoding" );
       TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
       list.prepend( i18n( "Default" ) );
       selectSetEncoding->setItems(list);
       selectSetEncoding->setCurrentItem (0);
       selectSetEncoding->plug(m_options);
 
-      if (kapp->authorizeTDEAction("keyboard"))
+      if (tdeApp->authorizeTDEAction("keyboard"))
          m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
 
       // Schema
-      if (kapp->authorizeTDEAction("schema"))
+      if (tdeApp->authorizeTDEAction("schema"))
          m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema);
 
       // Select size
       if (!b_fixedSize)
       {
-         selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, TQT_TQOBJECT(this),
-                                  TQT_SLOT(slotSelectSize()), actions, "size");
+         selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this,
+                                  TQ_SLOT(slotSelectSize()), actions, "size");
          TQStringList sizeitems;
          sizeitems << i18n("40x15 (&Small)")
             << i18n("80x24 (&VT100)")
@@ -692,14 +692,14 @@ void Konsole::makeGUI()
          selectSize->plug(m_options);
       }
 
-      TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this),
-                                      TQT_SLOT(slotHistoryType()), actions, "history");
+      TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this,
+                                      TQ_SLOT(slotHistoryType()), actions, "history");
       historyType->plug(m_options);
 
       m_options->insertSeparator();
 
-      TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, TQT_TQOBJECT(this),
-                                        TQT_SLOT(slotSaveSettings()), actions, "save_default");
+      TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this,
+                                        TQ_SLOT(slotSaveSettings()), actions, "save_default");
       save_settings->plug(m_options);
 
       m_options->insertSeparator();
@@ -708,9 +708,9 @@ void Konsole::makeGUI()
 
       m_options->insertSeparator();
 
-      KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
-      KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
-      TDEAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions);
+      KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
+      KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
+      TDEAction *configure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actions);
       configure->plug(m_options);
 
       if (TDEGlobalSettings::insertTearOffHandle())
@@ -722,21 +722,21 @@ void Konsole::makeGUI()
    {
       m_help->insertSeparator(1);
       m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"),
-            this, TQT_SLOT(showTip()), 0, -1, 2);
+            this, TQ_SLOT(showTip()), 0, -1, 2);
    }
 
    //the different session menus
    buildSessionMenus();
 
-   connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int)));
+   connect(m_session, TQ_SIGNAL(activated(int)), TQ_SLOT(newSession(int)));
 
    // Right mouse button menu
    if (m_rightButton)
    {
       updateRMBMenu(); // show menubar / exit fullscreen
 
-      TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end");
+      TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this,
+                               TQ_SLOT(slotSetSelectionEnd()), actions, "selection_end");
       selectionEnd->plug(m_rightButton);
 
       m_copyClipboard->plug(m_rightButton);
@@ -744,7 +744,7 @@ void Konsole::makeGUI()
 
       m_openSelection = new TDEPopupMenu(this);
       m_rightButton->insertItem( i18n("&Open.."), m_openSelection );
-      connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection()));
+      connect(m_openSelection, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotOpenSelection()));
 
       if (m_signals)
          m_rightButton->insertItem(i18n("&Send Signal"), m_signals);
@@ -821,58 +821,58 @@ void Konsole::makeGUI()
 
    if (!m_detachSession)
    {
-     m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
+     m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
+                                     TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
    }
    m_detachSession->plug(m_tabPopupMenu);
 
-   m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this),
-                         TQT_SLOT(slotTabRenameSession()) );
+   m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this,
+                         TQ_SLOT(slotTabRenameSession()) );
    m_tabPopupMenu->insertSeparator();
 
    m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),
-      SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
+      SmallIconSet("activity"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this );
    m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
    m_tabMonitorActivity->plug(m_tabPopupMenu);
 
    m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),
-      SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
+      SmallIconSet("silence"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this );
    m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
    m_tabMonitorSilence->plug(m_tabPopupMenu);
 
-   m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
-                                    TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this));
+   m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
+                                    TQ_SLOT( slotTabToggleMasterMode() ), this);
    m_tabMasterMode->plug(m_tabPopupMenu);
 
    m_tabPopupMenu->insertSeparator();
    if (!m_moveSessionLeft)
    {
      m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
-                                       TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this),
-                                       TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
+                                       TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this,
+                                       TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
    }
    m_moveSessionLeft->plug(m_tabPopupMenu);
    if (!m_moveSessionRight)
    {
      m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
-                                        TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this),
-                                        TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
+                                        TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this,
+                                        TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
    }
    m_moveSessionRight->plug(m_tabPopupMenu);
 
    m_tabPopupMenu->insertSeparator();
-   m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) );
-   m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), TQT_TQOBJECT(this), TQT_SLOT(slotTabResetColor()) );
+   m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQ_SLOT(slotTabSelectColor()) );
+   m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQ_SLOT(slotTabResetColor()) );
 
    m_tabPopupMenu->insertSeparator();
    m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu );
    m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu );
-   connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ),
-            TQT_SLOT( activateSession( int ) ) );
+   connect( m_tabPopupTabsMenu, TQ_SIGNAL( activated ( int ) ),
+            TQ_SLOT( activateSession( int ) ) );
 
    m_tabPopupMenu->insertSeparator();
-   m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), TQT_TQOBJECT(this),
-                          TQT_SLOT(slotTabCloseSession()) );
+   m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this,
+                          TQ_SLOT(slotTabCloseSession()) );
 
    if (m_options) {
       // Fill tab bar context menu
@@ -880,23 +880,23 @@ void Konsole::makeGUI()
       TDEAcceleratorManager::manage( m_tabbarPopupMenu );
       selectTabbar->plug(m_tabbarPopupMenu);
 
-      TDESelectAction *viewOptions = new TDESelectAction(TQT_TQOBJECT(this));
+      TDESelectAction *viewOptions = new TDESelectAction(this);
       viewOptions->setText(i18n("Tab &Options"));
       TQStringList options;
       options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only");
       viewOptions->setItems(options);
       viewOptions->setCurrentItem(m_tabViewMode);
       viewOptions->plug(m_tabbarPopupMenu);
-      connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int)));
+      connect(viewOptions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTabSetViewOptions(int)));
       slotTabSetViewOptions(m_tabViewMode);
 
-      TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this),
-                                       TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this));
+      TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this,
+                                       TQ_SLOT( slotTabbarToggleDynamicHide() ), this);
       dynamicTabHideOption->setChecked(b_dynamicTabHide);
       dynamicTabHideOption->plug(m_tabbarPopupMenu);
 
       TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"),
-                 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this));
+                 0, this, TQ_SLOT( slotToggleAutoResizeTabs() ), this);
       m_autoResizeTabs->setChecked(b_autoResizeTabs);
       m_autoResizeTabs->plug(m_tabbarPopupMenu);
     }
@@ -952,23 +952,23 @@ void Konsole::makeTabWidget()
 
   TDEAcceleratorManager::setNoAccel( tabwidget );
 
-  connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int)));
-  connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession()));
-  connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*)));
-  connect(tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)),
-                     TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &)));
-  connect(tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)),
-                     TQT_SLOT(slotTabbarContextMenu(const TQPoint &)));
+  connect(tabwidget, TQ_SIGNAL(movedTab(int,int)), TQ_SLOT(slotMovedTab(int,int)));
+  connect(tabwidget, TQ_SIGNAL(mouseDoubleClick(TQWidget*)), TQ_SLOT(slotRenameSession()));
+  connect(tabwidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(activateSession(TQWidget*)));
+  connect(tabwidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)),
+                     TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &)));
+  connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)),
+                     TQ_SLOT(slotTabbarContextMenu(const TQPoint &)));
 
-  if (kapp->authorize("shell_access")) {
-    connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession()));
+  if (tdeApp->authorize("shell_access")) {
+    connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession()));
 
     m_newSessionButton = new TQToolButton( tabwidget );
     TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu"));
     m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) );
     m_newSessionButton->adjustSize();
     m_newSessionButton->setPopup( m_tabbarSessionsCommands );
-    connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession()));
+    connect(m_newSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(newSession()));
     tabwidget->setCornerWidget( m_newSessionButton, BottomLeft );
     m_newSessionButton->installEventFilter(this);
 
@@ -977,7 +977,7 @@ void Konsole::makeTabWidget()
     m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) );
     m_removeSessionButton->adjustSize();
     m_removeSessionButton->setEnabled(false);
-    connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession()));
+    connect(m_removeSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(confirmCloseCurrentSession()));
     tabwidget->setCornerWidget( m_removeSessionButton, BottomRight );
 
   }
@@ -1016,10 +1016,10 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
 
 void Konsole::makeBasicGUI()
 {
-  if (kapp->authorize("shell_access")) {
+  if (tdeApp->authorize("shell_access")) {
     m_tabbarSessionsCommands = new TDEPopupMenu( this );
     TDEAcceleratorManager::manage( m_tabbarSessionsCommands );
-    connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int)));
+    connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int)));
   }
 
   m_session = new TDEPopupMenu(this);
@@ -1028,7 +1028,7 @@ void Konsole::makeBasicGUI()
   TDEAcceleratorManager::manage( m_edit );
   m_view = new TDEPopupMenu(this);
   TDEAcceleratorManager::manage( m_view );
-  if (kapp->authorizeTDEAction("bookmarks"))
+  if (tdeApp->authorizeTDEAction("bookmarks"))
   {
     bookmarkHandler = new KonsoleBookmarkHandler( this, true );
     m_bookmarks = bookmarkHandler->menu();
@@ -1036,20 +1036,20 @@ void Konsole::makeBasicGUI()
     bookmarks_menu_check();
   }
 
-  if (kapp->authorizeTDEAction("settings")) {
+  if (tdeApp->authorizeTDEAction("settings")) {
      m_options = new TDEPopupMenu(this);
      TDEAcceleratorManager::manage( m_options );
   }
 
-  if (kapp->authorizeTDEAction("help"))
+  if (tdeApp->authorizeTDEAction("help"))
      m_help = helpMenu(0, false);
 
-  if (kapp->authorizeTDEAction("konsole_rmb")) {
+  if (tdeApp->authorizeTDEAction("konsole_rmb")) {
      m_rightButton = new TDEPopupMenu(this);
      TDEAcceleratorManager::manage( m_rightButton );
   }
 
-  if (kapp->authorizeTDEAction("bookmarks"))
+  if (tdeApp->authorizeTDEAction("bookmarks"))
   {
     // Bookmarks that open new sessions.
     bookmarkHandlerSession = new KonsoleBookmarkHandler( this, false );
@@ -1062,20 +1062,20 @@ void Konsole::makeBasicGUI()
   // programs.
 
   if (m_tabbarSessionsCommands)
-     connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-  connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+  connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_options)
-     connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_help)
-     connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_rightButton)
-     connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-  connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
-  connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+  connect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
+  connect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_bookmarks)
-     connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
   if (m_bookmarksSession)
-     connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
+     connect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI()));
 
   m_session_id=menubar->insertItem(m_session_string , m_session);
   m_edit_id=menubar->insertItem(m_edit_string, m_edit);
@@ -1089,79 +1089,79 @@ void Konsole::makeBasicGUI()
 
   m_shortcuts = new TDEActionCollection(this);
 
-  m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this),
-                                 TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
-  m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this),
-                                 TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
-  m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this),
-                                 TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
-
-  m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this),
-                                TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
-  m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this),
-                                     TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
-  m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, TQT_TQOBJECT(this),
-                              TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history");
+  m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this,
+                                 TQ_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
+  m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this,
+                                 TQ_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
+  m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this,
+                                 TQ_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
+
+  m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this,
+                                TQ_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
+  m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this,
+                                     TQ_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
+  m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this,
+                              TQ_SLOT(slotFindHistory()), m_shortcuts, "find_history");
   m_findHistory->setEnabled(b_histEnabled);
 
-  m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, TQT_TQOBJECT(this),
-                           TQT_SLOT(slotFindNext()), m_shortcuts, "find_next");
+  m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this,
+                           TQ_SLOT(slotFindNext()), m_shortcuts, "find_next");
   m_findNext->setEnabled(b_histEnabled);
 
-  m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
+  m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this,
+                               TQ_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
   m_findPrevious->setEnabled( b_histEnabled );
 
-  m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, TQT_TQOBJECT(this),
-                              TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
+  m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this,
+                              TQ_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
   m_saveHistory->setEnabled(b_histEnabled );
 
-  m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
+  m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this,
+                               TQ_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
   m_clearHistory->setEnabled(b_histEnabled);
 
   m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0,
-    TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
+    this, TQ_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
 
   if (!m_detachSession)
   {
-    m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
-                                    TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
+    m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
+                                    TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
   }
   m_detachSession->setEnabled(false);
 
-  m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, TQT_TQOBJECT(this),
-                                TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
+  m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this,
+                                TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
 
-  if (kapp->authorizeTDEAction("zmodem_upload"))
+  if (tdeApp->authorizeTDEAction("zmodem_upload"))
     m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ),
-                                  TQt::CTRL+TQt::ALT+TQt::Key_U, TQT_TQOBJECT(this),
-                                  TQT_SLOT( slotZModemUpload() ),
+                                  TQt::CTRL+TQt::ALT+TQt::Key_U, this,
+                                  TQ_SLOT( slotZModemUpload() ),
                                   m_shortcuts, "zmodem_upload" );
 
   monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),
-      SmallIconSet("activity"), 0, TQT_TQOBJECT(this),
-      TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
+      SmallIconSet("activity"), 0, this,
+      TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
   monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
 
   monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),
-      SmallIconSet("silence"), 0, TQT_TQOBJECT(this),
-      TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
+      SmallIconSet("silence"), 0, this,
+      TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
   monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
 
-  masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
-                                   TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
+  masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
+                                   TQ_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
 
-  showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this),
-                                    TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
+  showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this,
+                                    TQ_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
   showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );
 
   m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this );
-  connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool)));
+  connect( m_fullscreen,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(updateFullScreen(bool)));
   m_fullscreen->setChecked(b_fullscreen);
 
-  m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, TQT_TQOBJECT(this),
-                         TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
+  m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this,
+                         TQ_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
 
   //help menu
   if (m_help)
@@ -1169,43 +1169,43 @@ void Konsole::makeBasicGUI()
      // Don't steal F1 (handbook) accel (esp. since it not visible in
      // "Configure Shortcuts").
 
-  m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
-  m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
-  m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit");
+  m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this,
+                               TQ_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
+  m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQ_SLOT( slotPrint() ), m_shortcuts, "file_print");
+  m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQ_SLOT( close() ), m_shortcuts, "file_quit");
 
   TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
   shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
-  new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session");
-  new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
-  new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
+  new TDEAction(i18n("New Session"), shortcut, this, TQ_SLOT(newSession()), m_shortcuts, "new_session");
+  new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQ_SLOT(activateMenu()), m_shortcuts, "activate_menu");
+  new TDEAction(i18n("List Sessions"), 0, this, TQ_SLOT(listSessions()), m_shortcuts, "list_sessions");
 
   if (!m_moveSessionLeft)
   {
     m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
-                                      TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this),
-                                      TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
+                                      TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this,
+                                      TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
   }
   if (!m_moveSessionRight)
   {
     m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
-                                       TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this),
-                                       TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
+                                       TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this,
+                                       TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
   }
 
   new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
-              TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
+              this, TQ_SLOT(prevSession()), m_shortcuts, "previous_session");
   new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right,
-              TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session");
+              this, TQ_SLOT(nextSession()), m_shortcuts, "next_session");
 
   for (int i=1;i<13;i++) { // Due to 12 function keys?
-     new TDEAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
+     new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQ_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
   }
 
-  new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
-  new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
+  new TDEAction(i18n("Enlarge Font"), 0, this, TQ_SLOT(biggerFont()), m_shortcuts, "bigger_font");
+  new TDEAction(i18n("Shrink Font"), 0, this, TQ_SLOT(smallerFont()), m_shortcuts, "smaller_font");
 
-  new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
+  new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQ_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
 
   // Should we load all *.desktop files now?  Required for Session shortcuts.
   if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
@@ -1217,7 +1217,7 @@ void Konsole::makeBasicGUI()
 
   m_sessionList = new TDEPopupMenu(this);
   TDEAcceleratorManager::manage( m_sessionList );
-  connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int)));
+  connect(m_sessionList, TQ_SIGNAL(activated(int)), TQ_SLOT(activateSession(int)));
 }
 
 /**
@@ -1239,7 +1239,7 @@ void Konsole::activateMenu()
  */
 bool Konsole::queryClose()
 {
-   if(kapp->sessionSaving())
+   if(tdeApp->sessionSaving())
      // saving session - do not even think about doing any kind of cleanup here
        return true;
 
@@ -1487,7 +1487,7 @@ void Konsole::slotSaveSessionsProfile()
     if ( TQFile::exists( path ) )
       TQFile::remove( path );
 
-    KSimpleConfig cfg( path );
+    TDESimpleConfig cfg( path );
     savePropertiesInternal(&cfg,1);
     saveMainWindowSettings(&cfg);
   }
@@ -1990,7 +1990,7 @@ void Konsole::slotToggleMenubar() {
   }
   if (!showMenubar->isChecked()) {
     setCaption(i18n("Use the right mouse button to bring back the menu"));
-    TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle()));
+    TQTimer::singleShot(5000,this,TQ_SLOT(updateTitle()));
   }
   updateRMBMenu();
 }
@@ -2142,12 +2142,12 @@ void Konsole::reparseConfiguration()
   b_sessionShortcutsMapped = false;
 
   // Mappings may have to be changed...get a fresh mapper.
-  disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
-          this, TQT_SLOT( newSessionTabbar( int ) ) );
+  disconnect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ),
+          this, TQ_SLOT( newSessionTabbar( int ) ) );
   delete sessionNumberMapper;
-  sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
-  connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
-          this, TQT_SLOT( newSessionTabbar( int ) ) );
+  sessionNumberMapper = new TQSignalMapper( this );
+  connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ),
+          this, TQ_SLOT( newSessionTabbar( int ) ) );
 
   sl_sessionShortCuts.clear();
   buildSessionMenus();
@@ -2380,12 +2380,12 @@ void Konsole::disableMasterModeConnections()
         TESession *to = to_it.current();
         if (to!=from)
         {
-          disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                     to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*)));
-          disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                     to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-          disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                     to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*)));
+          disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                     to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*)));
+          disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                     to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+          disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                     to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*)));
         }
       }
     }
@@ -2403,12 +2403,12 @@ void Konsole::enableMasterModeConnections()
         TESession *to = to_it.current();
         if (to!=from)
         {
-          connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-                  to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*)));
-          connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-                  to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-          connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-                  to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*)));
+          connect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+                  to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*)));
+          connect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+                  to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+          connect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+                  to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*)));
         }
       }
     }
@@ -2503,7 +2503,7 @@ void Konsole::runSession(TESession* s)
 
     // give some time to get through the
     // resize events before starting up.
-    TQTimer::singleShot(100,s,TQT_SLOT(run()));
+    TQTimer::singleShot(100,s,TQ_SLOT(run()));
 }
 
 void Konsole::addSession(TESession* s)
@@ -2536,8 +2536,8 @@ void Konsole::addSession(TESession* s)
   TDERadioAction *ra = new TDERadioAction(newTitle.replace('&',"&&"),
                                       s->IconName(),
                                       0,
-                                      TQT_TQOBJECT(this),
-                                      TQT_SLOT(activateSession()),
+                                      this,
+                                      TQ_SLOT(activateSession()),
                                       m_shortcuts);
   ra->setExclusiveGroup("sessions");
   ra->setChecked(true);
@@ -2676,7 +2676,7 @@ void Konsole::activateSession(TESession *s)
   }
   ra->setChecked(true);
 
-  TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack
+  TQTimer::singleShot(1,this,TQ_SLOT(allowPrevNext())); // hack, hack, hack
 
   tabwidget->showPage( se->widget() );
   te = se->widget();
@@ -2797,7 +2797,7 @@ void Konsole::allowPrevNext()
   notifySessionState(se,NOTIFYNORMAL);
 }
 
-KSimpleConfig *Konsole::defaultSession()
+TDESimpleConfig *Konsole::defaultSession()
 {
   if (!m_defaultSession) {
     TDEConfig * config = TDEGlobal::config();
@@ -2810,7 +2810,7 @@ KSimpleConfig *Konsole::defaultSession()
 void Konsole::setDefaultSession(const TQString &filename)
 {
   delete m_defaultSession;
-  m_defaultSession = new KSimpleConfig(locate("appdata", filename), true /* read only */);
+  m_defaultSession = new TDESimpleConfig(locate("appdata", filename), true /* read only */);
   m_defaultSession->setDesktopGroup();
   b_showstartuptip = m_defaultSession->readBoolEntry("Tips", true);
 
@@ -2819,13 +2819,13 @@ void Konsole::setDefaultSession(const TQString &filename)
 
 void Konsole::newSession(const TQString &pgm, const TQStrList &args, const TQString &term, const TQString &icon, const TQString &title, const TQString &cwd)
 {
-  KSimpleConfig *co = defaultSession();
+  TDESimpleConfig *co = defaultSession();
   newSession(co, pgm, args, term, icon, title, cwd);
 }
 
 TQString Konsole::newSession()
 {
-  KSimpleConfig *co = defaultSession();
+  TDESimpleConfig *co = defaultSession();
   return newSession(co, TQString::null, TQStrList());
 }
 
@@ -2845,7 +2845,7 @@ void Konsole::newSession(int i)
     return;
   }
 
-  KSimpleConfig* co = no2command.find(i);
+  TDESimpleConfig* co = no2command.find(i);
   if (co) {
     newSession(co);
     resetScreenSessions();
@@ -2868,7 +2868,7 @@ void Konsole::newSessionTabbar(int i)
     return;
   }
 
-  KSimpleConfig* co = no2command.find(i);
+  TDESimpleConfig* co = no2command.find(i);
   if (co) {
     newSession(co);
     resetScreenSessions();
@@ -2877,15 +2877,15 @@ void Konsole::newSessionTabbar(int i)
 
 TQString Konsole::newSession(const TQString &type)
 {
-  KSimpleConfig *co;
+  TDESimpleConfig *co;
   if (type.isEmpty())
      co = defaultSession();
   else
-     co = new KSimpleConfig(locate("appdata", type + ".desktop"), true /* read only */);
+     co = new TDESimpleConfig(locate("appdata", type + ".desktop"), true /* read only */);
   return newSession(co);
 }
 
-TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrList &args,
+TQString Konsole::newSession(TDESimpleConfig *co, TQString program, const TQStrList &args,
                             const TQString &_term,const TQString &_icon,
                             const TQString &_title, const TQString &_cwd)
 {
@@ -2953,8 +2953,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
   TEWidget* te_old = te;
   te=new TEWidget(tabwidget);
 
-  connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)),
-           this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
+  connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)),
+           this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) );
   if (te_old) {
     initTEWidget(te, te_old);
   }
@@ -2975,38 +2975,38 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
   s->setMetaAsAltMode(b_metaAsAlt);
 
   // If you add any new signal-slot connection below, think about doing it in konsolePart too
-  connect( s,TQT_SIGNAL(done(TESession*)),
-           this,TQT_SLOT(doneSession(TESession*)));
-  connect( s, TQT_SIGNAL(updateTitle(TESession*)),
-           this, TQT_SLOT(updateTitle(TESession*)));
-  connect( s, TQT_SIGNAL(notifySessionState(TESession*, int)),
-           this, TQT_SLOT(notifySessionState(TESession*, int)));
-  connect( s, TQT_SIGNAL(disableMasterModeConnections()),
-           this, TQT_SLOT(disableMasterModeConnections()));
-  connect( s, TQT_SIGNAL(enableMasterModeConnections()),
-           this, TQT_SLOT(enableMasterModeConnections()));
-  connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)),
-           this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)));
-  connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)),
-           this, TQT_SLOT(changeColumns(int)) );
-  connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)),
-           this, TQT_SLOT(changeColLin(int,int)));
-  connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)),
-           this, TQT_SLOT(notifySize(int,int)));
-  connect( s, TQT_SIGNAL(zmodemDetected(TESession*)),
-           this, TQT_SLOT(slotZModemDetected(TESession*)));
-  connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)),
-           this, TQT_SLOT(slotUpdateSessionConfig(TESession*)));
-  connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)),
-           this, TQT_SLOT(slotResizeSession(TESession*, TQSize)));
-  connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
-  connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)),
-           this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &)));
-  connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
-  connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)),
-           this,TQT_SLOT(changeTabTextColor(TESession*, int)));
+  connect( s,TQ_SIGNAL(done(TESession*)),
+           this,TQ_SLOT(doneSession(TESession*)));
+  connect( s, TQ_SIGNAL(updateTitle(TESession*)),
+           this, TQ_SLOT(updateTitle(TESession*)));
+  connect( s, TQ_SIGNAL(notifySessionState(TESession*, int)),
+           this, TQ_SLOT(notifySessionState(TESession*, int)));
+  connect( s, TQ_SIGNAL(disableMasterModeConnections()),
+           this, TQ_SLOT(disableMasterModeConnections()));
+  connect( s, TQ_SIGNAL(enableMasterModeConnections()),
+           this, TQ_SLOT(enableMasterModeConnections()));
+  connect( s, TQ_SIGNAL(renameSession(TESession*,const TQString&)),
+           this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)));
+  connect( s->getEmulation(), TQ_SIGNAL(changeColumns(int)),
+           this, TQ_SLOT(changeColumns(int)) );
+  connect( s->getEmulation(), TQ_SIGNAL(changeColLin(int,int)),
+           this, TQ_SLOT(changeColLin(int,int)));
+  connect( s->getEmulation(), TQ_SIGNAL(ImageSizeChanged(int,int)),
+           this, TQ_SLOT(notifySize(int,int)));
+  connect( s, TQ_SIGNAL(zmodemDetected(TESession*)),
+           this, TQ_SLOT(slotZModemDetected(TESession*)));
+  connect( s, TQ_SIGNAL(updateSessionConfig(TESession*)),
+           this, TQ_SLOT(slotUpdateSessionConfig(TESession*)));
+  connect( s, TQ_SIGNAL(resizeSession(TESession*, TQSize)),
+           this, TQ_SLOT(slotResizeSession(TESession*, TQSize)));
+  connect( s, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
+  connect( s, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)),
+           this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &)));
+  connect( s, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
+  connect( s, TQ_SIGNAL(changeTabTextColor(TESession*, int)),
+           this,TQ_SLOT(changeTabTextColor(TESession*, int)));
 
   s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession
   s->setSchemaNo(schmno);
@@ -3048,7 +3048,7 @@ void Konsole::newSession(const TQString& sURL, const TQString& title)
 
    KURL url = KURL(sURL);
    if ((url.protocol() == "file") && (url.hasPath())) {
-     KSimpleConfig *co = defaultSession();
+     TDESimpleConfig *co = defaultSession();
      path = url.path();
      newSession(co, TQString::null, TQStrList(), TQString::null, TQString::null,
                 title.isEmpty() ? path : title, path);
@@ -3149,7 +3149,7 @@ void Konsole::doneSession(TESession* s)
       //       Since the timer approach only works at good weather,
       //       the whole construction is not suited to what it
       //       should do. Affected is the TEEmulation::setConnect.
-      TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
+      TQTimer::singleShot(1,this,TQ_SLOT(activateSession()));
     }
     else
       close();
@@ -3394,7 +3394,7 @@ void Konsole::buildSessionMenus()
 
    createSessionMenus();
 
-   if (kapp->authorizeTDEAction("file_print"))
+   if (tdeApp->authorizeTDEAction("file_print"))
    {
       m_session->insertSeparator();
       m_print->plug(m_session);
@@ -3433,11 +3433,11 @@ static void insertItemSorted(TDEPopupMenu *menu, const TQIconSet &iconSet, const
 
 void Konsole::addSessionCommand(const TQString &path)
 {
-  KSimpleConfig* co;
+  TDESimpleConfig* co;
   if (path.isEmpty())
-    co = new KSimpleConfig(locate("appdata", "shell.desktop"), true /* read only */);
+    co = new TDESimpleConfig(locate("appdata", "shell.desktop"), true /* read only */);
   else
-    co = new KSimpleConfig(path,true);
+    co = new TDESimpleConfig(path,true);
   co->setDesktopGroup();
   TQString typ = co->readEntry("Type");
   TQString txt = co->readEntry("Name");
@@ -3480,9 +3480,9 @@ void Konsole::addSessionCommand(const TQString &path)
   if ( m_shortcuts->action( name.latin1() ) ) {
     sessionAction = m_shortcuts->action( name.latin1() );
   } else {
-    sessionAction = new TDEAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() );
+    sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() );
   }
-  connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) );
+  connect( sessionAction, TQ_SIGNAL( activated() ), sessionNumberMapper, TQ_SLOT( map() ) );
   sessionNumberMapper->setMapping( sessionAction, cmd_serial );
 
 }
@@ -3494,7 +3494,7 @@ void Konsole::loadSessionCommands()
   cmd_serial = 99;
   cmd_first_screen = -1;
 
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
      return;
 
   addSessionCommand(TQString::null);
@@ -3518,7 +3518,7 @@ void Konsole::createSessionMenus()
     return;
   }
 
-  KSimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID];
+  TDESimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID];
   TQString txt = cfg->readEntry("Name");
   TQString icon = cfg->readEntry("Icon", "konsole");
   insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon),
@@ -3536,7 +3536,7 @@ void Konsole::createSessionMenus()
   m_session->insertSeparator();
   m_tabbarSessionsCommands->insertSeparator();
 
-  TQIntDictIterator<KSimpleConfig> it( no2command );
+  TQIntDictIterator<TDESimpleConfig> it( no2command );
   for ( ; it.current(); ++it ) {
     if ( it.currentKey() == SESSION_NEW_SHELL_ID )
       continue;
@@ -3567,7 +3567,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
 {
   KTempFile *tmpFile = new KTempFile();
   tmpFile->setAutoDelete(true);
-  KSimpleConfig *co = new KSimpleConfig(tmpFile->name());
+  TDESimpleConfig *co = new TDESimpleConfig(tmpFile->name());
   co->setDesktopGroup();
   co->writeEntry("Name", socket);
   TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket);
@@ -3583,7 +3583,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
 
 void Konsole::loadScreenSessions()
 {
-  if (!kapp->authorize("shell_access"))
+  if (!tdeApp->authorize("shell_access"))
      return;
   TQCString screenDir = getenv("SCREENDIR");
   if (screenDir.isEmpty())
@@ -3752,31 +3752,31 @@ void Konsole::detachSession(TESession* _se) {
       TESession *from = from_it.current();
       if(from->isMasterMode())
       {
-        disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)),
-	            _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*)));
-        disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
-              _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*)));
-        disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)),
-              _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*)));
+        disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)),
+	            _se->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*)));
+        disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)),
+              _se->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*)));
+        disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)),
+              _se->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*)));
       }
     }
   }
 
   TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() );
 
-  disconnect( _se,TQT_SIGNAL(done(TESession*)),
-              this,TQT_SLOT(doneSession(TESession*)) );
+  disconnect( _se,TQ_SIGNAL(done(TESession*)),
+              this,TQ_SLOT(doneSession(TESession*)) );
 
-  disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int)));
-  disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) );
-  disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) );
-  disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) );
+  disconnect( _se->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int)));
+  disconnect( _se->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) );
+  disconnect( _se->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) );
+  disconnect( _se, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) );
 
-  disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) );
-  disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) );
-  disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) );
-  disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) );
-  disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) );
+  disconnect( _se,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) );
+  disconnect( _se,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) );
+  disconnect( _se,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) );
+  disconnect( _se,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) );
+  disconnect( _se,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) );
 
   // TODO: "type" isn't passed properly
   Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis,
@@ -3800,7 +3800,7 @@ void Konsole::detachSession(TESession* _se) {
     else
       se = sessions.at(sessionIndex ? sessionIndex - 1 : 0);
     session2action.find(se)->setChecked(true);
-    TQTimer::singleShot(1,this,TQT_SLOT(activateSession()));
+    TQTimer::singleShot(1,this,TQ_SLOT(activateSession()));
   }
 
   if (sessions.count()==1)
@@ -3828,8 +3828,8 @@ void Konsole::attachSession(TESession* session)
 
   te=new TEWidget(tabwidget);
 
-  connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)),
-           this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
+  connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)),
+           this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) );
 
   te->resize(se_widget->size());
   te->setSize(se_widget->Columns(), se_widget->Lines());
@@ -3845,7 +3845,7 @@ void Konsole::attachSession(TESession* session)
 
   TQString title=session->Title();
   TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(),
-                                      0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts);
+                                      0, this, TQ_SLOT(activateSession()), m_shortcuts);
 
   ra->setExclusiveGroup("sessions");
   ra->setChecked(true);
@@ -3859,20 +3859,20 @@ void Konsole::attachSession(TESession* session)
   if (m_menuCreated)
     ra->plug(m_view);
 
-  connect( session,TQT_SIGNAL(done(TESession*)),
-           this,TQT_SLOT(doneSession(TESession*)) );
+  connect( session,TQ_SIGNAL(done(TESession*)),
+           this,TQ_SLOT(doneSession(TESession*)) );
 
-  connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) );
-  connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) );
+  connect( session,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) );
+  connect( session,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) );
 
-  connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) );
-  connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) );
-  connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) );
-  connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int)));
-  connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) );
-  connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) );
+  connect( session,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) );
+  connect( session,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) );
+  connect( session,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) );
+  connect( session->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int)));
+  connect( session->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) );
+  connect( session->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) );
 
-  connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) );
+  connect( session, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) );
 
   activateSession(session);
 }
@@ -3934,7 +3934,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
   TQHBoxLayout *hb = new TQHBoxLayout(mainFrame);
 
   m_btnEnable    = new TQCheckBox(i18n("&Enable"), mainFrame);
-  connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool)));
+  connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHistEnable(bool)));
 
   m_label = new TQLabel(i18n("&Number of lines: "), mainFrame);
 
@@ -3945,7 +3945,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
   m_label->setBuddy( m_size );
 
   m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame);
-  connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) );
+  connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) );
 
   hb->addWidget(m_btnEnable);
   hb->addSpacing(10);
@@ -4039,8 +4039,8 @@ void Konsole::slotFindHistory()
 {
   if( !m_finddialog ) {
     m_finddialog = new KonsoleFind( this, "konsolefind", false);
-    connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind()));
-    connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone()));
+    connect(m_finddialog,TQ_SIGNAL(search()),this,TQ_SLOT(slotFind()));
+    connect(m_finddialog,TQ_SIGNAL(done()),this,TQ_SLOT(slotFindDone()));
   }
 
   TQString string;
@@ -4059,7 +4059,7 @@ void Konsole::slotOpenSelection()
   delete m_filterData;
 
   m_openSelection->clear();
-  disconnect(m_openSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenURI(int)));
+  disconnect(m_openSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenURI(int)));
 
   TQString selection = se->getEmulation()->getSelection();
   TQString curdir = baseURL().path();
@@ -4074,7 +4074,7 @@ void Konsole::slotOpenSelection()
   KURIFilter::self()->filterURI( *(m_filterData) );
   m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 );
 
-  connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int)));
+  connect(m_openSelection, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenURI(int)));
 }
 
 void Konsole::slotOpenURI(int)
@@ -4230,7 +4230,7 @@ void Konsole::slotZModemUpload()
 
 void Konsole::slotZModemDetected(TESession *session)
 {
-  if (!kapp->authorize("zmodem_download")) return;
+  if (!tdeApp->authorize("zmodem_download")) return;
 
   if(se != session)
     activateSession(session);
@@ -4345,8 +4345,8 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
 
   if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
     m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" );
-    connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) );
-    connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) );
+    connect( m_asRegExp, TQ_SIGNAL( toggled(bool) ), m_editRegExp, TQ_SLOT( setEnabled(bool) ) );
+    connect( m_editRegExp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditRegExp() ) );
     m_editRegExp->setEnabled( false );
   }
 }
@@ -4354,7 +4354,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
 void KonsoleFind::slotEditRegExp()
 {
   if ( m_editorDialog == 0 )
-    m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+    m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
 
   assert( m_editorDialog );
 
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index b5e1f926b..7af520661 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -28,7 +28,7 @@
 
 #include <tdemainwindow.h>
 #include <kdialogbase.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <keditcl.h>
 
 #include <twinmodule.h>
@@ -257,8 +257,8 @@ private slots:
 
   void slotSetEncoding();
 private:
-  KSimpleConfig *defaultSession();
-  TQString newSession(KSimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(),
+  TDESimpleConfig *defaultSession();
+  TQString newSession(TDESimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(),
                      const TQString &_term = TQString::null, const TQString &_icon = TQString::null,
                      const TQString &_title = TQString::null, const TQString &_cwd = TQString::null);
   void readProperties(TDEConfig *config, const TQString &schema, bool globalConfigOnly);
@@ -298,9 +298,9 @@ private:
   TQPtrDict<TDERadioAction> session2action;
   TQPtrList<TESession> sessions;
 
-  TQIntDict<KSimpleConfig> no2command;
+  TQIntDict<TDESimpleConfig> no2command;
 
-  KSimpleConfig* m_defaultSession;
+  TDESimpleConfig* m_defaultSession;
   TQString m_defaultSessionFilename;
 
   KTabWidget* tabwidget;
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 5e1379a4e..ca275d40b 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -39,7 +39,7 @@
 #include <krun.h>
 #include <kstdaction.h>
 #include <tqlabel.h>
-#include <kprocctrl.h>
+#include <tdeprocctrl.h>
 
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
@@ -151,10 +151,10 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
   te = new TEWidget(parentWidget,widgetName);
   te->setMinimumSize(150,70);    // allow resizing, cause resize in TEWidget
 
-  setWidget(TQT_TQWIDGET(te));
+  setWidget(te);
   te->setFocus();
-  connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)),
-           this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
+  connect( te,TQ_SIGNAL(configureRequest(TEWidget*,int,int,int)),
+           this,TQ_SLOT(configureRequest(TEWidget*,int,int,int)) );
 
   colors = new ColorSchemaList();
   colors->checkSchemas();
@@ -214,7 +214,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
 
   applySettingsToGUI();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( autoShowShell() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( autoShowShell() ) );
 }
 
 void konsolePart::autoShowShell()
@@ -240,10 +240,10 @@ void konsolePart::doneSession(TESession*)
   if (se && b_autoDestroy)
   {
 //    kdDebug(1211) << "doneSession - disconnecting done" << endl;
-    disconnect( se,TQT_SIGNAL(done(TESession*)),
-                this,TQT_SLOT(doneSession(TESession*)) );
+    disconnect( se,TQ_SIGNAL(done(TESession*)),
+                this,TQ_SLOT(doneSession(TESession*)) );
     se->setConnect(false);
-    //TQTimer::singleShot(100,se,TQT_SLOT(terminate()));
+    //TQTimer::singleShot(100,se,TQ_SLOT(terminate()));
 //    kdDebug(1211) << "se->terminate()" << endl;
     se->terminate();
   }
@@ -252,7 +252,7 @@ void konsolePart::doneSession(TESession*)
 void konsolePart::sessionDestroyed()
 {
 //  kdDebug(1211) << "sessionDestroyed()" << endl;
-  disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
+  disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) );
   se = 0;
   if (b_autoDestroy)
       delete this;
@@ -275,7 +275,7 @@ konsolePart::~konsolePart()
     while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1))
         ;
 
-    disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
+    disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) );
 //    kdDebug(1211) << "Deleting se session" << endl;
     delete se;
     se=0;
@@ -325,14 +325,14 @@ void konsolePart::emitOpenURLRequest(const TQString &cwd)
 
 void konsolePart::makeGUI()
 {
-  if (!kapp->authorizeTDEAction("konsole_rmb"))
+  if (!tdeApp->authorizeTDEAction("konsole_rmb"))
      return;
 
   actions = new TDEActionCollection( (TDEMainWindow*)parentWidget );
   settingsActions = new TDEActionCollection( (TDEMainWindow*)parentWidget );
 
   // Send Signal Menu -------------------------------------------------------------
-  if (kapp->authorizeTDEAction("send_signal"))
+  if (tdeApp->authorizeTDEAction("send_signal"))
   {
      m_signals = new TDEPopupMenu((TDEMainWindow*)parentWidget);
      m_signals->insertItem( i18n( "&Suspend Task" )   + " (STOP)", SIGSTOP);
@@ -343,17 +343,17 @@ void konsolePart::makeGUI()
      m_signals->insertItem( i18n( "&Kill Task" )      + " (KILL)",  SIGKILL);
      m_signals->insertItem( i18n( "User Signal &1")   + " (USR1)", SIGUSR1);
      m_signals->insertItem( i18n( "User Signal &2")   + " (USR2)", SIGUSR2);
-     connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int)));
+     connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int)));
   }
 
   // Settings Menu ----------------------------------------------------------------
-  if (kapp->authorizeTDEAction("settings"))
+  if (tdeApp->authorizeTDEAction("settings"))
   {
      m_options = new TDEPopupMenu((TDEMainWindow*)parentWidget);
 
      // Scrollbar
      selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this,
-                                      TQT_SLOT(slotSelectScrollbar()), settingsActions);
+                                      TQ_SLOT(slotSelectScrollbar()), settingsActions);
 
      TQStringList scrollitems;
      scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
@@ -363,7 +363,7 @@ void konsolePart::makeGUI()
      // Select Bell
      m_options->insertSeparator();
      selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
-                                 TQT_SLOT(slotSelectBell()), settingsActions, "bell");
+                                 TQ_SLOT(slotSelectBell()), settingsActions, "bell");
 
      TQStringList bellitems;
      bellitems << i18n("System &Bell")
@@ -374,13 +374,13 @@ void konsolePart::makeGUI()
      selectBell->plug(m_options);
 
       m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L );
-      m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) );
-      m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) );
-      m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) );
+      m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQ_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) );
+      m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQ_SLOT( smallerFont() ), settingsActions, "shrink_font" ) );
+      m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQ_SLOT( slotSelectFont() ), settingsActions, "select_font" ) );
       m_fontsizes->plug(m_options);
 
       // encoding menu, start with default checked !
-      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
+      selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQ_SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
       TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
       list.prepend( i18n( "Default" ) );
       selectSetEncoding->setItems(list);
@@ -388,34 +388,34 @@ void konsolePart::makeGUI()
       selectSetEncoding->plug(m_options);
 
      // Keyboard Options Menu ---------------------------------------------------
-     if (kapp->authorizeTDEAction("keyboard"))
+     if (tdeApp->authorizeTDEAction("keyboard"))
      {
         m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget);
         m_keytab->setCheckable(true);
-        connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int)));
+        connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int)));
         m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab );
      }
 
      // Schema Options Menu -----------------------------------------------------
-     if (kapp->authorizeTDEAction("schema"))
+     if (tdeApp->authorizeTDEAction("schema"))
      {
         m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget);
         m_schema->setCheckable(true);
-        connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int)));
-        connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check()));
+        connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int)));
+        connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check()));
         m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema);
      }
 
 
      TDEAction *historyType = new TDEAction(i18n("&History..."), "history", 0, this,
-                                        TQT_SLOT(slotHistoryType()), settingsActions, "history");
+                                        TQ_SLOT(slotHistoryType()), settingsActions, "history");
      historyType->plug(m_options);
      m_options->insertSeparator();
 
      // Select line spacing
      selectLineSpacing = new TDESelectAction(i18n("Li&ne Spacing"),
         SmallIconSet("format-justify-left"), 0, this,
-        TQT_SLOT(slotSelectLineSpacing()), settingsActions );
+        TQ_SLOT(slotSelectLineSpacing()), settingsActions );
 
      TQStringList lineSpacingList;
      lineSpacingList
@@ -433,35 +433,35 @@ void konsolePart::makeGUI()
 
      // Blinking Cursor
      blinkingCursor = new TDEToggleAction (i18n("Blinking &Cursor"),
-                                      0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions);
+                                      0, this,TQ_SLOT(slotBlinkingCursor()), settingsActions);
      blinkingCursor->plug(m_options);
 
      // Frame on/off
      showFrame = new TDEToggleAction(i18n("Show Fr&ame"), 0,
-                                this, TQT_SLOT(slotToggleFrame()), settingsActions);
+                                this, TQ_SLOT(slotToggleFrame()), settingsActions);
      showFrame->setCheckedState(i18n("Hide Fr&ame"));
      showFrame->plug(m_options);
 
      // Meta key as Alt key
      metaAsAlt = new TDEToggleAction(i18n("Me&ta key as Alt key"), 0,
-                                this, TQT_SLOT(slotToggleMetaAsAltMode()), settingsActions);
+                                this, TQ_SLOT(slotToggleMetaAsAltMode()), settingsActions);
      metaAsAlt->plug(m_options);
 
      // Word Connectors
      TDEAction *WordSeps = new TDEAction(i18n("Wor&d Connectors..."), 0, this,
-                                  TQT_SLOT(slotWordSeps()), settingsActions);
+                                  TQ_SLOT(slotWordSeps()), settingsActions);
      WordSeps->plug(m_options);
 
      // Use Konsole's Settings
      m_options->insertSeparator();
      m_useKonsoleSettings = new TDEToggleAction( i18n("&Use Konsole's Settings"),
-                          0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" );
+                          0, this, TQ_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" );
      m_useKonsoleSettings->plug(m_options);
 
      // Save Settings
      m_options->insertSeparator();
      TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, 
-                    TQT_SLOT(saveProperties()), actions, "save_default");
+                    TQ_SLOT(saveProperties()), actions, "save_default");
      saveSettings->plug(m_options);
      if (TDEGlobalSettings::insertTearOffHandle())
         m_options->insertTearOffHandle();
@@ -469,16 +469,16 @@ void konsolePart::makeGUI()
 
   // Popup Menu -------------------------------------------------------------------
   m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget);
-  TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te),
-                               TQT_SLOT(setSelectionEnd()), actions, "selection_end");
+  TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, te,
+                               TQ_SLOT(setSelectionEnd()), actions, "selection_end");
   selectionEnd->plug(m_popupMenu);
 
   TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0,
-                                        TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy");
+                                        te, TQ_SLOT(copyClipboard()), actions, "edit_copy");
   copyClipboard->plug(m_popupMenu);
 
   TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0,
-                                        TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste");
+                                        te, TQ_SLOT(pasteClipboard()), actions, "edit_paste");
   pasteClipboard->plug(m_popupMenu);
 
   if (m_signals)
@@ -494,7 +494,7 @@ void konsolePart::makeGUI()
   }
 
   TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "window-close", 0, this,
-                                      TQT_SLOT(closeCurrentSession()), actions, "close_session");
+                                      TQ_SLOT(closeCurrentSession()), actions, "close_session");
   closeSession->plug(m_popupMenu);
   if (TDEGlobalSettings::insertTearOffHandle())
     m_popupMenu->insertTearOffHandle();
@@ -608,7 +608,7 @@ void konsolePart::readProperties()
   if (sch->useTransparency()) {
     if (!argb_visual) {
       if (!rootxpm)
-        rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
+        rootxpm = new KRootPixmap(te);
       rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
       rootxpm->start();
       rootxpm->repaint(true);
@@ -796,7 +796,7 @@ void konsolePart::setSchema(ColorSchema* s)
   if (s->useTransparency()) {
     if (!argb_visual) {
       if (!rootxpm)
-        rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
+        rootxpm = new KRootPixmap(te);
       rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
       rootxpm->start();
       rootxpm->repaint(true);
@@ -1011,15 +1011,15 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType,
 
   m_btnEnable    = new TQCheckBox(i18n("&Enable"), mainFrame);
 
-  TQObject::connect(m_btnEnable, TQT_SIGNAL(toggled(bool)),
-                   this,      TQT_SLOT(slotHistEnable(bool)));
+  TQObject::connect(m_btnEnable, TQ_SIGNAL(toggled(bool)),
+                   this,      TQ_SLOT(slotHistEnable(bool)));
 
   m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame);
   m_size->setValue(histSize);
   m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited"));
 
   m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame);
-  connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) );
+  connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) );
 
   hb->addWidget(m_btnEnable);
   hb->addSpacing(10);
@@ -1121,42 +1121,42 @@ void konsolePart::newSession()
   {
     se = new TESession(te, "xterm", parentWidget->winId());
   }
-  connect( se,TQT_SIGNAL(done(TESession*)),
-           this,TQT_SLOT(doneSession(TESession*)) );
-  connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),
-           this,TQT_SLOT(emitOpenURLRequest(const TQString &)) );
-  connect( se, TQT_SIGNAL( updateTitle(TESession*) ),
-           this, TQT_SLOT( updateTitle(TESession*) ) );
-  connect( se, TQT_SIGNAL(enableMasterModeConnections()),
-           this, TQT_SLOT(enableMasterModeConnections()) );
-  connect( se, TQT_SIGNAL( processExited(TDEProcess *) ),
-           this, TQT_SIGNAL( processExited(TDEProcess *) ) );
-  connect( se, TQT_SIGNAL( receivedData( const TQString& ) ),
-           this, TQT_SIGNAL( receivedData( const TQString& ) ) );
-  connect( se, TQT_SIGNAL( forkedChild() ),
-           this, TQT_SIGNAL( forkedChild() ));
-  connect( se, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)),
-           this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &)));
-  connect( se, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
-  connect( se, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
-           this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
-  connect( se, TQT_SIGNAL(updateSessionKeytab(TESession *, const TQString &)),
-           this, TQT_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &)));
+  connect( se,TQ_SIGNAL(done(TESession*)),
+           this,TQ_SLOT(doneSession(TESession*)) );
+  connect( se,TQ_SIGNAL(openURLRequest(const TQString &)),
+           this,TQ_SLOT(emitOpenURLRequest(const TQString &)) );
+  connect( se, TQ_SIGNAL( updateTitle(TESession*) ),
+           this, TQ_SLOT( updateTitle(TESession*) ) );
+  connect( se, TQ_SIGNAL(enableMasterModeConnections()),
+           this, TQ_SLOT(enableMasterModeConnections()) );
+  connect( se, TQ_SIGNAL( processExited(TDEProcess *) ),
+           this, TQ_SIGNAL( processExited(TDEProcess *) ) );
+  connect( se, TQ_SIGNAL( receivedData( const TQString& ) ),
+           this, TQ_SIGNAL( receivedData( const TQString& ) ) );
+  connect( se, TQ_SIGNAL( forkedChild() ),
+           this, TQ_SIGNAL( forkedChild() ));
+  connect( se, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)),
+           this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &)));
+  connect( se, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
+  connect( se, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
+           this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
+  connect( se, TQ_SIGNAL(updateSessionKeytab(TESession *, const TQString &)),
+           this, TQ_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &)));
 
   // We ignore the following signals
-  //connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)),
-  //         this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) );
-  //connect( se->getEmulation(), TQT_SIGNAL(changeColumns(int)),
-  //         this, TQT_SLOT(changeColumns(int)) );
-  //connect( se, TQT_SIGNAL(disableMasterModeConnections()),
-  //        this, TQT_SLOT(disableMasterModeConnections()) );
+  //connect( se, TQ_SIGNAL(renameSession(TESession*,const TQString&)),
+  //         this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)) );
+  //connect( se->getEmulation(), TQ_SIGNAL(changeColumns(int)),
+  //         this, TQ_SLOT(changeColumns(int)) );
+  //connect( se, TQ_SIGNAL(disableMasterModeConnections()),
+  //        this, TQ_SLOT(disableMasterModeConnections()) );
 
   applyProperties();
 
   se->setConnect(true);
   // se->run();
-  connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
+  connect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) );
 //  setFont( n_font ); // we do this here, to make TEWidget recalculate
                      // its geometry..
 }
diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp
index 098cd16d4..5159dfca7 100644
--- a/konsole/konsole/konsole_wcwidth.cpp
+++ b/konsole/konsole/konsole_wcwidth.cpp
@@ -213,7 +213,7 @@ int string_width( const TQString &txt )
 {
   int w = 0;
 
-  for ( uint i = 1; i < txt.length(); ++i ) {
+  for ( uint i = 0; i < txt.length(); ++i ) {
     w += konsole_wcwidth(txt[i].unicode());
   }
  return w;
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 13af12ca5..8316455ac 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -19,7 +19,7 @@
 // Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
 
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kshell.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
@@ -55,12 +55,12 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
         m_file = locateLocal( "data", "konsole/bookmarks.xml" );
 
     KBookmarkManager *manager = KBookmarkManager::managerForFile( m_file, false);
-    manager->setEditorOptions(kapp->caption(), false);
+    manager->setEditorOptions(tdeApp->caption(), false);
     manager->setUpdate( true );
     manager->setShowNSBookmarks( false );
     
-    connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
+    connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
 
     if (toplevel) {
         m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 77b86882b..d52175b0e 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaction.h>
 
 #include "konsole.h"
@@ -36,14 +36,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
     /*
      * First, we disconnect KBookmarkMenu::slotAboutToShow()
      * Then,  we connect    KonsoleBookmarkMenu::slotAboutToShow().
-     * They are named differently because the TQT_SLOT() macro thinks we want
+     * They are named differently because the TQ_SLOT() macro thinks we want
      * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
      * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
      */
-    disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
-                TQT_SLOT( slotAboutToShow() ) );
-    connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
-             TQT_SLOT( slotAboutToShow2() ) );
+    disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this,
+                TQ_SLOT( slotAboutToShow() ) );
+    connect( _parentMenu, TQ_SIGNAL( aboutToShow() ),
+             TQ_SLOT( slotAboutToShow2() ) );
 }
 
 /*
@@ -113,7 +113,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
         // create a normal URL item, with ID as a name
         TDEAction * action = new TDEAction( text, bm.icon(), 0,
-                                        this, TQT_SLOT( slotBookmarkSelected() ),
+                                        this, TQ_SLOT( slotBookmarkSelected() ),
                                         m_actionCollection, bm.url().url().utf8() );
 
         action->setStatusText( bm.url().prettyURL() );
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 56d21882e..6aea6d6a4 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -34,13 +34,12 @@
 #include <dcopclient.h>
 #include <tqsocketnotifier.h>
 
-// KDE 
-#include <kuniqueapplication.h>
+// TDE 
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
 #include <tdeglobalsettings.h>
 #include <kdebug.h>
-#include <kcrash.h>
+#include <tdecrash.h>
 #include <kpty.h>
 #include <kuser.h>
 #include <tdeglobal.h>
@@ -79,8 +78,8 @@ KWrited::KWrited() : TQTextEdit()
   pty = new KPty();
   pty->open();
   pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY"));
-  TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, TQT_TQOBJECT(this));
-  connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int)));
+  TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this);
+  connect(sn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(block_in(int)));
 
   TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName());
   setCaption(txt);
@@ -116,7 +115,7 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos )
    TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos );
 
    menu->insertItem( i18n( "Clear Messages" ),
-                     this, TQT_SLOT( clearText() ), 
+                     this, TQ_SLOT( clearText() ), 
                      0, -1, 0 );
 
    return menu;
@@ -136,7 +135,7 @@ KWritedModule::~KWritedModule()
 }
 
 extern "C"
-KDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj )
+TDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj )
     {
     return new KWritedModule( obj );
     }
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 4039362e3..21bbbe66c 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -37,7 +37,7 @@
 #include <tdecmdlineargs.h>
 #include <kimageio.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdeio/netaccess.h>
 #include <tdemessagebox.h>
@@ -46,7 +46,7 @@
 
 #include "konsole.h"
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
@@ -150,7 +150,7 @@ public:
 
 
 /* --| main |------------------------------------------------------ */
-extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
+extern "C" int TDE_EXPORT kdemain(int argc, char* argv[])
 {
   setgid(getgid()); setuid(getuid()); // drop privileges
 
@@ -289,7 +289,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
        eargs.append( args->arg(i) );
 
      if (title.isEmpty() &&
-         (kapp->caption() == kapp->aboutData()->programName()))
+         (tdeApp->caption() == tdeApp->aboutData()->programName()))
      {
         title = TQFile::decodeName(shell);  // program executed in the title bar
      }
@@ -413,7 +413,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
     }
   }
 
-  if (!kapp->authorizeTDEAction("size"))
+  if (!tdeApp->authorizeTDEAction("size"))
     fixed_size = true;
 
   // ///////////////////////////////////////////////
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 8778a1ee9..cf80136f3 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -55,7 +55,7 @@
 
 #include <tqdir.h>
 #include <tqdatetime.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile()
         if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
         if (!(0 <= tr && tr <= 1           )) continue;
         if (!(0 <= bo && bo <= 1           )) continue;
-        m_table[fi].color       = kapp->palette().active().text();
+        m_table[fi].color       = tdeApp->palette().active().text();
         m_table[fi].transparent = tr;
         m_table[fi].bold        = bo;
       }
@@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile()
         if (!(0 <= fi && fi <= TABLE_COLORS)) continue;
         if (!(0 <= tr && tr <= 1           )) continue;
         if (!(0 <= bo && bo <= 1           )) continue;
-        m_table[fi].color       = kapp->palette().active().base();
+        m_table[fi].color       = tdeApp->palette().active().base();
         m_table[fi].transparent = tr;
         m_table[fi].bold        = bo;
       }
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index dcfe9fee4..4a3b1975e 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -26,10 +26,10 @@
 #include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <tdelocale.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 #include <krun.h>
 #include <kshell.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <stdlib.h>
 #include <tqfile.h>
@@ -78,10 +78,10 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T
   em = new TEmuVt102(te);
   font_h = te-> fontHeight();
   font_w = te-> fontWidth();
-  TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
-                   this,TQT_SLOT(onContentSizeChange(int,int)));
-  TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
-                   this,TQT_SLOT(onFontMetricChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)),
+                   this,TQ_SLOT(onContentSizeChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)),
+                   this,TQ_SLOT(onFontMetricChange(int,int)));
 
   term = _term;
   winId = _winId;
@@ -89,17 +89,17 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T
 
   setPty( new TEPty() );
 
-  connect( em, TQT_SIGNAL( changeTitle( int, const TQString & ) ),
-           this, TQT_SLOT( setUserTitle( int, const TQString & ) ) );
-  connect( em, TQT_SIGNAL( notifySessionState(int) ),
-           this, TQT_SLOT( notifySessionState(int) ) );
+  connect( em, TQ_SIGNAL( changeTitle( int, const TQString & ) ),
+           this, TQ_SLOT( setUserTitle( int, const TQString & ) ) );
+  connect( em, TQ_SIGNAL( notifySessionState(int) ),
+           this, TQ_SLOT( notifySessionState(int) ) );
   monitorTimer = new TQTimer(this);
-  connect(monitorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(monitorTimerDone()));
+  connect(monitorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(monitorTimerDone()));
 
-  connect( em, TQT_SIGNAL( zmodemDetected() ), this, TQT_SLOT(slotZModemDetected()));
+  connect( em, TQ_SIGNAL( zmodemDetected() ), this, TQ_SLOT(slotZModemDetected()));
 
-  connect( em, TQT_SIGNAL( changeTabTextColor( int ) ),
-           this, TQT_SLOT( changeTabTextColor( int ) ) );
+  connect( em, TQ_SIGNAL( changeTabTextColor( int ) ),
+           this, TQ_SLOT( changeTabTextColor( int ) ) );
 
   //kdDebug(1211)<<"TESession ctor() done"<<endl;
 }
@@ -110,23 +110,23 @@ void TESession::setPty(TEPty *_sh)
     delete sh;
   }
   sh = _sh;
-  connect( sh, TQT_SIGNAL( forkedChild() ),
-           this, TQT_SIGNAL( forkedChild() ));
+  connect( sh, TQ_SIGNAL( forkedChild() ),
+           this, TQ_SIGNAL( forkedChild() ));
 
   //kdDebug(1211)<<"TESession ctor() sh->setSize()"<<endl;
   sh->setSize(te->Lines(),te->Columns()); // not absolutely nessesary
   sh->useUtf8(em->utf8());
   //kdDebug(1211)<<"TESession ctor() connecting"<<endl;
-  connect( sh,TQT_SIGNAL(block_in(const char*,int)),this,TQT_SLOT(onRcvBlock(const char*,int)) );
+  connect( sh,TQ_SIGNAL(block_in(const char*,int)),this,TQ_SLOT(onRcvBlock(const char*,int)) );
 
-  connect( em,TQT_SIGNAL(sndBlock(const char*,int)),sh,TQT_SLOT(send_bytes(const char*,int)) );
-  connect( em,TQT_SIGNAL(lockPty(bool)),sh,TQT_SLOT(lockPty(bool)) );
-  connect( em,TQT_SIGNAL(useUtf8(bool)),sh,TQT_SLOT(useUtf8(bool)) );
+  connect( em,TQ_SIGNAL(sndBlock(const char*,int)),sh,TQ_SLOT(send_bytes(const char*,int)) );
+  connect( em,TQ_SIGNAL(lockPty(bool)),sh,TQ_SLOT(lockPty(bool)) );
+  connect( em,TQ_SIGNAL(useUtf8(bool)),sh,TQ_SLOT(useUtf8(bool)) );
 
-  connect( sh,TQT_SIGNAL(done(int)), this,TQT_SLOT(done(int)) );
+  connect( sh,TQ_SIGNAL(done(int)), this,TQ_SLOT(done(int)) );
 
   if (!sh->error().isEmpty())
-     TQTimer::singleShot(0, this, TQT_SLOT(ptyError()));
+     TQTimer::singleShot(0, this, TQ_SLOT(ptyError()));
 }
 
 void TESession::ptyError()
@@ -143,10 +143,10 @@ void TESession::ptyError()
 
 void TESession::changeWidget(TEWidget* w)
 {
-  TQObject::disconnect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
-                     this,TQT_SLOT(onContentSizeChange(int,int)));
-  TQObject::disconnect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
-                     this,TQT_SLOT(onFontMetricChange(int,int)));
+  TQObject::disconnect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)),
+                     this,TQ_SLOT(onContentSizeChange(int,int)));
+  TQObject::disconnect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)),
+                     this,TQ_SLOT(onFontMetricChange(int,int)));
   te=w;
   em->changeGUI(w);
   font_h = te->fontHeight();
@@ -155,10 +155,10 @@ void TESession::changeWidget(TEWidget* w)
 
   te->setDefaultBackColor(modifiedBackground);
 
-  TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)),
-                   this,TQT_SLOT(onContentSizeChange(int,int)));
-  TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)),
-                   this,TQT_SLOT(onFontMetricChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)),
+                   this,TQ_SLOT(onContentSizeChange(int,int)));
+  TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)),
+                   this,TQ_SLOT(onFontMetricChange(int,int)));
 }
 
 void TESession::setProgram( const TQString &_pgm, const TQStrList &_args )
@@ -177,11 +177,11 @@ void TESession::run()
   TQString pexec = TDEGlobal::dirs()->findExe(exec);
   if ( pexec.isEmpty() ) {
     kdError()<<"can not execute "<<exec<<endl;
-    TQTimer::singleShot(1, this, TQT_SLOT(done()));
+    TQTimer::singleShot(1, this, TQ_SLOT(done()));
     return;
   }
 
-  TQString appId=kapp->dcopClient()->appId();
+  TQString appId=tdeApp->dcopClient()->appId();
 
   TQString cwd_save = TQDir::currentDirPath();
   if (!initial_cwd.isEmpty())
@@ -194,7 +194,7 @@ void TESession::run()
           ("DCOPRef("+appId+","+sessionId+")").latin1());
   if (result < 0) {     // Error in opening pseudo teletype
     kdWarning()<<"Unable to open a pseudo teletype!"<<endl;
-    TQTimer::singleShot(0, this, TQT_SLOT(ptyError()));
+    TQTimer::singleShot(0, this, TQ_SLOT(ptyError()));
   }
   sh->setErase(em->getErase());
 
@@ -311,7 +311,7 @@ bool TESession::closeSession()
   if (!sh->isRunning() || !sendSignal(SIGHUP))
   {
      // Forced close.
-     TQTimer::singleShot(1, this, TQT_SLOT(done()));
+     TQTimer::singleShot(1, this, TQ_SLOT(done()));
   }
   return true;
 }
@@ -341,8 +341,8 @@ void TESession::renameSession(const TQString &name)
 TESession::~TESession()
 {
  //kdDebug(1211) << "disconnnecting..." << endl;
-  TQObject::disconnect( sh, TQT_SIGNAL( done(int) ),
-                       this, TQT_SLOT( done(int) ) );
+  TQObject::disconnect( sh, TQ_SIGNAL( done(int) ),
+                       this, TQ_SLOT( done(int) ) );
   delete em;
   delete sh;
 
@@ -605,7 +605,7 @@ void TESession::slotZModemDetected()
 {
   if (!zmodemBusy)
   {
-    TQTimer::singleShot(10, this, TQT_SLOT(emitZModemDetected()));
+    TQTimer::singleShot(10, this, TQ_SLOT(emitZModemDetected()));
     zmodemBusy = true;
   }
 }
@@ -624,7 +624,7 @@ void TESession::cancelZModem()
 void TESession::startZModem(const TQString &zmodem, const TQString &dir, const TQStringList &list)
 {
   zmodemBusy = true;
-  zmodemProc = new KProcIO;
+  zmodemProc = new TDEProcIO;
 
   (*zmodemProc) << zmodem << "-v";
   for(TQStringList::ConstIterator it = list.begin();
@@ -636,26 +636,26 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
 
   if (!dir.isEmpty())
      zmodemProc->setWorkingDirectory(dir);
-  zmodemProc->start(KProcIO::NotifyOnExit, false);
+  zmodemProc->start(TDEProcIO::NotifyOnExit, false);
 
-  // Override the read-processing of KProcIO
-  disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0);
-  connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
-          this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int)));
-  connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
-          this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int)));
-  connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)),
-          this, TQT_SLOT(zmodemDone()));
+  // Override the read-processing of TDEProcIO
+  disconnect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0);
+  connect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+          this, TQ_SLOT(zmodemSendBlock(TDEProcess *, char *, int)));
+  connect(zmodemProc,TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+          this, TQ_SLOT(zmodemStatus(TDEProcess *, char *, int)));
+  connect(zmodemProc,TQ_SIGNAL (processExited(TDEProcess *)),
+          this, TQ_SLOT(zmodemDone()));
 
-  disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
-  connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) );
-  connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
+  disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) );
+  connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(zmodemRcvBlock(const char*,int)) );
+  connect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue()));
 
   zmodemProgress = new ZModemDialog(te->topLevelWidget(), false,
                                     i18n("ZModem Progress"));
 
-  connect(zmodemProgress, TQT_SIGNAL(user1Clicked()),
-          this, TQT_SLOT(zmodemDone()));
+  connect(zmodemProgress, TQ_SIGNAL(user1Clicked()),
+          this, TQ_SLOT(zmodemDone()));
 
   zmodemProgress->show();
 }
@@ -720,9 +720,9 @@ void TESession::zmodemDone()
     zmodemProc = 0;
     zmodemBusy = false;
 
-    disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this ,TQT_SLOT(zmodemRcvBlock(const char*,int)) );
-    disconnect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue()));
-    connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
+    disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this ,TQ_SLOT(zmodemRcvBlock(const char*,int)) );
+    disconnect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue()));
+    connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) );
 
     sh->send_bytes("\030\030\030\030", 4); // Abort
     sh->send_bytes("\001\013\n", 3); // Try to get prompt back
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index 3b5f211fa..0b4dbed50 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -31,7 +31,7 @@
 
 #include "sessioniface.h"
 
-class KProcIO;
+class TDEProcIO;
 class TDEProcess;
 class ZModemDialog;
 
@@ -222,7 +222,7 @@ private:
 
   // ZModem
   bool           zmodemBusy;
-  KProcIO*       zmodemProc;
+  TDEProcIO*     zmodemProc;
   ZModemDialog*  zmodemProgress;
 
   // Color/Font Changes by ESC Sequences
diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp
index b4f16dd49..230fc7f9a 100644
--- a/konsole/konsole/zmodem_dialog.cpp
+++ b/konsole/konsole/zmodem_dialog.cpp
@@ -32,7 +32,7 @@ ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption
   textEdit = new TQTextEdit(this);
   textEdit->setMinimumSize(400, 100);
   setMainWidget(textEdit);
-  connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClose()));
+  connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClose()));
 }
 
 void ZModemDialog::addProgressText(const TQString &txt)
diff --git a/konsole/other/CMakeLists.txt b/konsole/other/CMakeLists.txt
index 564bf3504..39992673e 100644
--- a/konsole/other/CMakeLists.txt
+++ b/konsole/other/CMakeLists.txt
@@ -28,7 +28,8 @@ install(
     Linux.schema XTerm.schema vim.schema DarkPicture.schema
     LightPicture.schema Transparent.schema GreenTint.schema
     Transparent_MC.schema GreenTint_MC.schema Transparent_lightbg.schema
-    Transparent_darkbg.schema LightPaper.schema
+    Transparent_darkbg.schema LightPaper.schema Solarized.schema
+    SolarizedLight.schema
     linux.keytab vt100.keytab vt420pc.keytab x11r5.keytab
     solaris.keytab README.Schema README.KeyTab README.default.Keytab
   DESTINATION ${DATA_INSTALL_DIR}/konsole
diff --git a/konsole/other/LICENSE.Solarized-themes b/konsole/other/LICENSE.Solarized-themes
new file mode 100644
index 000000000..ee08d7e44
--- /dev/null
+++ b/konsole/other/LICENSE.Solarized-themes
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Ethan Schoonover
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/konsole/other/Solarized.schema b/konsole/other/Solarized.schema
new file mode 100644
index 000000000..ab98e4f06
--- /dev/null
+++ b/konsole/other/Solarized.schema
@@ -0,0 +1,40 @@
+# Solarized color scheme by Ethan Schoonover
+#
+# https://ethanschoonover.com/solarized/
+
+title Solarized
+
+# foreground colors
+
+# note that the default background color is flagged
+# to become transparent when an image is present.
+
+#   slot    transparent bold
+#      |              | |
+#      V V--color--V  V V
+
+color  0 131 148 150  0 0  # regular   foreground color
+color  1   0  43  54  1 0  # regular   background color
+
+color  2   7  54  66  0 0  # regular   color 0 Black
+color  3 220  50  47  0 0  # regular   color 1 Red
+color  4 133 153   0  0 0  # regular   color 2 Green
+color  5 181 137   0  0 0  # regular   color 3 Yellow
+color  6  38 139 210  0 0  # regular   color 4 Blue
+color  7 211  54 130  0 0  # regular   color 5 Magenta
+color  8  42 161 152  0 0  # regular   color 6 Cyan
+color  9 238 232 213  0 0  # regular   color 7 White
+
+# intensive colors
+
+color 10 147 161 161  0 0  # intensive foreground color
+color 11   7  54  66  1 0  # intensive background color
+
+color 12   0  43  54  0 0  # intensive color 0
+color 13 203  75  22  0 0  # intensive color 1
+color 14  88 110 117  0 0  # intensive color 2
+color 15 101 123 131  0 0  # intensive color 3
+color 16 131 148 150  0 0  # intensive color 4
+color 17 108 113 196  0 0  # intensive color 5
+color 18 147 161 161  0 0  # intensive color 6
+color 19 253 246 227  0 0  # intensive color 7
diff --git a/konsole/other/SolarizedLight.schema b/konsole/other/SolarizedLight.schema
new file mode 100644
index 000000000..61905f535
--- /dev/null
+++ b/konsole/other/SolarizedLight.schema
@@ -0,0 +1,40 @@
+# Solarized Light color scheme by Ethan Schoonover
+#
+# https://ethanschoonover.com/solarized/
+
+title Solarized Light
+
+# foreground colors
+
+# note that the default background color is flagged
+# to become transparent when an image is present.
+
+#   slot    transparent bold
+#      |              | |
+#      V V--color--V  V V
+
+color  0 101 123 131  0 0  # regular   foreground color
+color  1 253 246 227  1 0  # regular   background color
+
+color  2   7  54  66  0 0  # regular   color 0 Black
+color  3 220  50  47  0 0  # regular   color 1 Red
+color  4 133 153   0  0 0  # regular   color 2 Green
+color  5 181 137   0  0 0  # regular   color 3 Yellow
+color  6  38 139 210  0 0  # regular   color 4 Blue
+color  7 211  54 130  0 0  # regular   color 5 Magenta
+color  8  42 161 152  0 0  # regular   color 6 Cyan
+color  9 238 232 213  0 0  # regular   color 7 White
+
+# intensive colors
+
+color 10  88 110 117  0 0  # intensive foreground color
+color 11 238 232 213  1 0  # intensive background color
+
+color 12   0  43  54  0 0  # intensive color 0
+color 13 203  75  22  0 0  # intensive color 1
+color 14  88 110 117  0 0  # intensive color 2
+color 15 101 123 131  0 0  # intensive color 3
+color 16 131 148 150  0 0  # intensive color 4
+color 17 108 113 196  0 0  # intensive color 5
+color 18 147 161 161  0 0  # intensive color 6
+color 19 253 246 227  0 0  # intensive color 7
diff --git a/konsole/terminalhere/terminalhere.cpp b/konsole/terminalhere/terminalhere.cpp
index ece2ac30e..0fffd7538 100644
--- a/konsole/terminalhere/terminalhere.cpp
+++ b/konsole/terminalhere/terminalhere.cpp
@@ -21,7 +21,7 @@
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeglobal.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdestartupinfo.h>
 #include <stdlib.h>
 
@@ -32,7 +32,7 @@ TerminalHere::TerminalHere() : TDEApplication()
 {
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("General");
 	TQString term = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kpager/config.cpp b/kpager/config.cpp
index 0c022d4bb..5be814af7 100644
--- a/kpager/config.cpp
+++ b/kpager/config.cpp
@@ -48,20 +48,20 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
     TQVBox *box = new TQVBox( this );
     m_chkWindowDragging=new TQCheckBox(i18n("Enable window dragging"),box,0);
     (void ) new KSeparator( box );
-    connect(m_chkWindowDragging, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableWindowDragging(bool)));
+    connect(m_chkWindowDragging, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableWindowDragging(bool)));
 
     TQHBox *page = new TQHBox( box );
     TQVBox *lpage = new TQVBox( page );
     setMainWidget(box);
 
     m_chkShowName=new TQCheckBox(i18n("Show name"),lpage,0);
-    connect(m_chkShowName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowName(bool)));
+    connect(m_chkShowName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowName(bool)));
     m_chkShowNumber=new TQCheckBox(i18n("Show number"),lpage,0);
-    connect(m_chkShowNumber, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowNumber(bool)));
+    connect(m_chkShowNumber, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowNumber(bool)));
     m_chkShowBackground=new TQCheckBox(i18n("Show background"),lpage,0);
-    connect(m_chkShowBackground, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowBackground(bool)));
+    connect(m_chkShowBackground, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowBackground(bool)));
     m_chkShowWindows=new TQCheckBox(i18n("Show windows"),lpage,0);
-    connect(m_chkShowWindows, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowWindows(bool)));
+    connect(m_chkShowWindows, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowWindows(bool)));
 
     m_grpWindowDrawMode=new TQButtonGroup(i18n("Type of Window"),page);
     m_grpWindowDrawMode->setExclusive(true);
@@ -75,7 +75,7 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
 //    rbpix->setEnabled(false);
     vbox->addWidget(rbpix);
 
-    connect(m_grpWindowDrawMode, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setWindowDrawMode(int)));
+    connect(m_grpWindowDrawMode, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setWindowDrawMode(int)));
 
     m_grpLayoutType=new TQButtonGroup(i18n("Layout"),page);
     m_grpLayoutType->setExclusive(true);
@@ -85,8 +85,8 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent)
     vbox->addWidget(new TQRadioButton(i18n("Horizontal"),m_grpLayoutType));
     vbox->addWidget(new TQRadioButton(i18n("Vertical"),m_grpLayoutType));
 
-    connect(m_grpLayoutType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setLayout(int)));
-    connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk()));
+    connect(m_grpLayoutType, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setLayout(int)));
+    connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk()));
     loadConfiguration();
     setMinimumSize(360, 160);
 }
@@ -146,7 +146,7 @@ void KPagerConfigDialog::loadConfiguration()
 
 void KPagerConfigDialog::initConfiguration(void)
 {
-  TDEConfig *cfg= kapp->config();
+  TDEConfig *cfg= tdeApp->config();
   cfg->setGroup("KPager");
 
   m_windowDrawMode=cfg->readNumEntry("windowDrawMode", Desktop::c_defWindowDrawMode);
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index dc7b27f05..ba75663f9 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -58,7 +58,7 @@ Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char *
   m_bgPixmap = 0L;
   m_bgDirty=true;
   m_grabWindows=false;
-  setAcceptDrops(TRUE);
+  setAcceptDrops(true);
   setBackgroundMode(NoBackground);
 
   if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true);
@@ -160,16 +160,16 @@ KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalp
 void Desktop::convertRectS2P(TQRect &r)
 {
     TQRect tmp(r);
-    r.setRect(deskX()+tmp.x()*deskWidth()/kapp->desktop()->width(),
-	      deskY()+tmp.y()*deskHeight()/kapp->desktop()->height(),
-	      tmp.width()*deskWidth()/kapp->desktop()->width(),
-	      tmp.height()*deskHeight()/kapp->desktop()->height());
+    r.setRect(deskX()+tmp.x()*deskWidth()/tdeApp->desktop()->width(),
+	      deskY()+tmp.y()*deskHeight()/tdeApp->desktop()->height(),
+	      tmp.width()*deskWidth()/tdeApp->desktop()->width(),
+	      tmp.height()*deskHeight()/tdeApp->desktop()->height());
 }
 
 void Desktop::convertCoordP2S(int &x, int &y)
 {
-    x=(x-deskX())*(kapp->desktop()->width())/deskWidth();
-    y=(y-deskY())*(kapp->desktop()->height())/deskHeight();
+    x=(x-deskX())*(tdeApp->desktop()->width())/deskWidth();
+    y=(y-deskY())*(tdeApp->desktop()->height())/deskHeight();
 }
 
 TQPixmap scalePixmap(const TQPixmap &pixmap, int width, int height)
@@ -201,7 +201,7 @@ void Desktop::loadBgPixmap(void)
   bool retval;
 
 //  if (!m_bgDirty) return;
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if (!client->isAttached())
       client->attach();
   TQByteArray data, data2, replyData;
@@ -257,7 +257,7 @@ void Desktop::loadBgPixmap(void)
   if (!m_bgPixmap)
   {
      m_bgPixmap = new TDESharedPixmap;
-     connect(m_bgPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool)));
+     connect(m_bgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(backgroundLoaded(bool)));
   }
 
   retval = m_bgPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_isCommon?1:m_desk));
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index 4775576ee..95f4ec61c 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -67,7 +67,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
     m_pPager = new KPager(this, 0);
     setCentralWidget(m_pPager);
 
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     cfg->setGroup("KPager");
 
     // Update the last used geometry
@@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
 //	  rect.pos.y+rect.size.height-m_pPager->height());
 // antonio:The above lines don't work. I should look at them when I have
 // more time
-        move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25);
+        move(tdeApp->desktop()->width()-m_pPager->sizeHint().width()-5,tdeApp->desktop()->height()-m_pPager->sizeHint().height()-25);
     }
 
     // Set the wm flags to this window
@@ -111,7 +111,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
     XFree(reinterpret_cast<char *>(hints));
 
     timeout=new TQTimer(this,"timeoutToQuit");
-    connect(timeout,TQT_SIGNAL(timeout()),this, TQT_SLOT(reallyClose()));
+    connect(timeout,TQ_SIGNAL(timeout()),this, TQ_SLOT(reallyClose()));
 }
 
 KPagerMainWindow::~KPagerMainWindow()
@@ -158,9 +158,9 @@ void KPagerMainWindow::showAt(int x, int y)
   // Just in case we lost the sticky bit... (as when a window is hidden)
   KWin::setOnAllDesktops( winId(), true);
   
-  if (x>kapp->desktop()->width()/2) // Right
+  if (x>tdeApp->desktop()->width()/2) // Right
     x-=m_pPager->width()+5;
-  if (y>kapp->desktop()->height()/2) // Bottom
+  if (y>tdeApp->desktop()->height()/2) // Bottom
     y-=m_pPager->height()+25;
   move(x,y);
   show();
@@ -187,15 +187,15 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
     m_windows.setAutoDelete(true); // delete windows info after removal
 
     setBackgroundColor( black );
-    m_winmodule=new KWinModule(TQT_TQOBJECT(this));
+    m_winmodule=new KWinModule(this);
     m_currentDesktop=m_winmodule->currentDesktop();
 
     m_grabWinTimer=new TQTimer(this,"grabWinTimer");
-    connect(m_grabWinTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGrabWindows()));
+    connect(m_grabWinTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGrabWindows()));
 
     KPagerConfigDialog::initConfiguration();
 
-    TDEConfig *cfg = kapp->config();
+    TDEConfig *cfg = tdeApp->config();
     cfg->setGroup("KPager");
     m_showStickyOption=cfg->readBoolEntry("ShowStickyOption",false);
 
@@ -208,31 +208,31 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
 
     m_layoutType=static_cast<enum KPager::LayoutTypes>( KPagerConfigDialog::m_layoutType );
 
-    connect( m_winmodule, TQT_SIGNAL( activeWindowChanged(WId)),
-             TQT_SLOT(slotActiveWindowChanged(WId)));
-    connect( m_winmodule, TQT_SIGNAL( windowAdded(WId) ),
-             TQT_SLOT( slotWindowAdded(WId) ) );
-    connect( m_winmodule, TQT_SIGNAL( windowRemoved(WId) ),
-             TQT_SLOT( slotWindowRemoved(WId) ) );
-    connect( m_winmodule, TQT_SIGNAL( windowChanged(WId,unsigned int) ),
-             TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
-    connect( m_winmodule, TQT_SIGNAL( stackingOrderChanged() ),
-             TQT_SLOT( slotStackingOrderChanged() ) );
-    connect( m_winmodule, TQT_SIGNAL( desktopNamesChanged() ),
-             TQT_SLOT( slotDesktopNamesChanged() ) );
-    connect( m_winmodule, TQT_SIGNAL( numberOfDesktopsChanged(int) ),
-             TQT_SLOT( slotNumberOfDesktopsChanged(int) ) );
-    connect( m_winmodule, TQT_SIGNAL( currentDesktopChanged(int)),
-             TQT_SLOT( slotCurrentDesktopChanged(int) ) );
-    connect(kapp, TQT_SIGNAL(backgroundChanged(int)),
-            TQT_SLOT(slotBackgroundChanged(int)));
+    connect( m_winmodule, TQ_SIGNAL( activeWindowChanged(WId)),
+             TQ_SLOT(slotActiveWindowChanged(WId)));
+    connect( m_winmodule, TQ_SIGNAL( windowAdded(WId) ),
+             TQ_SLOT( slotWindowAdded(WId) ) );
+    connect( m_winmodule, TQ_SIGNAL( windowRemoved(WId) ),
+             TQ_SLOT( slotWindowRemoved(WId) ) );
+    connect( m_winmodule, TQ_SIGNAL( windowChanged(WId,unsigned int) ),
+             TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
+    connect( m_winmodule, TQ_SIGNAL( stackingOrderChanged() ),
+             TQ_SLOT( slotStackingOrderChanged() ) );
+    connect( m_winmodule, TQ_SIGNAL( desktopNamesChanged() ),
+             TQ_SLOT( slotDesktopNamesChanged() ) );
+    connect( m_winmodule, TQ_SIGNAL( numberOfDesktopsChanged(int) ),
+             TQ_SLOT( slotNumberOfDesktopsChanged(int) ) );
+    connect( m_winmodule, TQ_SIGNAL( currentDesktopChanged(int)),
+             TQ_SLOT( slotCurrentDesktopChanged(int) ) );
+    connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)),
+            TQ_SLOT(slotBackgroundChanged(int)));
 
     TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold);
     defFont = cfg->readFontEntry("Font", &defFont);
     setFont(defFont);
 
-    m_prefs_action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureDialog()), parent->actionCollection());
-    m_quit_action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), parent->actionCollection());
+    m_prefs_action = KStdAction::preferences(this, TQ_SLOT(configureDialog()), parent->actionCollection());
+    m_quit_action = KStdAction::quit(tdeApp, TQ_SLOT(quit()), parent->actionCollection());
 
     updateLayout();
 }
@@ -323,13 +323,13 @@ void KPager::showPopupMenu( WId wid, TQPoint pos)
 
             m_mnu->insertTitle( TQString::fromUtf8("KPager"), 1);
             m_mnu->setCheckable(true);
-            connect(m_mnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(clientPopupAboutToShow()));
-            connect(m_mnu, TQT_SIGNAL(activated(int)), TQT_SLOT(clientPopupActivated(int)));
+            connect(m_mnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(clientPopupAboutToShow()));
+            connect(m_mnu, TQ_SIGNAL(activated(int)), TQ_SLOT(clientPopupActivated(int)));
 
             m_dmnu = new TQPopupMenu(m_mnu);
             m_dmnu->setCheckable(true);
-            connect(m_dmnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(desktopPopupAboutToShow()));
-            connect(m_dmnu, TQT_SIGNAL(activated(int)), TQT_SLOT(sendToDesktop(int)));
+            connect(m_dmnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(desktopPopupAboutToShow()));
+            connect(m_dmnu, TQ_SIGNAL(activated(int)), TQ_SLOT(sendToDesktop(int)));
 
             m_mnu->insertItem( i18n("Mi&nimize"), IconifyOp );
             m_mnu->insertItem( i18n("Ma&ximize"), MaximizeOp );
@@ -600,7 +600,7 @@ void KPager::desktopPopupAboutToShow()
         id = m_dmnu->insertItem( TQString("&")+TQString::number(i )+TQString(" ")
                                  + m_winmodule->desktopName(i), i );
         if ( m_winfo.desktop() == i )
-            m_dmnu->setItemChecked( id, TRUE );
+            m_dmnu->setItemChecked( id, true );
     }
 }
 
diff --git a/kpager/main.cpp b/kpager/main.cpp
index 20c8e268d..10c4b2780 100644
--- a/kpager/main.cpp
+++ b/kpager/main.cpp
@@ -21,7 +21,7 @@
 
 ***************************************************************************/
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
@@ -40,10 +40,10 @@ static TDECmdLineOptions pagerOpts[] =
 
 bool closed_by_sm = false;
 
-class KPagerApplication : public KUniqueApplication
+class KPagerApplication : public TDEUniqueApplication
 {
 public:
-  KPagerApplication() : KUniqueApplication() {}
+  KPagerApplication() : TDEUniqueApplication() {}
 
   void commitData(TQSessionManager& sm) {
     if (mainWidget()->isHidden()) {
@@ -51,7 +51,7 @@ public:
       return;
     }
     closed_by_sm = true;
-    KUniqueApplication::commitData( sm );
+    TDEUniqueApplication::commitData( sm );
     closed_by_sm = false;
   }
 
@@ -78,9 +78,9 @@ int main(int argc, char **argv)
 
     TDECmdLineArgs::init(argc, argv, aboutdata);
     TDECmdLineArgs::addCmdLineOptions(pagerOpts);
-    KUniqueApplication::addCmdLineOptions();
+    TDEUniqueApplication::addCmdLineOptions();
 
-    if (!KUniqueApplication::start())
+    if (!TDEUniqueApplication::start())
     {
       kdError() << "kpager is already running!" << endl;
       return 0;
diff --git a/kpager/windowdrag.cpp b/kpager/windowdrag.cpp
index fc854b8a9..bcfd9e77d 100644
--- a/kpager/windowdrag.cpp
+++ b/kpager/windowdrag.cpp
@@ -54,7 +54,7 @@ bool PagerWindowDrag::decode( TQDropEvent *e, WId &w,int &deltax,int &deltay,int
 	    char *tmp=data.data();
 	    sscanf(tmp,"%lu %d %d %d", &w, &deltax, &deltay, &origdesk);
 	    e->accept();
-	    return TRUE;
+	    return true;
 	}
-    return FALSE;
+    return false;
 }
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index cec71bae8..6a9961de3 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -20,13 +20,13 @@
 #include <tqmap.h>
 
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <klanguagebutton.h>
 
 #include "kfindlanguage.h"
@@ -37,8 +37,8 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl
 
 	px_introSidebar->setPixmap(UserIcon("step1.png"));
 
-	connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &)));
-	connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged()));
+	connect(cb_country, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLangForCountry(const TQString &)));
+	connect(cb_language, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLanguageChanged()));
 
 	// naturally, the language is not changed on startup
 	b_savedLanguageChanged = false;
@@ -85,7 +85,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
 	TQMap<TQString,TQString> regionnames;
 
 	for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
-		KSimpleConfig entry(*it);
+		TDESimpleConfig entry(*it);
 		entry.setGroup(TQString::fromLatin1("KCM Locale"));
 		TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 
@@ -112,7 +112,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
 	countrylist.sort();
 
 	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"), i18n("without name"));
 		TQString submenu = '-' + entry.readEntry("Region");
@@ -163,25 +163,25 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
 		TQByteArray data, da;
 		TQDataStream stream( data, IO_WriteOnly );
 		stream << comboLang->current();
-		if ( !kapp->dcopClient()->isAttached() )
-			kapp->dcopClient()->attach();
+		if ( !tdeApp->dcopClient()->isAttached() )
+			tdeApp->dcopClient()->attach();
 		// tdesycoca needs to be rebuilt
 		TDEProcess proc;
 		proc << TQString::fromLatin1("tdebuildsycoca");
 		proc.start(TDEProcess::DontCare);
 		kdDebug() << "TDELocaleConfig::save : sending signal to kdesktop" << endl;
 		// inform kicker and kdeskop about the new language
-		kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);
+		tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);
 		// call, not send, so that we know it's done before coming back
 		// (we both access kdeglobals...)
-		kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData );
+		tdeApp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData );
 	}
 	// KPersonalizer::next() probably waits for a return-value
 	return true;
 }
 
 void KCountryPage::setLangForCountry(const TQString &country) {
-	KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
+	TDESimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
 	ent.setGroup(TQString::fromLatin1("KCM Locale"));
 	langs = ent.readListEntry(TQString::fromLatin1("Languages"));
 
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 9c1fb7765..25855e871 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -24,9 +24,9 @@
 #include <tqsettings.h>
 #include <tqfont.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <dcopclient.h>
 #include <kipc.h>
@@ -416,7 +416,7 @@ void KEyeCandyPage::enableIconEffectSizePanel(bool enable){
 	else
 		stream << panelsize;
 
-	kapp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data);
+	tdeApp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data);
 }
 
 /** No descriptions */
@@ -623,13 +623,13 @@ void KEyeCandyPage::save(bool currSettings){
 	kdesktopconf->sync();
 	TDEGlobal::config()->sync();
 	// restart twin  for window effects
-	kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
-	kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	// set the display options (style effects)
 	KIPC::sendMessageAll(KIPC::SettingsChanged);
 	TQApplication::syncX();
 	// kicker stuff: Iconzooming etc.
-	kapp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
+	tdeApp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
 	// Icon stuff
 	for (int i=0; i<TDEIcon::LastGroup; i++) {
 		KIPC::sendMessageAll(KIPC::IconChanged, i);
@@ -637,10 +637,10 @@ void KEyeCandyPage::save(bool currSettings){
 	// font stuff
 	KIPC::sendMessageAll(KIPC::FontChanged);
 	// unfortunately, the konqiconview does not re-read the configuration to restructure the previews and the background picture
-	kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
-	kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
-	kapp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") );
-	kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") );
+	tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
+	tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
+	tdeApp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") );
+	tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") );
 }
 
 void KEyeCandyPage::slotEyeCandyShowDetails(bool details){
@@ -677,7 +677,7 @@ void KEyeCandyPage::getUserDefaults(){
 	TQByteArray replydata;
 	TQByteArray data;
 	TQCString replytype;
-	kapp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata);
+	tdeApp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata);
 	TQDataStream stream( replydata, IO_ReadOnly );
 	stream >> panelsize;
 
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 1a9c7e570..79835faf4 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -251,10 +251,10 @@ If you have a fast, new processor, you might want to turn them all on, but for t
         <slot>slotEyeCandySliderMoved(int)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>slotEyeCandyShowDetails(bool)</slot>
     <slot>slotEyeCandySliderMoved(int)</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index 150c67b28..bcf1f83ad 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -21,9 +21,9 @@
 #include <tqstringlist.h>
 #include <tqmap.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 
 #include "kfindlanguage.h"
@@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() {
 	}
 
 	// get the users primary Languages
-	KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
+	TDESimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
 	ent.setGroup("KCM Locale");
 	TQStringList langs = ent.readListEntry("Languages");
 	if (langs.isEmpty())
@@ -77,7 +77,7 @@ KFindLanguage::KFindLanguage() {
 	langlist += alllang;
 
 	for ( TQStringList::ConstIterator it = langlist.begin();	it != langlist.end(); ++it ) {
-		KSimpleConfig entry(*it);
+		TDESimpleConfig entry(*it);
 		entry.setGroup("KCM Locale");
 		TQString name = entry.readEntry("Name", i18n("without name"));
 
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 017b95fe7..885519a61 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -21,8 +21,8 @@
 #include <tqtextview.h>
 #include <tqmap.h>
 
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdelocale.h>
 #include <dcopclient.h>
@@ -90,14 +90,14 @@ void KOSPage::save(bool currSettings){
 	TQApplication::syncX();
 	// enable/disable the mac menu, call dcop
 	// Tell kdesktop about the new config file
-	kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
+	tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
 	///////////////////////////////////////////
 	/// restart twin  for window effects
-	kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	///////////////////////////////////////////
 	
 	// Make the kaccess daemon read the changed config file
-	kapp->startServiceByDesktopName("kaccess");
+	tdeApp->startServiceByDesktopName("kaccess");
 }
 
 
@@ -309,9 +309,9 @@ void KOSPage::writeKeyEntrys(TQString keyfile){
 	kdDebug() << "KOSPage::writeKeyEntrys()" << endl;
 
 	// load the given .kksrc - file
-	KSimpleConfig* scheme = new KSimpleConfig(keyfile, true);
+	TDESimpleConfig* scheme = new TDESimpleConfig(keyfile, true);
 	// load the default .kksrc - file
-	KSimpleConfig* defScheme = new KSimpleConfig(locate("keys", "trinity.kksrc"), true);
+	TDESimpleConfig* defScheme = new TDESimpleConfig(locate("keys", "trinity.kksrc"), true);
 
 	// we need the entries from the default - file, so we can compare with them
 	TQMap<TQString, TQString> defMap = defScheme->entryMap("Global Shortcuts");
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index 30edfeea9..45e2de8b5 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -207,12 +207,12 @@ Trinity allows you to customize its behavior according to your needs.</string>
         <slot>slotMacDescription()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>slotWindowsDescription()</slot>
     <slot>slotKDEDescription()</slot>
     <slot>slotMacDescription()</slot>
     <slot>slotUnixDescription()</slot>
-</Q_SLOTS>
+</slots>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 86b0a5b4a..c42276845 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -25,10 +25,10 @@
 #include <tqtimer.h>
 #include <tqcursor.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdelistview.h>
@@ -57,11 +57,11 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
 	: KWizard(parent, name, true) {
 
 	// first, reset the startup from true (see desktop file in share/autostart) to false
-	setCaption(kapp->caption());
-	kapp->config()->setGroup("General");
+	setCaption(tdeApp->caption());
+	tdeApp->config()->setGroup("General");
 	os_dirty = eye_dirty = style_dirty=false;
-	kapp->config()->writeEntry("FirstLogin", false);
-	kapp->config()->sync();
+	tdeApp->config()->writeEntry("FirstLogin", false);
+	tdeApp->config()->sync();
 
 	countrypage= new KCountryPage(this);
 	addPage( countrypage, i18n( "Step 1: Introduction" ) );
@@ -90,9 +90,9 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
 	locale = new TDELocale("kpersonalizer");
 	locale->setLanguage(TDELocale::defaultLanguage());
 
-	connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), stylepage, TQT_SLOT(presetStyle(const TQString&)));
-	connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), eyecandy, TQT_SLOT(slotPresetSlider(const TQString&)));
-	connect(refinepage->pb_kcontrol, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
+	connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), stylepage, TQ_SLOT(presetStyle(const TQString&)));
+	connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), eyecandy, TQ_SLOT(slotPresetSlider(const TQString&)));
+	connect(refinepage->pb_kcontrol, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
 
 	setPosition();
 
@@ -125,7 +125,7 @@ void KPersonalizer::next() {
 	else if(currentPage()==eyecandy){
 		eye_dirty=true;  // set the dirty flag, changes done that need reverting
 		eyecandy->save();
-		TQTimer::singleShot(0, this, TQT_SLOT(slotNext()));
+		TQTimer::singleShot(0, this, TQ_SLOT(slotNext()));
 	}
 	else if(currentPage()==stylepage){
 		style_dirty=true;  // set the dirty flag, changes done that need reverting
@@ -215,7 +215,7 @@ void KPersonalizer::slotRestart() {
 }
 
 void KPersonalizer::delayedRestart() {
-	TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
+	TQTimer::singleShot(0, this, TQ_SLOT(slotRestart()));
 }
 
 /** this session is restarted, so we want to start with ospage */
diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp
index 568967690..32c7370ae 100644
--- a/kpersonalizer/krefinepage.cpp
+++ b/kpersonalizer/krefinepage.cpp
@@ -28,7 +28,7 @@
 
 KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(parent,name) {
    px_finishSidebar->setPixmap(UserIcon("step5.png"));
-   connect( pb_kcontrol, TQT_SIGNAL(clicked()), TQT_SLOT(startKControl()) );
+   connect( pb_kcontrol, TQ_SIGNAL(clicked()), TQ_SLOT(startKControl()) );
    if( KPersonalizer::beforeSession()) {
        pb_kcontrol->hide();
        lb_kcontrol->hide();
diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp
index e03c19038..7c83315c1 100644
--- a/kpersonalizer/main.cpp
+++ b/kpersonalizer/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 	TDELocale::setMainCatalogue("kpersonalizer");
 
 	TDEApplication a;
-	if ( !kapp->dcopClient()->isAttached() )
-		kapp->dcopClient()->attach();
+	if ( !tdeApp->dcopClient()->isAttached() )
+		tdeApp->dcopClient()->attach();
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kpersonalizer/pics/step1.png b/kpersonalizer/pics/step1.png
index 63a2eec66..442c54af0 100644..100755
--- a/kpersonalizer/pics/step1.png
+++ b/kpersonalizer/pics/step1.png
diff --git a/kpersonalizer/pics/step2.png b/kpersonalizer/pics/step2.png
index a0320cd67..8af43de38 100644..100755
--- a/kpersonalizer/pics/step2.png
+++ b/kpersonalizer/pics/step2.png
diff --git a/kpersonalizer/pics/step3.png b/kpersonalizer/pics/step3.png
index ac9031dec..47f690668 100644..100755
--- a/kpersonalizer/pics/step3.png
+++ b/kpersonalizer/pics/step3.png
diff --git a/kpersonalizer/pics/step4.png b/kpersonalizer/pics/step4.png
index 364dffc70..ea939c358 100644..100755
--- a/kpersonalizer/pics/step4.png
+++ b/kpersonalizer/pics/step4.png
diff --git a/kpersonalizer/pics/step5.png b/kpersonalizer/pics/step5.png
index e6b6e790a..4ea33023f 100644..100755
--- a/kpersonalizer/pics/step5.png
+++ b/kpersonalizer/pics/step5.png
diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui
index 7e132c4c7..628241ac7 100644
--- a/kpersonalizer/stylepreview.ui
+++ b/kpersonalizer/stylepreview.ui
@@ -176,10 +176,10 @@
     <include location="local" impldecl="in implementation">stylepreview.ui.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</slot>
-</Q_SLOTS>
+</slots>
 
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index b4c626221..5384edd04 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -67,9 +67,9 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
         case TQEvent::Leave:
         case TQEvent::Wheel:
         case TQEvent::ContextMenu:
-            return TRUE; // ignore
+            return true; // ignore
         default:
             break;
     }
-    return FALSE;
+    return false;
 }
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 5c85f402c..db26b343a 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -26,15 +26,15 @@
 #include <tqobjectlist.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeglobal.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <tdelocale.h>
 #include <tdelistview.h>
 #include <kipc.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <dcopclient.h>
 #include <tdestyle.h>
 #include <kicontheme.h>
@@ -75,8 +75,8 @@ TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDl
 	platinum->setText( 0, i18n( "Platinum" ) );
 	platinum->setText( 1, i18n( "The platinum style" ) );
 
-	connect(klv_styles, TQT_SIGNAL(selectionChanged()),
-			this, TQT_SLOT(slotCurrentChanged()));
+	connect(klv_styles, TQ_SIGNAL(selectionChanged()),
+			this, TQ_SLOT(slotCurrentChanged()));
 
 	// Note: if the default is changed here it needs to be changed in tdebase/twin/plugins.cpp
 	//       and tdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well.
@@ -117,21 +117,21 @@ void TDEStylePage::saveStyle(bool curSettings){
 void TDEStylePage::saveKWin(bool curSettings){
 	TQString twin = origKWinStyle;
 	if(curSettings) {
-		KDesktopFile* kdf = 0L;
+		TDEDesktopFile* kdf = 0L;
 		TDEStandardDirs* kstd = TDEGlobal::dirs();
 		if (cde->isSelected() && twin_cde_exist)
-			kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop"));
+			kdf = new TDEDesktopFile(kstd->findResource("data", "twin/cde.desktop"));
 		else if (win->isSelected() && twin_win_exist)
-			kdf = new KDesktopFile(kstd->findResource("data", "twin/redmond.desktop"));
+			kdf = new TDEDesktopFile(kstd->findResource("data", "twin/redmond.desktop"));
 		else if (platinum->isSelected() && twin_system_exist)
-			kdf = new KDesktopFile(kstd->findResource("data", "twin/system.desktop"));
+			kdf = new TDEDesktopFile(kstd->findResource("data", "twin/system.desktop"));
 		else if (keramik->isSelected() && twin_keramik_exist)
-			kdf = new KDesktopFile(kstd->findResource("data", "twin/keramik.desktop"));
+			kdf = new TDEDesktopFile(kstd->findResource("data", "twin/keramik.desktop"));
 		else if (kde->isSelected()) {
 			if (twin_plastik_exist && (TQColor::numBitPlanes() > 8))
-				kdf = new KDesktopFile(kstd->findResource("data", "twin/plastik.desktop"));
+				kdf = new TDEDesktopFile(kstd->findResource("data", "twin/plastik.desktop"));
 			else if (twin_quartz_exist)
-				kdf = new KDesktopFile(kstd->findResource("data", "twin/quartz.desktop"));
+				kdf = new TDEDesktopFile(kstd->findResource("data", "twin/quartz.desktop"));
 		}
 
 		if (kdf) {
@@ -187,8 +187,8 @@ void TDEStylePage::saveColors(bool curSettings){
 
 	////////////////////////////////////////////////////
 	// KDE-1.x support
-	KSimpleConfig *tdeconfig =
-	new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+	TDESimpleConfig *tdeconfig =
+	new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
 	tdeconfig->setGroup( "General" );
 	tdeconfig->writeEntry("background", toSave->background );
 	tdeconfig->writeEntry("selectBackground", toSave->selectBackground );
@@ -363,7 +363,7 @@ void TDEStylePage::getColors(colorSet *set, bool colorfile ){
 			set->colorFile=locate("colors","EveX.kcsrc");
 		}
 		set->contrast=7;
-		config = new KSimpleConfig(set->colorFile, true);
+		config = new TDESimpleConfig(set->colorFile, true);
 		config->setGroup("Color Scheme");
 		kdDebug() << "TDEStylePage::getColors(): schemefile: " << set->colorFile << endl;
                 deleteConfig = true;
@@ -522,9 +522,9 @@ void TDEStylePage::liveUpdate() {
 	// color palette changes
 	KIPC::sendMessageAll(KIPC::PaletteChanged);
 	// twin-style
-	kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+	tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	// kdesktop-background
-	kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
+	tdeApp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
 }
 
 /** show the previewWidget styled with the selected one */
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
index 9d1ef9e32..bab627df1 100644
--- a/krootbacking/krootbacking.cpp
+++ b/krootbacking/krootbacking.cpp
@@ -33,7 +33,7 @@
 #include <dcopref.h>
 
 #include <ksharedpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <krootbacking.h>
 
 static TQString wallpaperForDesktop(int desktop)
@@ -45,7 +45,7 @@ class KRootBackingData
 {
 public:
     TQWidget *toplevel;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWinModule *twin;
 #endif
 };
@@ -68,10 +68,10 @@ void KRootBacking::init()
     m_bInit = false;
     m_bActive = false;
 
-    connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
-    connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint()));
-#ifdef Q_WS_X11
-    connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
+    connect(tdeApp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint()));
+#ifdef TQ_WS_X11
+    connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool)));
 
     d->twin = new KWinModule( this );
 #endif
@@ -88,7 +88,7 @@ KRootBacking::~KRootBacking()
 
 int KRootBacking::currentDesktop() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop );
     rinfo.activate();
     return rinfo.currentDesktop();
@@ -107,7 +107,7 @@ void KRootBacking::start()
 	// We should get a KIPC message when the shared pixmap is available...
 	enableExports();
 	if (m_timeout < 50) {
-		TQTimer::singleShot( 100, this, SLOT(show()) );	// ...but it doesn't always work!
+		TQTimer::singleShot( 100, this, TQ_SLOT(show()) );	// ...but it doesn't always work!
 		m_timeout++;
 		return;
 	}
@@ -153,7 +153,7 @@ void KRootBacking::repaint(bool force)
 	return;
 
     m_Rect = TQRect(p1, p2);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     m_Desk = currentDesktop();
 
     // TDESharedPixmap will correctly generate a tile for us.
@@ -172,7 +172,7 @@ void KRootBacking::repaint(bool force)
 
 bool KRootBacking::isAvailable() const
 {
-// #ifdef Q_WS_X11
+// #ifdef TQ_WS_X11
 //     return m_pPixmap->isAvailable(pixmapName(m_Desk));
 // #else
     return m_pPixmap->isNull();
@@ -181,7 +181,7 @@ bool KRootBacking::isAvailable() const
 
 TQString KRootBacking::pixmapName(int desk) {
     TQString pattern = TQString("DESKTOP%1");
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     int screen_number = DefaultScreen(tqt_xdisplay());
     if (screen_number) {
         pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1";
@@ -193,9 +193,9 @@ TQString KRootBacking::pixmapName(int desk) {
 
 void KRootBacking::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdDebug(270) << k_lineinfo << "activating background exports.\n";
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (!client->isAttached())
 	client->attach();
     TQByteArray data;
@@ -218,7 +218,7 @@ void KRootBacking::slotDone(bool success)
     {
 	kdWarning(270) << k_lineinfo << "loading of desktop background failed.\n";
 	if (m_timeout < 50) {
-		TQTimer::singleShot( 100, this, SLOT(show()) );
+		TQTimer::singleShot( 100, this, TQ_SLOT(show()) );
 		m_timeout++;
 		return;
 	}
diff --git a/krootbacking/krootbacking.h b/krootbacking/krootbacking.h
index 860fe7e85..212290905 100644
--- a/krootbacking/krootbacking.h
+++ b/krootbacking/krootbacking.h
@@ -27,7 +27,7 @@
 #include <tqcolor.h>
 #include <tdelibs_export.h>
 
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
 
 class TQRect;
 class TQWidget;
@@ -76,7 +76,7 @@ public:
      * Deprecated, use isAvailable() instead.
      * @deprecated
      */
-    KDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); }
+    TDE_DEPRECATED bool checkAvailable(bool) { return isAvailable(); }
 #endif
 
     /** @since 3.2
@@ -174,6 +174,6 @@ private:
     void init();
 };
 
-#endif // ! Q_WS_QWS
+#endif // ! TQ_WS_QWS
 
 #endif // KROOTBACKING_H
diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp
index 5691d736d..a3491ff20 100644
--- a/krootbacking/main.cpp
+++ b/krootbacking/main.cpp
@@ -35,7 +35,7 @@
 bool argb_visual = false;
 
 static const char description[] =
-    I18N_NOOP("A program to grab the current TDE desktop backrounds for xscreensaver");
+    I18N_NOOP("A program to grab the current TDE desktop backgrounds for xscreensaver");
 
 static const char version[] = "0.1";
 
@@ -62,8 +62,8 @@ int main(int argc, char **argv)
 
 	TQObject* mainWin = new KRootBacking();
 	TQTimer *timer = new TQTimer( mainWin );
-        TQObject::connect( timer, SIGNAL(timeout()), mainWin, SLOT(start()) );
-        timer->start( 100, TRUE ); // 100ms single shot timer
+        TQObject::connect( timer, TQ_SIGNAL(timeout()), mainWin, TQ_SLOT(start()) );
+        timer->start( 100, true ); // 100ms single shot timer
 
 	app.exec();
 
diff --git a/ksmserver/KSMServerInterface.h b/ksmserver/KSMServerInterface.h
index a628b92ba..3645eb84a 100644
--- a/ksmserver/KSMServerInterface.h
+++ b/ksmserver/KSMServerInterface.h
@@ -10,6 +10,11 @@ class KSMServerInterface : virtual public DCOPObject
 
 k_dcop:
   virtual void logout(int, int, int ) = 0;
+  virtual void logoutTimed( int, int, TQString ) = 0;
+  virtual bool suspend(int) = 0;
+
+  virtual TQStringList suspendOptions() = 0;
+
   virtual void restoreSessionInternal() = 0;
   virtual void restoreSessionDoneInternal() = 0;
   virtual TQStringList sessionList() = 0;
@@ -19,11 +24,11 @@ k_dcop:
   virtual void saveCurrentSessionAs( TQString ) = 0;
 
   virtual void autoStart2() = 0;
-  
+
   virtual void suspendStartup( TQCString ) = 0;
   virtual void resumeStartup( TQCString ) = 0;
 
-  virtual void logoutTimed( int, int, TQString ) = 0;
+  virtual void reconfigure() = 0;
 };
 
 #endif
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 977ba02e0..d095b1df7 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -172,7 +172,7 @@ void sanity_check( int argc, char* argv[] )
   }
 }
 
-extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
+extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] )
 {
     sanity_check(argc, argv);
 
@@ -192,8 +192,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-    kapp->dcopClient()->registerAs("ksmserver", false);
-    if (!kapp->dcopClient()->isRegistered())
+    tdeApp->dcopClient()->registerAs("ksmserver", false);
+    if (!tdeApp->dcopClient()->isRegistered())
     {
        tqWarning("[KSMServer] Could not register with DCOPServer. Aborting.");
        return 1;
@@ -217,7 +217,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
 #endif
 
     KSMServer *server = new KSMServer( TQString::fromLatin1(wm), TQString::fromLatin1(wmaddargs), only_local);
-    kapp->dcopClient()->setDefaultObject( server->objId() );
+    tdeApp->dcopClient()->setDefaultObject( server->objId() );
 
     IceSetIOErrorHandler( IoErrorHandler );
 
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index aee40fcaa..b41adc551 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -69,12 +69,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <unistd.h>
 #include <tdeapplication.h>
 #include <kstaticdeleter.h>
 #include <tdetempfile.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
@@ -514,8 +514,8 @@ static void sighandler(int sig)
        delete server;
     }
 
-    if (kapp) {
-        kapp->quit();
+    if (tdeApp) {
+        tdeApp->quit();
     }
     //::exit(0);
 }
@@ -603,9 +603,9 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     hwDevices = TDEGlobal::hardwareDevices();
 #endif
 
-    connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout()));
-    connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout()));
-    connect( &pendingShutdown, TQT_SIGNAL( timeout()), TQT_SLOT( pendingShutdownTimeout()));
+    connect( &knotifyTimeoutTimer, TQ_SIGNAL( timeout()), TQ_SLOT( knotifyTimeout()));
+    connect( &startupSuspendTimeoutTimer, TQ_SIGNAL( timeout()), TQ_SLOT( startupSuspendTimeout()));
+    connect( &pendingShutdown, TQ_SIGNAL( timeout()), TQ_SLOT( pendingShutdownTimeout()));
 
     only_local = _only_local;
 #ifdef HAVE__ICETRANSNOLISTEN
@@ -676,7 +676,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     for ( int i = 0; i < numTransports; i++) {
         con = new KSMListener( listenObjs[i] );
         listener.append( con );
-        connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newConnection(int) ) );
+        connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newConnection(int) ) );
     }
 
     signal(SIGHUP, sighandler);
@@ -684,11 +684,13 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     signal(SIGINT, sighandler);
     signal(SIGPIPE, SIG_IGN);
 
-    connect( &notificationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( notificationTimeout() ) );
-    connect( &protectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( protectionTimerTick() ) );
-    connect( &restoreTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryRestoreNext() ) );
-    connect( &shutdownTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeoutQuit() ) );
-    connect( kapp, TQT_SIGNAL( shutDown() ), this, TQT_SLOT( cleanUp() ) );
+    connect( &notificationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( notificationTimeout() ) );
+    connect( &protectionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( protectionTimerTick() ) );
+    connect( &restoreTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryRestoreNext() ) );
+    connect( &shutdownTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeoutQuit() ) );
+    connect( tdeApp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) );
+
+    reconfigure();
 }
 
 KSMServer::~KSMServer()
@@ -697,6 +699,16 @@ KSMServer::~KSMServer()
     cleanUp();
 }
 
+void KSMServer::reconfigure()
+{
+    // respect lock on resume & disable suspend/hibernate settings
+    // from power-manager
+    TDEConfig cfg("power-managerrc");
+    m_disableSuspend = cfg.readBoolEntry("disableSuspend", false);
+    m_disableHibernate = cfg.readBoolEntry("disableHibernate", false);
+    m_lockOnResume = cfg.readBoolEntry("lockOnResume", true);
+}
+
 void KSMServer::cleanUp()
 {
     if (clean) return;
@@ -742,7 +754,7 @@ void KSMServer::cleanUp()
 void* KSMServer::watchConnection( IceConn iceConn )
 {
     KSMConnection* conn = new KSMConnection( iceConn );
-    connect( conn, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) );
+    connect( conn, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) );
     return (void*) conn;
 }
 
@@ -919,6 +931,29 @@ void KSMServer::storeSession()
     config->sync();
 }
 
+TQStringList KSMServer::suspendOptions()
+{
+    reconfigure();
+
+    TQStringList sopt;
+
+#ifdef WITH_TDEHWLIB
+    TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
+    if (rootDevice->canFreeze() && !m_disableSuspend)
+        sopt << "freeze";
+
+    if (rootDevice->canSuspend() && !m_disableSuspend)
+        sopt << "suspend";
+
+    if (rootDevice->canHibernate() && !m_disableHibernate)
+        sopt << "hibernate";
+
+    if (rootDevice->canHybridSuspend() && !m_disableSuspend && !m_disableHibernate)
+        sopt << "hybridSuspend";
+#endif
+
+    return sopt;
+}
 
 TQStringList KSMServer::sessionList()
 {
@@ -995,4 +1030,4 @@ bool KSMServer::defaultSession() const
 bool KSMServer::startupCompleted()
 {
 	  return m_startupCompleted;
-}
+}
\ No newline at end of file
diff --git a/ksmserver/server.h b/ksmserver/server.h
index fdf08cded..511013dc7 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -37,6 +37,17 @@ class KSMListener;
 class KSMConnection;
 class KSMClient;
 
+namespace SuspendType {
+    enum SuspendType {
+        NotSpecified = 0,
+        Freeze,
+        Standby, // not implemented
+        Suspend,
+        Hibernate,
+        HybridSuspend
+    };
+};
+
 enum SMType { SM_ERROR, SM_WMCOMMAND, SM_WMSAVEYOURSELF };
 struct SMData
     {
@@ -103,6 +114,7 @@ public:
 
 public slots:
     void cleanUp();
+    void reconfigure();
 
 private slots:
     void newConnection( int socket );
@@ -172,6 +184,8 @@ private:
 			   TDEApplication::ShutdownMode sdmode,
 			   TQString bootOption = TQString::null );
 
+    void suspendInternal(int state);
+
     void performLegacySessionSave();
     void storeLegacySession( TDEConfig* config );
     void restoreLegacySession( TDEConfig* config );
@@ -186,12 +200,14 @@ private:
     void resumeStartupInternal();
 
     // public dcop interface
-    void logout( int, int, int );
-    virtual void logoutTimed( int, int, TQString );
+    void logout(int, int, int);
+    virtual void logoutTimed(int, int, TQString);
+    bool suspend(int);
+    TQStringList suspendOptions();
     TQStringList sessionList();
     TQString currentSession();
     void saveCurrentSession();
-    void saveCurrentSessionAs( TQString );
+    void saveCurrentSessionAs(TQString);
 
     TQWidget* startupNotifierIPDlg;
     TQWidget* shutdownNotifierIPDlg;
@@ -240,6 +256,10 @@ private:
     TDEApplication::ShutdownType pendingShutdown_sdtype;
     TDEApplication::ShutdownMode pendingShutdown_sdmode;
 
+    bool m_disableSuspend;
+    bool m_disableHibernate;
+    bool m_lockOnResume;
+
     // ksplash interface
     void upAndRunning( const TQString& msg );
     void publishProgress( int progress, bool max  = false  );
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 0d9faaea2..4b30d5cf4 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -69,12 +69,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <unistd.h>
 #include <tdeapplication.h>
 #include <kstaticdeleter.h>
 #include <tdetempfile.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <dmctl.h>
@@ -222,45 +222,13 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
     if ( !logoutConfirmed ) {
         int selection;
         KSMShutdownFeedback::start(); // make the screen gray
-        logoutConfirmed =
-            KSMShutdownDlg::confirmShutdown( maysd, mayrb, sdtype, bopt, &selection );
+        logoutConfirmed = KSMShutdownDlg::confirmShutdown( maysd, mayrb, sdtype, bopt, &selection );
         // ###### We can't make the screen remain gray while talking to the apps,
         // because this prevents interaction ("do you want to save", etc.)
         // TODO: turn the feedback widget into a list of apps to be closed,
         // with an indicator of the current status for each.
         KSMShutdownFeedback::stop(); // make the screen become normal again
-        if (selection != SuspendType::NotSpecified) {
-		// respect lock on resume & disable suspend/hibernate settings
-		// from power-manager
-		TDEConfig config("power-managerrc");
-		bool lockOnResume = config.readBoolEntry("lockOnResume", true);
-		if (lockOnResume) {
-			TQCString replyType;
-			TQByteArray replyData;
-			// Block here until lock is complete
-			// If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!
-			kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
-		}
-#ifdef WITH_TDEHWLIB
-		TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
-		if (rootDevice) {
-			switch (selection) {
-				case SuspendType::Freeze:
-					rootDevice->setPowerState(TDESystemPowerState::Freeze);
-					break;
-				case SuspendType::Suspend:
-					rootDevice->setPowerState(TDESystemPowerState::Suspend);
-					break;
-				case SuspendType::Hibernate:
-					rootDevice->setPowerState(TDESystemPowerState::Hibernate);
-					break;
-				case SuspendType::HybridSuspend:
-					rootDevice->setPowerState(TDESystemPowerState::HybridSuspend);
-					break;
-			}
-		}
-#endif
-        }
+        suspend(selection);
     }
 
     if ( logoutConfirmed ) {
@@ -272,8 +240,8 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
 	if (showLogoutStatusDlg) {
 		shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
 		if (shutdownNotifierIPDlg) {
-			connect(shutdownNotifierIPDlg, SIGNAL(abortLogoutClicked()), this, SLOT(cancelShutdown()));
-			connect(shutdownNotifierIPDlg, SIGNAL(skipNotificationClicked()), this, SLOT(forceSkipSaveYourself()));
+			connect(shutdownNotifierIPDlg, TQ_SIGNAL(abortLogoutClicked()), this, TQ_SLOT(cancelShutdown()));
+			connect(shutdownNotifierIPDlg, TQ_SIGNAL(skipNotificationClicked()), this, TQ_SLOT(forceSkipSaveYourself()));
 			static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request..."));
 			notificationTimer.start( KSMSERVER_NOTIFICATION_MANUAL_OPTIONS_TIMEOUT, true );
 		}
@@ -289,7 +257,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
         // Set the real desktop background to black so that exit looks
         // clean regardless of what was on "our" desktop.
         if (!showLogoutStatusDlg) {
-            TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( TQt::black );
+            tdeApp->desktop()->setBackgroundColor( TQt::black );
         }
         state = Shutdown;
         wmPhase1WaitingCount = 0;
@@ -343,6 +311,70 @@ void KSMServer::shutdown( TDEApplication::ShutdownConfirm confirm,
     shutdownInternal( confirm, sdtype, sdmode );
 }
 
+void KSMServer::suspendInternal(int state)
+{
+    if (m_lockOnResume) {
+        TQCString replyType;
+        TQByteArray replyData;
+        // Block here until lock is complete
+        // If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!
+        tdeApp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
+    }
+
+#ifdef WITH_TDEHWLIB
+    TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
+    rootDevice->setPowerState((TDESystemPowerState::TDESystemPowerState)state);
+#endif
+}
+
+bool KSMServer::suspend(int stype)
+{
+    if (stype == SuspendType::NotSpecified)
+        return false;
+
+    reconfigure();
+
+#ifdef WITH_TDEHWLIB
+    TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
+    if (rootDevice) {
+        switch (stype) {
+            case SuspendType::Freeze:
+                if (rootDevice->canFreeze() && !m_disableSuspend)
+                {
+                    suspendInternal(TDESystemPowerState::Freeze);
+                    return true;
+                }
+                break;
+
+            case SuspendType::Suspend:
+                if (rootDevice->canSuspend() && !m_disableSuspend)
+                {
+                    suspendInternal(TDESystemPowerState::Suspend);
+                    return true;
+                }
+                break;
+
+            case SuspendType::Hibernate:
+                if (rootDevice->canHibernate() && !m_disableHibernate)
+                {
+                    suspendInternal(TDESystemPowerState::Hibernate);
+                    return true;
+                }
+                break;
+
+            case SuspendType::HybridSuspend:
+                if (rootDevice->canHybridSuspend() && !m_disableSuspend && !m_disableHibernate)
+                {
+                    suspendInternal(TDESystemPowerState::HybridSuspend);
+                    return true;
+                }
+                break;
+        }
+    }
+#endif
+    return false;
+}
+
 #include <tdemessagebox.h>
 
 void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
@@ -764,8 +796,8 @@ void KSMServer::completeShutdownOrCheckpoint()
         if (!shutdownNotifierIPDlg) {
             shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
             if (shutdownNotifierIPDlg) {
-                connect(shutdownNotifierIPDlg, SIGNAL(abortLogoutClicked()), this, SLOT(cancelShutdown()));
-                connect(shutdownNotifierIPDlg, SIGNAL(skipNotificationClicked()), this, SLOT(forceSkipSaveYourself()));
+                connect(shutdownNotifierIPDlg, TQ_SIGNAL(abortLogoutClicked()), this, TQ_SLOT(cancelShutdown()));
+                connect(shutdownNotifierIPDlg, TQ_SIGNAL(skipNotificationClicked()), this, TQ_SLOT(forceSkipSaveYourself()));
             }
         }
         while (!KSMShutdownIPFeedback::ispainted()) {
@@ -801,12 +833,12 @@ void KSMServer::completeShutdownOrCheckpoint()
 
     if ( state == Shutdown ) {
         bool waitForKNotify = true;
-        if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
+        if( !tdeApp->dcopClient()->connectDCOPSignal( "knotify", "",
             "notifySignal(TQString,TQString,TQString,TQString,TQString,int,int,int,int)",
             "ksmserver", "notifySlot(TQString,TQString,TQString,TQString,TQString,int,int,int,int)", false )) {
             waitForKNotify = false;
         }
-        if( !kapp->dcopClient()->connectDCOPSignal( "knotify", "",
+        if( !tdeApp->dcopClient()->connectDCOPSignal( "knotify", "",
             "playingFinished(int,int)",
             "ksmserver", "logoutSoundFinished(int,int)", false )) {
             waitForKNotify = false;
@@ -876,14 +908,14 @@ void KSMServer::startKilling()
 
     kdDebug( 1218 ) << " We killed all clients. We have now clients.count()=" << clients.count() << endl;
     completeKilling();
-    shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, TRUE );
+    shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, true );
 }
 
 void KSMServer::completeKilling()
 {
     // Activity detected; reset forcible shutdown timer...
     if (shutdownTimer.isActive()) {
-        shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, TRUE );
+        shutdownTimer.start( KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT, true );
     }
     SHUTDOWN_MARKER("completeKilling");
     kdDebug( 1218 ) << "KSMServer::completeKilling clients.count()=" << clients.count() << endl;
@@ -963,7 +995,7 @@ void KSMServer::killWM()
     }
     if( iswm ) {
         completeKillingWM();
-        TQTimer::singleShot( 5000, this, TQT_SLOT( timeoutWMQuit() ) );
+        TQTimer::singleShot( 5000, this, TQ_SLOT( timeoutWMQuit() ) );
     }
     else {
         killingCompleted();
@@ -992,7 +1024,7 @@ void KSMServer::killingCompleted()
         pid_t child;
         child = fork();
         if (child != 0) {
-            kapp->quit();
+            tdeApp->quit();
         }
         else if (child == 0) {
             // If any remaining client(s) do not exit quickly (e.g. drkonqui) terminate so that they can be seen and interacted with
@@ -1001,7 +1033,7 @@ void KSMServer::killingCompleted()
         }
     }
     else {
-        kapp->quit();
+        tdeApp->quit();
     }
 }
 
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 0d1cbd4ef..b8a91d3f4 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -11,6 +11,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #endif
 
 #include "shutdowndlg.h"
+#include "server.h"
 
 #include <tqapplication.h>
 #include <tqlayout.h>
@@ -77,15 +78,15 @@ KSMShutdownFeedback::KSMShutdownFeedback()
    m_currentY( 0 ),
    m_grayOpacity( 0.0f ),
    m_compensation( 0.0f ),
-   m_fadeBackwards( FALSE ),
+   m_fadeBackwards( false ),
    m_unfadedImage(),
    m_grayImage(),
    m_fadeTime(),
    m_pmio(),
-   m_greyImageCreated( FALSE )
+   m_greyImageCreated( false )
 
 {
-	if (kapp->isX11CompositionAvailable()) {
+	if (tdeApp->isX11CompositionAvailable()) {
 		m_grayImage = TQImage( TQApplication::desktop()->width(), TQApplication::desktop()->height(), 32 );
 		m_grayImage = m_grayImage.convertDepth(32);
 		m_grayImage.setAlphaBuffer(false);
@@ -105,14 +106,14 @@ KSMShutdownFeedback::KSMShutdownFeedback()
 	m_unfadedImage = m_grayImage;
 	resize(0, 0);
 	setShown(true);
-	TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
+	TQTimer::singleShot( 500, this, TQ_SLOT( slotPaintEffect() ) );
 }
 
 // called after stopping shutdown-feedback -> smooth fade-back to color-mode
 void KSMShutdownFeedback::fadeBack( void )
 {
 	m_fadeTime.restart();
-	m_fadeBackwards = TRUE;
+	m_fadeBackwards = true;
 	// its possible that we have to fade back, before all is completely gray, so we cannot start
 	// with completely gray when fading back...
 	m_compensation = 1.0f - m_grayOpacity;
@@ -131,12 +132,12 @@ void KSMShutdownFeedback::slotPaintEffect()
 		float doFancyLogoutFadeTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
 		float doFancyLogoutFadeBackTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
 
-		if (kapp->isX11CompositionAvailable()) {
+		if (tdeApp->isX11CompositionAvailable()) {
 			// We can do this in a different (simpler) manner because we have compositing support!
 			// if slotPaintEffect() is called first time, we have to initialize the gray image
 			// we also could do that in the constructor, but then the displaying of the
 			// logout-UI would be too much delayed...
-			if ( m_greyImageCreated == false )
+			if ( !m_greyImageCreated )
 			{
 				m_greyImageCreated = true;
 
@@ -169,11 +170,11 @@ void KSMShutdownFeedback::slotPaintEffect()
 			}
 
 			// return if fading is completely done...
-			if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) )
+			if ( ( m_grayOpacity >= 1.0f && !m_fadeBackwards ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards ) )
 				return;
 
 
-			if ( m_fadeBackwards == FALSE )
+			if ( !m_fadeBackwards )
 			{
 				m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime;
 				if ( m_grayOpacity > 1.0f )
@@ -200,7 +201,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 			if( y2 > imgHeight )
 				y2 = imgHeight;
 
-			if( m_fadeBackwards == FALSE )
+			if( !m_fadeBackwards )
 			{
 				if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight )
 				{
@@ -243,13 +244,13 @@ void KSMShutdownFeedback::slotPaintEffect()
 				bitBlt( this, 0, start_y1, &img );
 			}
 
-			TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
+			TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) );
 		}
 		else {
 			// if slotPaintEffect() is called first time, we have to initialize the gray image
 			// we also could do that in the constructor, but then the displaying of the
 			// logout-UI would be too much delayed...
-			if ( m_greyImageCreated == false )
+			if ( !m_greyImageCreated )
 			{
 				m_greyImageCreated = true;
 
@@ -277,11 +278,11 @@ void KSMShutdownFeedback::slotPaintEffect()
 			}
 
 			// return if fading is completely done...
-			if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) )
+			if ( ( m_grayOpacity >= 1.0f && !m_fadeBackwards ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards ) )
 				return;
 
 
-			if ( m_fadeBackwards == FALSE )
+			if ( !m_fadeBackwards )
 			{
 				m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime;
 				if ( m_grayOpacity > 1.0f )
@@ -308,7 +309,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 			if( y2 > imgHeight )
 				y2 = imgHeight;
 
-			if( m_fadeBackwards == FALSE )
+			if( !m_fadeBackwards )
 			{
 				if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight )
 				{
@@ -370,18 +371,18 @@ void KSMShutdownFeedback::slotPaintEffect()
 				bitBlt( this, 0, start_y1, &img );
 			}
 
-			TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
+			TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) );
 		}
 	}
 	else {
 		if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFadeaway", true)) {
 			// standard logout fade
-			 if (kapp->isX11CompositionAvailable()) {
+			 if (tdeApp->isX11CompositionAvailable()) {
 				// We can do this in a different (simpler) manner because we have compositing support!
 				// The end effect will be very similar to the old style logout
 				float doFancyLogoutFadeTime = 1000;
 				float doFancyLogoutFadeBackTime = 0;
-				if ( m_greyImageCreated == false ) {
+				if ( !m_greyImageCreated ) {
 					m_greyImageCreated = true;
 
 					// eliminate nasty flicker on first show
@@ -413,11 +414,11 @@ void KSMShutdownFeedback::slotPaintEffect()
 				}
 
 				// return if fading is completely done...
-				if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) ) {
+				if ( ( m_grayOpacity >= 1.0f && !m_fadeBackwards ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards ) ) {
 					return;
 				}
 
-				if ( m_fadeBackwards == FALSE ) {
+				if ( !m_fadeBackwards ) {
 					m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime;
 					if ( m_grayOpacity > 1.0f )
 					m_grayOpacity = 1.0f;
@@ -444,7 +445,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 					y2 = imgHeight;
 				}
 
-				if( m_fadeBackwards == FALSE )
+				if( !m_fadeBackwards )
 				{
 					if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight )
 					{
@@ -486,7 +487,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 					bitBlt( this, 0, start_y1, &img );
 				}
 
-				TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
+				TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) );
 			 }
 			 else {
 				if ( m_currentY >= height() ) {
@@ -517,7 +518,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 				bitBlt( this, 0, m_currentY, &pixmap );
 				bitBlt( &m_root, 0, m_currentY, &pixmap );
 				m_currentY += 10;
-				TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
+				TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) );
 			}
 		}
 	}
@@ -539,7 +540,7 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
 
 	m_sharedRootPixmap = new KRootPixmap(this);
 	m_sharedRootPixmap->setCustomPainting(true);
-	connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
+	connect(m_sharedRootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
 
 	if (TQPaintDevice::x11AppDepth() == 32) {
 		// The shared pixmap is 24 bits, but we are 32 bits
@@ -571,15 +572,15 @@ void KSMShutdownIPFeedback::showNow()
 
 	if (!m_isPainted) {
 		setGeometry( TQApplication::desktop()->geometry() );
-		TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(slotPaintEffect()) );
 	}
 }
 
 void KSMShutdownIPFeedback::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
-	DCOPClient *client = kapp->dcopClient();
+	DCOPClient *client = tdeApp->dcopClient();
 	if (!client->isAttached()) {
 		client->attach();
 	}
@@ -632,7 +633,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 			m_sharedRootPixmap->start();
 		}
 
-		TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) );
+		TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
 		mPixmapTimeout++;
 		return;
 	}
@@ -645,14 +646,14 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 			pm = TQPixmap();
 		}
 	}
-	if ((pm.isNull()) || (pm.width() != kapp->desktop()->width()) || (pm.height() != kapp->desktop()->height())) {
+	if ((pm.isNull()) || (pm.width() != tdeApp->desktop()->width()) || (pm.height() != tdeApp->desktop()->height())) {
 		if (mPixmapTimeout < 10) {
-			TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) );
+			TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
 			mPixmapTimeout++;
 			return;
 		}
 		else {
-			pm = TQPixmap(kapp->desktop()->width(), kapp->desktop()->height());
+			pm = TQPixmap(tdeApp->desktop()->width(), tdeApp->desktop()->height());
 			pm.fill(TQt::black);
 			m_paintedFromSharedRootPixmap = false;
 		}
@@ -703,7 +704,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 
 KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 								bool maysd, bool mayrb, TDEApplication::ShutdownType sdtype, int* selection )
-  : TQDialog( parent, 0, TRUE, (WFlags)WType_Popup ), targets(0), m_selection(selection)
+  : TQDialog( parent, 0, true, (WFlags)WType_Popup ), targets(0), m_selection(selection)
 	// this is a WType_Popup on purpose. Do not change that! Not
 	// having a popup here has severe side effects.
 
@@ -766,7 +767,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 		btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnLogout );
-		connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
+		connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout()));
 	}
 	else
 	{
@@ -794,7 +795,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		TQToolTip::add( btnLogout, i18n( "<qt><p>Log out of the current session to login as a different user.</p></qt>" ) );
 		btnFont = btnLogout->font();
 		buttonlay->addWidget( btnLogout );
-		connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
+		connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout()));
 	}
 
 	if ((maysd) || (mayrb)) {
@@ -804,7 +805,6 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		TDEConfig config("power-managerrc");
 		bool disableSuspend = config.readBoolEntry("disableSuspend", false);
 		bool disableHibernate = config.readBoolEntry("disableHibernate", false);
-		m_lockOnResume = config.readBoolEntry("lockOnResume", true);
 
 		bool canFreeze = false;
 		bool canSuspend = false;
@@ -841,7 +841,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnFreeze->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnFreeze->setAccel( "ALT+" + btnFreeze->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnFreeze );
-				connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze()));
+				connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze()));
 			}
 
 			if (canSuspend && !disableSuspend)
@@ -857,7 +857,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnSuspend );
-				connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
+				connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend()));
 			}
 
 			if (canHibernate && !disableHibernate)
@@ -872,7 +872,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnHibernate );
-				connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
+				connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate()));
 			}
 
 			if (canHybridSuspend && !disableSuspend && !disableHibernate)
@@ -890,9 +890,9 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnHybridSuspend->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnHybridSuspend->setAccel( "ALT+" + btnHybridSuspend->textLabel().lower()[i+1] ) ;
 				hbuttonbox->addWidget ( btnHybridSuspend );
-				connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend()));
+				connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend()));
 			}
-			
+
 			// Separator (within buttonlay)
 			vbox->addWidget( new KSeparator( frame ) );
 
@@ -909,7 +909,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
 				hbuttonbox2->addWidget ( btnReboot);
-				connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+				connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
 				if ( sdtype == TDEApplication::ShutdownTypeReboot ) {
 					btnReboot->setFocus();
 				}
@@ -936,7 +936,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 					}
 
 					btnReboot->setPopup(targets);
-					connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+					connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 				}
 				// BAD KARMA .. this code is copied line by line from standard konqy dialog [EOF]
 			}
@@ -950,7 +950,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				int i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
 				btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
 				hbuttonbox2->addWidget ( btnHalt );
-				connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+				connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
 				if ( sdtype == TDEApplication::ShutdownTypeHalt ) {
 					btnHalt->setFocus();
 				}
@@ -963,7 +963,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			// Back to Desktop
 			KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
 			hbuttonbox3->addWidget( btnBack );
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 
 		}
 		else
@@ -975,7 +975,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				TQToolTip::add( btnHalt, i18n( "<qt><p>Log out of the current session and turn off the computer.</p></qt>" ) );
 				btnHalt->setFont( btnFont );
 				buttonlay->addWidget( btnHalt );
-				connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+				connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
 				if ( sdtype == TDEApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") ) {
 					btnHalt->setFocus();
 				}
@@ -988,7 +988,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				btnReboot->setFont( btnFont );
 				buttonlay->addWidget( btnReboot );
 
-				connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+				connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
 				if ( sdtype == TDEApplication::ShutdownTypeReboot ) {
 					btnReboot->setFocus();
 				}
@@ -1014,7 +1014,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 					}
 
 					btnReboot->setPopup(targets);
-					connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+					connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 				}
 			}
 
@@ -1026,7 +1026,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				" almost instantly.</p><p>This correspond to ACPI S0 mode.</p></qt>"));
 				btnFreeze->setFont( btnFont );
 				buttonlay->addWidget( btnFreeze );
-				connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze()));
+				connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze()));
 			}
 
 			if (canSuspend && !disableSuspend)
@@ -1038,7 +1038,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				"<p>Also known as Suspend-to-RAM mode.</p></qt>"));
 				btnSuspend->setFont( btnFont );
 				buttonlay->addWidget( btnSuspend );
-				connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
+				connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend()));
 			}
 
 			if (canHibernate && !disableHibernate)
@@ -1049,7 +1049,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				" considerable time is required to reactivate the system again.</p><p>This correspond to ACPI S4 mode.</p><p>Also known as Suspend-to-Disk mode.</p></qt>"));
 				btnHibernate->setFont( btnFont );
 				buttonlay->addWidget( btnHibernate );
-				connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
+				connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate()));
 			}
 
 			if (canHybridSuspend && !disableSuspend && !disableHibernate)
@@ -1063,9 +1063,9 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				"<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>"));
 				btnHybridSuspend->setFont( btnFont );
 				buttonlay->addWidget( btnHybridSuspend );
-				connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend()));
+				connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend()));
 			}
-			
+
 			buttonlay->addStretch( 1 );
 
 			// Separator
@@ -1074,7 +1074,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			// Back to Desktop
 			KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
 			buttonlay->addWidget( btnBack );
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 		}
 	}
 	else {
@@ -1089,7 +1089,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
 			hbuttonbox3->addWidget( btnBack );
 
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 		}
 		else
 		{
@@ -1100,7 +1100,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
 			buttonlay->addWidget( btnBack );
 
-			connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+			connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 		}
 	}
 }
@@ -1168,7 +1168,7 @@ void KSMShutdownDlg::slotHybridSuspend()
 
 bool KSMShutdownDlg::confirmShutdown( bool maysd, bool mayrb, TDEApplication::ShutdownType& sdtype, TQString& bootOption, int* selection )
 {
-	kapp->enableStyles();
+	tdeApp->enableStyles();
 	KSMShutdownDlg* l = new KSMShutdownDlg( 0 /*KSMShutdownFeedback::self()*/, maysd, mayrb, sdtype, selection );
 
 	// Show dialog (will save the background in showEvent)
@@ -1182,16 +1182,16 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, bool mayrb, TDEApplication::Sh
 
 	delete l;
 
-	kapp->disableStyles();
+	tdeApp->disableStyles();
 	return result;
 }
 
 TQWidget* KSMShutdownIPDlg::showShutdownIP()
 {
-	kapp->enableStyles();
+	tdeApp->enableStyles();
 	KSMShutdownIPDlg* l = new KSMShutdownIPDlg( 0 );
 
-	kapp->disableStyles();
+	tdeApp->disableStyles();
 
 	return l;
 }
@@ -1246,8 +1246,8 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)
 
 	setNotificationActionButtonsSkipText(i18n("Skip Notification"));
 	m_button2->setText(i18n("Abort Logout"));
-	connect(m_button1, SIGNAL(clicked()), this, SIGNAL(skipNotificationClicked()));
-	connect(m_button2, SIGNAL(clicked()), this, SIGNAL(abortLogoutClicked()));
+	connect(m_button1, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(skipNotificationClicked()));
+	connect(m_button2, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(abortLogoutClicked()));
 
 	show();
 	setActiveWindow();
@@ -1264,10 +1264,10 @@ KSMDelayedPushButton::KSMDelayedPushButton( const KGuiItem &item,
 						const char *name)
   : KPushButton( item, parent, name), pop(0), popt(0)
 {
-  connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()));
-  connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()));
+  connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()));
+  connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()));
   popt = new TQTimer(this);
-  connect(popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+  connect(popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 }
 
 void KSMDelayedPushButton::setPopup(TQPopupMenu *p)
@@ -1329,7 +1329,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype,
 	}
 	TQTimer *timer = new TQTimer( this );
 	timer->start( 1000 );
-	connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateText() ) );
+	connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateText() ) );
 	KDialog::centerOnScreen(this);
 }
 
@@ -1346,7 +1346,7 @@ void KSMDelayedMessageBox::updateText()
 
 bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay )
 {
-	kapp->enableStyles();
+	tdeApp->enableStyles();
 	KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
 	TQSize sh = msg.sizeHint();
 	TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
@@ -1355,7 +1355,7 @@ bool KSMDelayedMessageBox::showTicker( TDEApplication::ShutdownType sdtype, cons
 			rect.y() + (rect.height() - sh.height())/2);
 	bool result = msg.exec();
 
-	kapp->disableStyles();
+	tdeApp->disableStyles();
 	return result;
 }
 
@@ -1377,7 +1377,7 @@ switch ( e->key() )
 	case Key_Enter:
 	case Key_Return:
 	case Key_Space:
-	  m_pressed = TRUE;
+	  m_pressed = true;
 	  setDown(true);
 	  emit pressed();
 	  break;
@@ -1402,7 +1402,7 @@ void KSMPushButton::keyReleaseEvent( TQKeyEvent* e )
 			if ( m_pressed )
 			{
 			setDown(false);
-			m_pressed = FALSE;
+			m_pressed = false;
 			emit released();
 			emit clicked();
 			}
@@ -1447,7 +1447,7 @@ void FlatButton::keyPressEvent( TQKeyEvent* e )
 		case Key_Enter:
 		case Key_Return:
 		case Key_Space:
-		m_pressed = TRUE;
+		m_pressed = true;
 		setDown(true);
 		emit pressed();
 		break;
@@ -1472,7 +1472,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e )
 			if ( m_pressed )
 			{
 			setDown(false);
-			m_pressed = FALSE;
+			m_pressed = false;
 			emit released();
 			emit clicked();
 			}
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index 7539fd75b..5a9d652f2 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -18,7 +18,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kguiitem.h>
 #include <tqtoolbutton.h>
 #include <krootpixmap.h>
-#include <ntqprogressbar.h>
+#include <tqprogressbar.h>
 
 class TQPushButton;
 class TQVButtonGroup;
@@ -34,17 +34,6 @@ class TDEAction;
 
 #include <config.h>
 
-namespace SuspendType {
-enum SuspendType {
-	NotSpecified = 0,
-	Freeze,
-	Standby,
-	Suspend,
-	Hibernate,
-	HybridSuspend
-};
-};
-
 // The (singleton) widget that makes/fades the desktop gray.
 class KSMShutdownFeedback : public TQWidget
 {
@@ -149,7 +138,6 @@ private:
 	TQString m_bootOption;
 	TQPopupMenu *targets;
 	TQStringList rebootOptions;
-	bool m_lockOnResume;
 	int* m_selection;
 };
 
diff --git a/ksmserver/shutdownkonq.png b/ksmserver/shutdownkonq.png
index aab647bee..fddefc63c 100644..100755
--- a/ksmserver/shutdownkonq.png
+++ b/ksmserver/shutdownkonq.png
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index fb9e696ec..8e02643eb 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -68,12 +68,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelocale.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <unistd.h>
 #include <tdeapplication.h>
 #include <kstaticdeleter.h>
 #include <tdetempfile.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <twinmodule.h>
@@ -87,8 +87,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 
 // shall we show a nice fancy login screen?
-bool showFancyLogin = FALSE;
-bool trinity_startup_main_sequence_done = FALSE;
+bool showFancyLogin = false;
+bool trinity_startup_main_sequence_done = false;
 
 /*!  Restores the previous session. Ensures the window manager is
   running (if specified).
@@ -145,7 +145,7 @@ void KSMServer::restoreSession( TQString sessionName )
         if ((showFancyLogin) && (!startupNotifierIPDlg)) {
             startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
         }
-        TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
+        TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) );
     } else {
         if ((showFancyLogin) && (!startupNotifierIPDlg)) {
             startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
@@ -192,7 +192,7 @@ void KSMServer::startDefaultSession()
     if ((showFancyLogin) && (!startupNotifierIPDlg)) {
         startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
     }
-    TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) );
+    TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) );
 }
 
 
@@ -226,7 +226,7 @@ void KSMServer::autoStart0Done()
     connectDCOPSignal( "kcminit", "kcminit", "phase1Done()",
                        "kcmPhase1Done()", true);
     state = KcmInitPhase1;
-    TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase1Timeout())); // protection
+    TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase1Timeout())); // protection
     DCOPRef( "kcminit", "kcminit" ).send( "runPhase1" );
 }
 
@@ -307,7 +307,7 @@ void KSMServer::tryRestoreNext()
                           config->readEntry( TQString("userId")+n ));
         lastIdStarted = config->readEntry( TQString("clientId")+n );
         if ( !lastIdStarted.isEmpty() ) {
-            restoreTimer.start( 2000, TRUE );
+            restoreTimer.start( 2000, true );
             return; // we get called again from the clientRegistered handler
         }
     }
@@ -333,7 +333,7 @@ void KSMServer::autoStart2()
     DCOPRef( "kdesktop", "KDesktopIface" ).send( "runAutoStart" );
     connectDCOPSignal( "kcminit", "kcminit", "phase2Done()",
                        "kcmPhase2Done()", true);
-    TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection
+    TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase2Timeout())); // protection
     DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" );
     if( !defaultSession())
         restoreLegacySession( TDEGlobal::config());
@@ -462,7 +462,7 @@ void KSMServer::upAndRunning( const TQString& msg )
     if (startupNotifierIPDlg) {
         static_cast<KSMStartupIPDlg*>(startupNotifierIPDlg)->setStartupPhase(msg);
         if (msg == TQString("session ready")) {
-            trinity_startup_main_sequence_done = TRUE;
+            trinity_startup_main_sequence_done = true;
         }
     }
     DCOPRef( "ksplash" ).send( "upAndRunning", msg );
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index e236ddfee..8bd196ab0 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -63,10 +63,10 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 
 TQWidget* KSMStartupIPDlg::showStartupIP()
 {
-    kapp->enableStyles();
+    tdeApp->enableStyles();
     KSMStartupIPDlg* l = new KSMStartupIPDlg( 0 );
 
-    kapp->disableStyles();
+    tdeApp->disableStyles();
 
     return l;
 }
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 66b6eb83b..7a8b53b57 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -24,9 +24,9 @@
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kpushbutton.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktar.h>
 #include <ktrader.h>
 #include <kurldrag.h>
@@ -36,8 +36,8 @@ ThemeListBox::ThemeListBox(TQWidget *parent)
   : TDEListBox(parent)
 {
    setAcceptDrops(true);
-   connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
-           this, TQT_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
+   connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
+           this, TQ_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
 }
 
 void ThemeListBox::dragEnterEvent(TQDragEnterEvent* event)
@@ -100,21 +100,21 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
 
   mThemesList = new ThemeListBox(this);
   mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-  connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int)));
-  connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&)));
+  connect(mThemesList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSetTheme(int)));
+  connect(mThemesList, TQ_SIGNAL(filesDropped(const KURL::List&)), TQ_SLOT(slotFilesDropped(const KURL::List&)));
   leftbox->addWidget(mThemesList);
 
   mBtnAdd = new KPushButton( i18n("Add..."), this );
   leftbox->addWidget( mBtnAdd );
-  connect(mBtnAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
+  connect(mBtnAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
 
   mBtnRemove = new KPushButton( i18n("Remove"), this );
   leftbox->addWidget( mBtnRemove );
-  connect(mBtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+  connect(mBtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
 
   mBtnTest = new KPushButton( i18n("Test"), this );
   leftbox->addWidget( mBtnTest );
-  connect(mBtnTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTest()));
+  connect(mBtnTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTest()));
 
   TQVBoxLayout* rightbox = new TQVBoxLayout( hbox, KDialog::spacingHint() );
   hbox->setStretchFactor( rightbox, 3 );
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 5ede31d1f..a88c3f632 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -26,7 +26,7 @@ class SplashInstaller : public TQWidget
 {
   TQ_OBJECT
 public:
-  SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=FALSE);
+  SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=false);
   ~SplashInstaller();
 
   virtual void load();
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index f0b5d1f52..0e9972bbe 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -19,7 +19,7 @@
 #include <tdecmodule.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "installer.h"
 
@@ -59,7 +59,7 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt
   TQHBoxLayout *box = new TQHBoxLayout(this, 0, 0);
   box->addWidget(mInstaller);
 #endif
-  connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+  connect( mInstaller, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
   TDEAboutData *about = new TDEAboutData( "kcmksplash"
                                       ,I18N_NOOP("TDE splash screen theme manager")
                                       ,"0.1"
diff --git a/ksplashml/pics/splash.png b/ksplashml/pics/splash.png
index 399c2915a..295e18bed 100644..100755
--- a/ksplashml/pics/splash.png
+++ b/ksplashml/pics/splash.png
diff --git a/ksplashml/pics/themes/TDE-Classic/Preview.png b/ksplashml/pics/themes/TDE-Classic/Preview.png
index 4df2c8ccd..51f9941d1 100644..100755
--- a/ksplashml/pics/themes/TDE-Classic/Preview.png
+++ b/ksplashml/pics/themes/TDE-Classic/Preview.png
diff --git a/ksplashml/pics/themes/TDE-Classic/splash_active_bar.png b/ksplashml/pics/themes/TDE-Classic/splash_active_bar.png
index 747f2c510..bd76dd7ed 100644..100755
--- a/ksplashml/pics/themes/TDE-Classic/splash_active_bar.png
+++ b/ksplashml/pics/themes/TDE-Classic/splash_active_bar.png
diff --git a/ksplashml/pics/themes/TDE-Classic/splash_inactive_bar.png b/ksplashml/pics/themes/TDE-Classic/splash_inactive_bar.png
index 8957dc895..4d0142e3c 100644..100755
--- a/ksplashml/pics/themes/TDE-Classic/splash_inactive_bar.png
+++ b/ksplashml/pics/themes/TDE-Classic/splash_inactive_bar.png
diff --git a/ksplashml/pics/themes/TDE-Classic/splash_top.png b/ksplashml/pics/themes/TDE-Classic/splash_top.png
index 63e047d1d..b61a58d8e 100644..100755
--- a/ksplashml/pics/themes/TDE-Classic/splash_top.png
+++ b/ksplashml/pics/themes/TDE-Classic/splash_top.png
diff --git a/ksplashml/pics/themes/blue-bend/Preview.png b/ksplashml/pics/themes/blue-bend/Preview.png
index 0145181bd..58ff147a7 100644..100755
--- a/ksplashml/pics/themes/blue-bend/Preview.png
+++ b/ksplashml/pics/themes/blue-bend/Preview.png
diff --git a/ksplashml/pics/themes/blue-bend/splash_active_bar.png b/ksplashml/pics/themes/blue-bend/splash_active_bar.png
index 0d39d1b66..b7daf5439 100644..100755
--- a/ksplashml/pics/themes/blue-bend/splash_active_bar.png
+++ b/ksplashml/pics/themes/blue-bend/splash_active_bar.png
diff --git a/ksplashml/pics/themes/blue-bend/splash_inactive_bar.png b/ksplashml/pics/themes/blue-bend/splash_inactive_bar.png
index 047ca9136..9badc1606 100644..100755
--- a/ksplashml/pics/themes/blue-bend/splash_inactive_bar.png
+++ b/ksplashml/pics/themes/blue-bend/splash_inactive_bar.png
diff --git a/ksplashml/pics/themes/blue-bend/splash_top.png b/ksplashml/pics/themes/blue-bend/splash_top.png
index 1dcc548fd..4d51f3765 100644..100755
--- a/ksplashml/pics/themes/blue-bend/splash_top.png
+++ b/ksplashml/pics/themes/blue-bend/splash_top.png
diff --git a/ksplashml/pics/themes/default/Preview.png b/ksplashml/pics/themes/default/Preview.png
index e6a2efc34..91d202b91 100644..100755
--- a/ksplashml/pics/themes/default/Preview.png
+++ b/ksplashml/pics/themes/default/Preview.png
diff --git a/ksplashml/pics/themes/default/splash_active_bar.png b/ksplashml/pics/themes/default/splash_active_bar.png
index 2586ec4f3..353bf8e98 100644..100755
--- a/ksplashml/pics/themes/default/splash_active_bar.png
+++ b/ksplashml/pics/themes/default/splash_active_bar.png
diff --git a/ksplashml/pics/themes/default/splash_bottom.png b/ksplashml/pics/themes/default/splash_bottom.png
index bceda5097..67e25ad9e 100644..100755
--- a/ksplashml/pics/themes/default/splash_bottom.png
+++ b/ksplashml/pics/themes/default/splash_bottom.png
diff --git a/ksplashml/pics/themes/default/splash_inactive_bar.png b/ksplashml/pics/themes/default/splash_inactive_bar.png
index 0d4b451cd..19567968f 100644..100755
--- a/ksplashml/pics/themes/default/splash_inactive_bar.png
+++ b/ksplashml/pics/themes/default/splash_inactive_bar.png
diff --git a/ksplashml/pics/themes/default/splash_top.png b/ksplashml/pics/themes/default/splash_top.png
index f9b305b2a..0168be83a 100644..100755
--- a/ksplashml/pics/themes/default/splash_top.png
+++ b/ksplashml/pics/themes/default/splash_top.png
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index c3a0285a8..99a3145f0 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -15,7 +15,7 @@
 #include <kgenericfactory.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprogress.h>
 
 #include <tqcheckbox.h>
@@ -71,7 +71,7 @@ ThemeDefault::ThemeDefault( TQWidget *parent, const char *name, const TQStringLi
   if( mIconsFlashing )
   {
     mFlashTimer = new TQTimer( this );
-    connect( mFlashTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flash()) );
+    connect( mFlashTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flash()) );
     mFlashPixmap1 = new TQPixmap();
     mFlashPixmap2 = new TQPixmap();
 
@@ -158,7 +158,7 @@ void ThemeDefault::_initUi()
       mLabel->setPaletteForegroundColor( mLabelForeground );
       mLabel->setPaletteBackgroundPixmap( blimage );
       TQFont f(mLabel->font());
-      f.setBold(TRUE);
+      f.setBold(true);
       mLabel->setFont(f);
 
       mProgressBar = new KProgress( mLabel );
@@ -191,7 +191,7 @@ void ThemeDefault::_initUi()
   setFixedHeight( mInactivePixmap->height() +
                   top_label->height() + bottom_label->height() );
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   // kdDebug() << "ThemeDefault::_initUi" << rect << endl;
 
diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h
index 0e99d69f7..35aa414eb 100644
--- a/ksplashml/themeengine/default/themelegacy.h
+++ b/ksplashml/themeengine/default/themelegacy.h
@@ -41,7 +41,7 @@ protected:
  * @short Traditional Trinity splash screen.
  */
 class ObjKsTheme;
-class KDE_EXPORT ThemeDefault : public ThemeEngine
+class TDE_EXPORT ThemeDefault : public ThemeEngine
 {
   TQ_OBJECT
 public:
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index 609956592..d5b072f80 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -15,7 +15,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>
@@ -32,9 +32,9 @@ ObjKsTheme::ObjKsTheme( const TQString& theme )
   :mActiveTheme (theme), mThemeDir("/"), mThemeConfig (0L), mThemePrefix( "Themes/" ), d(0)
 {
   // Get Xinerama config.
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Xinerama" );
-  TQDesktopWidget *desktop = kapp->desktop();
+  TQDesktopWidget *desktop = tdeApp->desktop();
   mXineramaScreen = config->readNumEntry("KSplashScreen", desktop->primaryScreen());
 
   // For Xinerama, let's put the mouse on the first head.  Otherwise it could appear anywhere!
@@ -92,7 +92,7 @@ bool ObjKsTheme::loadThemeRc( const TQString& activeTheme, bool force )
 bool ObjKsTheme::loadLocalConfig( const TQString& activeTheme, bool force )
 {
   //kdDebug() << "ObjKsTheme::loadLocalConfig" << endl;
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   return( loadTDEConfig( cfg, activeTheme, force ) );
 }
 
diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h
index f6884b46f..7702371f3 100644
--- a/ksplashml/themeengine/objkstheme.h
+++ b/ksplashml/themeengine/objkstheme.h
@@ -26,7 +26,7 @@ class TDEConfig;
  * of KSplash completely, and offers a friendlier way
  * of installing custom splash screens.
  */
-class KDE_EXPORT ObjKsTheme : public TQObject
+class TDE_EXPORT ObjKsTheme : public TQObject
 {
   TQ_OBJECT
 public:
diff --git a/ksplashml/themeengine/redmond/main.cpp b/ksplashml/themeengine/redmond/main.cpp
index 7b4a6bb2e..6e910064d 100644
--- a/ksplashml/themeengine/redmond/main.cpp
+++ b/ksplashml/themeengine/redmond/main.cpp
@@ -10,7 +10,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqlabel.h>
 #include <tqpixmap.h>
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 3792d6057..548e62769 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -22,7 +22,7 @@
 #include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kuser.h>
 #include <tdeemailsettings.h>
 
@@ -86,7 +86,7 @@ ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringLi
 
 void ThemeRedmond::_initUi()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   mImage.resize( screen.width(), screen.height() );
@@ -275,7 +275,7 @@ void ThemeRedmond::_initUi()
 
 void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
 
   TQPainter p;
   p.begin( this );
@@ -308,7 +308,7 @@ void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 
 void ThemeRedmond::_readSettings()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   if( !mTheme )
diff --git a/ksplashml/themeengine/standard/Preview.png b/ksplashml/themeengine/standard/Preview.png
index b2ce44163..9545b9eac 100644..100755
--- a/ksplashml/themeengine/standard/Preview.png
+++ b/ksplashml/themeengine/standard/Preview.png
diff --git a/ksplashml/themeengine/standard/pics/Preview.png b/ksplashml/themeengine/standard/pics/Preview.png
index 4fb01119e..ec936a18c 100644..100755
--- a/ksplashml/themeengine/standard/pics/Preview.png
+++ b/ksplashml/themeengine/standard/pics/Preview.png
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 8fd950eb5..c0fdff594 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -15,7 +15,7 @@
 #include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 
 #include <tqdesktopwidget.h>
@@ -75,7 +75,7 @@ void ThemeStandard::_initUi()
     resize( 0, 0 );
   }
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   move( rect.x() + (rect.width() - size().width())/2,
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 856547895..9f12a5aed 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -65,12 +65,12 @@ WndIcon::WndIcon(
   TQPoint p = determinePosition();
   mGroundX = mPosX = p.x();
   mGroundY = mPosY = p.y();
-  move( p + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
+  move( p + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
 
   if( mIconJumping )
   {
     TQTimer *t = new TQTimer( this );
-    connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(slotJump()));
+    connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(slotJump()));
     t->start( 50, false );
   }
 }
@@ -98,7 +98,7 @@ TQPoint WndIcon::determinePosition()
   int DW, DH, SBH, wid, X, Y, x, y, nSlot, topshift, bottomshift;
 
   bottomshift = topshift = 0;
-  const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
+  const TQRect srect = tdeApp->desktop()->screenGeometry( mXineramaScreen );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   DW = srect.width();
   DH = srect.height();
@@ -301,7 +301,7 @@ void WndIcon::slotJump()
     mPosY = (int)((float)mPosY - mVelocity );
     break;
   }
-  move( TQPoint( mPosX, mPosY ) + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
+  move( TQPoint( mPosX, mPosY ) + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
 }
 
 void WndIcon::slotStopJumping()
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index db397a055..9567a1028 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -46,7 +46,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
   setCursor( KCursor::blankCursor() );
   setSpacing( 5 );
 
-  const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( xineramaScreen );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   TQLabel *pix = new TQLabel( this );
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index 9a7d3aba5..e7e34866e 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -44,9 +44,9 @@ ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args )
   : TQVBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), d(0), mUseWM(false)
 {
   d = new ThemeEnginePrivate;
-  kapp->installX11EventFilter( this );
-  kapp->installEventFilter( this );
-  (void)kapp->desktop();
+  tdeApp->installX11EventFilter( this );
+  tdeApp->installEventFilter( this );
+  (void)tdeApp->desktop();
   XWindowAttributes rootAttr;
   XGetWindowAttributes(tqt_xdisplay(), RootWindow(tqt_xdisplay(),
                         tqt_xscreen()), &rootAttr);
@@ -77,7 +77,7 @@ ThemeEngine::~ThemeEngine()
 bool ThemeEngine::eventFilter( TQObject* o, TQEvent* e )
 {
     if( e->type() == TQEvent::Show && o->isWidgetType())
-        addSplashWindow( TQT_TQWIDGET( o ));
+        addSplashWindow( static_cast<TQWidget*>( o ));
     return false;
 }
 
@@ -101,13 +101,13 @@ void ThemeEngine::addSplashWindow( TQWidget* w )
         XChangeWindowAttributes( tqt_xdisplay(), w->winId(), CWOverrideRedirect, &attrs );
     }
     d->mSplashWindows.prepend( w->winId());
-    connect( w, TQT_SIGNAL( destroyed( TQObject* )), TQT_SLOT( splashWindowDestroyed( TQObject* )));
+    connect( w, TQ_SIGNAL( destroyed( TQObject* )), TQ_SLOT( splashWindowDestroyed( TQObject* )));
     w->raise();
 }
 
 void ThemeEngine::splashWindowDestroyed( TQObject* obj )
 {
-    d->mSplashWindows.remove( TQT_TQWIDGET( obj )->winId());
+    d->mSplashWindows.remove( static_cast<TQWidget*>( obj )->winId());
 }
 
 bool ThemeEngine::x11Event( XEvent* e )
diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h
index 27ae5ec11..c1639ac74 100644
--- a/ksplashml/themeengine/themeengine.h
+++ b/ksplashml/themeengine/themeengine.h
@@ -16,7 +16,7 @@
 #include <tqvbox.h>
 #include <tqwidget.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 class ObjKsTheme;
@@ -25,7 +25,7 @@ class TQMouseEvent;
 /**
  * @short The base for the ThemeEngine's configuration widget.
  */
-class KDE_EXPORT ThemeEngineConfig: public TQVBox
+class TDE_EXPORT ThemeEngineConfig: public TQVBox
 {
   TQ_OBJECT
 public:
@@ -48,7 +48,7 @@ protected:
  * @short Base class for all theme engines. Member functions need to be
  * overridden by derived classes in order to provide actual functionality.
  */
-class KDE_EXPORT ThemeEngine: public TQVBox
+class TDE_EXPORT ThemeEngine: public TQVBox
 {
   TQ_OBJECT
 public:
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index e0ba8fb9e..26c59f87a 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -15,7 +15,7 @@
 #include <kgenericfactory.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprogress.h>
 
 #include <tqcheckbox.h>
@@ -77,7 +77,7 @@ void ThemeUnified::_initUi()
   mSysModalDialog->show();
   mSysModalDialog->setActiveWindow();
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
 
   // Center the dialog
   TQSize sh = sizeHint();
diff --git a/ksplashml/themeengine/unified/themeunified.h b/ksplashml/themeengine/unified/themeunified.h
index e2930943c..d002af4b0 100644
--- a/ksplashml/themeengine/unified/themeunified.h
+++ b/ksplashml/themeengine/unified/themeunified.h
@@ -40,7 +40,7 @@ protected:
  * @short Traditional Trinity splash screen.
  */
 class ObjKsTheme;
-class KDE_EXPORT ThemeUnified : public ThemeEngine
+class TDE_EXPORT ThemeUnified : public ThemeEngine
 {
   TQ_OBJECT
 public:
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 3fd1d786d..eb0a1472a 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -19,7 +19,7 @@
 #include <klibloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 #include <twin.h>
 #include <dcopclient.h>
@@ -46,7 +46,7 @@ KSplash::KSplash(const char *name)
   mSessMgrCalled = false;
   mTimeToGo = false;
 
-  TDEConfig * config = kapp->config();
+  TDEConfig * config = tdeApp->config();
   slotReadProperties(config);
 
   prepareSplashScreen();
@@ -55,27 +55,27 @@ KSplash::KSplash(const char *name)
   mCurrentAction = mActionList.first();
 
   config->setGroup( "General" );
-  if ( config->readBoolEntry( "CloseOnClick", TRUE ) )
+  if ( config->readBoolEntry( "CloseOnClick", true ) )
     mThemeEngine->installEventFilter( this );
 
-  connect( mThemeEngine, TQT_SIGNAL(destroyed()), this, TQT_SLOT(close()) );
-  connect( this, TQT_SIGNAL(stepsChanged(int)), TQT_SLOT(slotUpdateSteps(int)) );
-  connect( this, TQT_SIGNAL(progressChanged(int)), TQT_SLOT(slotUpdateProgress(int)) );
+  connect( mThemeEngine, TQ_SIGNAL(destroyed()), this, TQ_SLOT(close()) );
+  connect( this, TQ_SIGNAL(stepsChanged(int)), TQ_SLOT(slotUpdateSteps(int)) );
+  connect( this, TQ_SIGNAL(progressChanged(int)), TQ_SLOT(slotUpdateProgress(int)) );
 
   if( mKsTheme->testing() )
   {
     slotUpdateSteps(7);
-    TQTimer::singleShot( 1000, this, TQT_SLOT(slotExec()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(slotExec()));
   }
   else
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()));
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()));
 
   // Make sure we don't stay up forever.
   if (!mKsTheme->managedMode())
   {
     close_timer = new TQTimer( this );
-    connect( close_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( close() ) );
-    close_timer->start( 60000, TRUE );
+    connect( close_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( close() ) );
+    close_timer->start( 60000, true );
   }
 }
 
@@ -133,14 +133,14 @@ void KSplash::slotInsertAction( const TQString& pix, const TQString& msg )
 
 void KSplash::slotExec()
 {
-  TQTimer::singleShot( 200, this, TQT_SLOT(nextIcon()));
+  TQTimer::singleShot( 200, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::nextIcon()
 {
   if( !mCurrentAction || mTimeToGo )
   {
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
     return;
   }
 
@@ -155,26 +155,26 @@ void KSplash::nextIcon()
   }
 
   if( mKsTheme->testing() )
-    TQTimer::singleShot( 1000, this, TQT_SLOT(nextIcon()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::initDcop()
 {
-  disconnect( kapp->dcopClient(), TQT_SIGNAL( attachFailed(const TQString&) ), kapp, TQT_SLOT( dcopFailure(const TQString&) ) );
+  disconnect( tdeApp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), tdeApp, TQ_SLOT( dcopFailure(const TQString&) ) );
 
-  if ( kapp->dcopClient()->isAttached() )
+  if ( tdeApp->dcopClient()->isAttached() )
     return;
 
-  if ( kapp->dcopClient()->attach() )
+  if ( tdeApp->dcopClient()->attach() )
   {
     if(!mKsTheme->managedMode())
       upAndRunning( "dcop" );
-    kapp->dcopClient()->registerAs( "ksplash", false );
-    kapp->dcopClient()->setDefaultObject( objId() );
+    tdeApp->dcopClient()->registerAs( "ksplash", false );
+    tdeApp->dcopClient()->setDefaultObject( objId() );
   }
   else
   {
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()) );
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()) );
   }
 }
 
@@ -206,7 +206,7 @@ void KSplash::upAndRunning( TQString s )
     firstTime = false;
   }
   if ( close_timer->isActive() )
-    close_timer->start( 60000, TRUE );
+    close_timer->start( 60000, true );
 
   if( s == "dcop" )
   {
@@ -247,7 +247,7 @@ void KSplash::upAndRunning( TQString s )
     //if(!mSessMgrCalled) emit nextIcon();
     mTimeToGo = true;
     close_timer->stop();
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
   }
   else
   {
@@ -307,7 +307,7 @@ void KSplash::setStartupItemCount( int count )
 void KSplash::startupComplete()
 {
   mTimeToGo = true;
-  TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
 }
 
 void KSplash::close()
@@ -383,7 +383,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
   {
     TQStringList themeTitle;
     themeTitle << theme;
-    return static_cast<ThemeEngine *>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "theme", objName.latin1(), themeTitle)));
+    return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle));
   }
   else
     return 0L;
@@ -426,9 +426,9 @@ bool KSplash::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
   {
-    TQTimer::singleShot( 0, this, TQT_SLOT(close()));
-    return TRUE;
+    TQTimer::singleShot( 0, this, TQ_SLOT(close()));
+    return true;
   }
   else
-    return FALSE;
+    return false;
 }
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index bcbc6d846..50efa566c 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -17,7 +17,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <twin.h>
 #include <twinmodule.h>
@@ -55,13 +55,13 @@ KStart::KStart()
         sendRule();
     else {
         // connect to window add to get the NEW windows
-        connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
+        connect(twinmodule, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)));
         if (windowtitle != 0)
     	    twinmodule->doNotManage( windowtitle );
     }
     // propagate the app startup notification info to the started app
     TDEStartupInfoId id;
-    id.initId( kapp->startupId());
+    id.initId( tdeApp->startupId());
     id.setupStartupEnv();
 
     //finally execute the comand
@@ -76,7 +76,7 @@ KStart::KStart()
     else
         TDEStartupInfo::sendFinish( id ); // failed to start
 
-  TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQT_SLOT( quit()));
+  TQTimer::singleShot( useRule ? 0 : 120 * 1000, tdeApp, TQ_SLOT( quit()));
 }
 
 void KStart::sendRule() {
@@ -126,7 +126,7 @@ void KStart::sendRule() {
     }
 
     msg.broadcastMessage( "_KDE_NET_WM_TEMPORARY_RULES", message, -1, false );
-    kapp->flushX();
+    tdeApp->flushX();
 }
 
 const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask
@@ -181,9 +181,9 @@ static bool wstate_withdrawn( WId winid )
     unsigned long length, after;
     unsigned char *data;
     int r = XGetWindowProperty( tqt_xdisplay(), winid, tqt_wm_state, 0, 2,
-				FALSE, AnyPropertyType, &type, &format,
+				false, AnyPropertyType, &type, &format,
 				&length, &after, &data );
-    bool withdrawn = TRUE;
+    bool withdrawn = true;
     if ( r == Success && data && format == 32 ) {
 	TQ_UINT32 *wstate = (TQ_UINT32*)data;
 	withdrawn  = (*wstate == WithdrawnState );
diff --git a/ksysguard/configure.in.in b/ksysguard/configure.in.in
index f4ab83853..005a10495 100644
--- a/ksysguard/configure.in.in
+++ b/ksysguard/configure.in.in
@@ -7,7 +7,6 @@ case "$host" in
   *-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
   *-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
   *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
-  *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
   *-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
   *-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
   *) ksysguardd_compile=no; UNAME='' ;;
@@ -20,7 +19,6 @@ AM_CONDITIONAL(include_ksysguardd_linux, test "$UNAME" = Linux)
 AM_CONDITIONAL(include_ksysguardd_freebsd, test "$UNAME" = FreeBSD)
 AM_CONDITIONAL(include_ksysguardd_netbsd, test "$UNAME" = NetBSD)
 AM_CONDITIONAL(include_ksysguardd_solaris, test "$UNAME" = Solaris)
-AM_CONDITIONAL(include_ksysguardd_tru64, test "$UNAME" = Tru64)
 AM_CONDITIONAL(include_ksysguardd_irix, test "$UNAME" = Irix)
 AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
 AC_SUBST(UNAME)
diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp
index e1c8db73e..007b629e5 100644
--- a/ksysguard/gui/KSysGuardApplet.cpp
+++ b/ksysguard/gui/KSysGuardApplet.cpp
@@ -34,7 +34,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <ksavefile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdepopupmenu.h>
 
 #include <ksgrd/SensorClient.h>
@@ -50,7 +50,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
+  TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile )
   {
     TDEGlobal::locale()->insertCatalogue( "ksysguard" );
     return new KSysGuardApplet( configFile, KPanelApplet::Normal,
@@ -120,9 +120,9 @@ void KSysGuardApplet::preferences()
   }
   mSettingsDlg = new KSGAppletSettings( this );
 
-  connect( mSettingsDlg, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDlg, TQT_SIGNAL( finished() ), TQT_SLOT( preferencesFinished() ) );
+  connect( mSettingsDlg, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDlg, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDlg, TQ_SIGNAL( finished() ), TQ_SLOT( preferencesFinished() ) );
 
   mSettingsDlg->setNumDisplay( mDockCount );
   mSettingsDlg->setSizeRatio( (int) ( mSizeRatio * 100.0 + 0.5 ) );
@@ -232,8 +232,8 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
           mDockList[ dock ] = wdg;
           layout();
 
-          connect( wdg, TQT_SIGNAL( modified( bool ) ),
-                   TQT_SLOT( sensorDisplayModified( bool ) ) );
+          connect( wdg, TQ_SIGNAL( modified( bool ) ),
+                   TQ_SLOT( sensorDisplayModified( bool ) ) );
 
           mDockList[ dock ]->show();
         }
@@ -405,8 +405,8 @@ bool KSysGuardApplet::load()
     delete mDockList[ dock ];
     mDockList[ dock ] = newDisplay;
 
-    connect( newDisplay, TQT_SIGNAL( modified( bool ) ),
-             TQT_SLOT( sensorDisplayModified( bool ) ) );
+    connect( newDisplay, TQ_SIGNAL( modified( bool ) ),
+             TQ_SLOT( sensorDisplayModified( bool ) ) );
   }
 
   return true;
diff --git a/ksysguard/gui/SensorBrowser.cpp b/ksysguard/gui/SensorBrowser.cpp
index 32f290460..575389bac 100644
--- a/ksysguard/gui/SensorBrowser.cpp
+++ b/ksysguard/gui/SensorBrowser.cpp
@@ -68,11 +68,11 @@ SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm,
 {
   mHostInfoList.setAutoDelete(true);
 
-  connect( mSensorManager, TQT_SIGNAL( update() ), TQT_SLOT( update() ) );
-  connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ),
-           TQT_SLOT( newItemSelected( TQListViewItem* ) ) );
-  connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ),
-           TQT_SLOT( newItemSelected( TQListViewItem* ) ) );
+  connect( mSensorManager, TQ_SIGNAL( update() ), TQ_SLOT( update() ) );
+  connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+           TQ_SLOT( newItemSelected( TQListViewItem* ) ) );
+  connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ),
+           TQ_SLOT( newItemSelected( TQListViewItem* ) ) );
 
   addColumn( i18n( "Sensor Browser" ) );
   addColumn( i18n( "Sensor Type" ) );
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
index 5b09addc0..43fbe549f 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
@@ -104,7 +104,7 @@ void DancingBars::configureSettings()
   }
   mSettingsDialog->setSensors( list );
 
-  connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
 
   if ( mSettingsDialog->exec() )
     applySettings();
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
index 9b05d6806..b754791f8 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
@@ -181,15 +181,15 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   TQWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) );
   pageLayout->addWidget( mRemoveButton, 1, 1 );
 
-  connect( mUseLowerLimit, TQT_SIGNAL( toggled( bool ) ),
-           mLowerLimit, TQT_SLOT( setEnabled( bool ) ) );
-  connect( mUseUpperLimit, TQT_SIGNAL( toggled( bool ) ),
-           mUpperLimit, TQT_SLOT( setEnabled( bool ) ) );
-
-  connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
-           TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) );
+  connect( mUseLowerLimit, TQ_SIGNAL( toggled( bool ) ),
+           mLowerLimit, TQ_SLOT( setEnabled( bool ) ) );
+  connect( mUseUpperLimit, TQ_SIGNAL( toggled( bool ) ),
+           mUpperLimit, TQ_SLOT( setEnabled( bool ) ) );
+
+  connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+           TQ_SLOT( selectionChanged( TQListViewItem* ) ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) );
 
   TDEAcceleratorManager::manage( this );
 
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
index 22894afea..eccf470c2 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
@@ -58,7 +58,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
    * SensorDisplay::eventFilter. */
 	mPlotter->installEventFilter( this );
 
-  setPlotterWidget( TQT_TQWIDGET(mPlotter) );
+  setPlotterWidget( mPlotter );
 
   setModified( false );
 }
@@ -111,9 +111,9 @@ void FancyPlotter::configureSettings()
   }
   mSettingsDialog->setSensors( list );
 
-  connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDialog, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) );
-  connect( mSettingsDialog, TQT_SIGNAL( finished() ), TQT_SLOT( killDialog() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( finished() ), TQ_SLOT( killDialog() ) );
 
   mSettingsDialog->show(); 
 }
@@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
                                    .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
-  TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
-  TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+  TQToolTip::remove( mPlotter );
+  TQToolTip::add( mPlotter, tooltip );
 
   return true;
 }
@@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos )
                                    .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
-  TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
-  TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+  TQToolTip::remove( mPlotter );
+  TQToolTip::add( mPlotter, tooltip );
 
   return true;
 }
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
index 447d9c718..7e7e15d7d 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
@@ -257,30 +257,30 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   mMoveDownButton->setEnabled( false );
   pageLayout->addWidget( mMoveDownButton, 4, 1 );
 
-  connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMinValue,
-           TQT_SLOT( setDisabled( bool ) ) );
-  connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMaxValue,
-           TQT_SLOT( setDisabled( bool ) ) );
-  connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesDistance,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesScroll,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesColor,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesCount,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesColor,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mShowLabels,
-           TQT_SLOT( setEnabled( bool ) ) );
-  connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
-           TQT_SLOT( selectionChanged( TQListViewItem* ) ) );
-
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) );
-  connect( mMoveUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveUpSensor() ) );
-  connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) );
-  connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor()));
+  connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMinValue,
+           TQ_SLOT( setDisabled( bool ) ) );
+  connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMaxValue,
+           TQ_SLOT( setDisabled( bool ) ) );
+  connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesDistance,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesScroll,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesColor,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesCount,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesColor,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mShowLabels,
+           TQ_SLOT( setEnabled( bool ) ) );
+  connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+           TQ_SLOT( selectionChanged( TQListViewItem* ) ) );
+
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) );
+  connect( mMoveUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveUpSensor() ) );
+  connect( mMoveDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveDownSensor() ) );
+  connect ( mSensorView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQ_SLOT(editSensor()));
 
   TDEAcceleratorManager::manage( this );
 }
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cpp b/ksysguard/gui/SensorDisplayLib/ListView.cpp
index 5b748e9c0..828832668 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cpp
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cpp
@@ -329,7 +329,7 @@ ListView::configureSettings()
 {
 	lvs = new ListViewSettings(this, "ListViewSettings");
 	TQ_CHECK_PTR(lvs);
-	connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
+	connect(lvs, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings()));
 
 	TQColorGroup colorGroup = monitor->colorGroup();
 	lvs->setGridColor(colorGroup.color(TQColorGroup::Link));
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cpp b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
index 763953163..c92594fa6 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cpp
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
@@ -92,16 +92,16 @@ void LogFile::configureSettings(void)
 	lfs->ruleList->insertStringList(filterRules);
 	lfs->title->setText(title());
 
-	connect(lfs->okButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(accept()));
-	connect(lfs->applyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applySettings()));
-	connect(lfs->cancelButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(reject()));
-
-	connect(lfs->fontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsFontSelection()));
-	connect(lfs->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsAddRule()));
-	connect(lfs->deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsDeleteRule()));
-	connect(lfs->changeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsChangeRule()));
-	connect(lfs->ruleList, TQT_SIGNAL(selected(int)), this, TQT_SLOT(settingsRuleListSelected(int)));
-	connect(lfs->ruleText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(settingsAddRule()));
+	connect(lfs->okButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(accept()));
+	connect(lfs->applyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applySettings()));
+	connect(lfs->cancelButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(reject()));
+
+	connect(lfs->fontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsFontSelection()));
+	connect(lfs->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsAddRule()));
+	connect(lfs->deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsDeleteRule()));
+	connect(lfs->changeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsChangeRule()));
+	connect(lfs->ruleList, TQ_SIGNAL(selected(int)), this, TQ_SLOT(settingsRuleListSelected(int)));
+	connect(lfs->ruleText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(settingsAddRule()));
 
 	if (lfs->exec()) {
 		applySettings();
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
index 111c4787b..382b6cb13 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
@@ -202,7 +202,7 @@ MultiMeter::configureSettings()
 	mms->setAlarmDigitColor(alarmDigitColor);
 	mms->setMeterBackgroundColor(lcd->backgroundColor());
 
-	connect(mms, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
+	connect(mms, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings()));
 
 	if (mms->exec())
 		applySettings();
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
index fb265df74..c6c16eff7 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
@@ -445,9 +445,9 @@
     <include location="global" impldecl="in implementation">knumvalidator.h</include>
     <include location="local"  impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>setMeterBackgroundColor( const TQColor &amp; c )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function specifier="non virtual" returnType="TQString">title()</function>
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
index fe88f292f..e97fabffc 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
@@ -9,8 +9,8 @@
 
 void MultiMeterSettingsWidget::init()
 {
-  m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
-  m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+  m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+  m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
 
   m_title->setFocus();
 }
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
index 91851d113..cb4579031 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
@@ -81,12 +81,12 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	pListSearchLine = new TDEListViewSearchLineWidget(pList, this, "process_list_search_line");
 	gmSearch->addWidget(pListSearchLine, 1);
 
-	connect(pList, TQT_SIGNAL(killProcess(int, int)),
-			this, TQT_SLOT(killProcess(int, int)));
-	connect(pList, TQT_SIGNAL(reniceProcess(const TQValueList<int> &, int)),
-			this, TQT_SLOT(reniceProcess(const TQValueList<int> &, int)));
-	connect(pList, TQT_SIGNAL(listModified(bool)),
-			this, TQT_SLOT(setModified(bool)));
+	connect(pList, TQ_SIGNAL(killProcess(int, int)),
+			this, TQ_SLOT(killProcess(int, int)));
+	connect(pList, TQ_SIGNAL(reniceProcess(const TQValueList<int> &, int)),
+			this, TQ_SLOT(reniceProcess(const TQValueList<int> &, int)));
+	connect(pList, TQ_SIGNAL(listModified(bool)),
+			this, TQ_SLOT(setModified(bool)));
 
 	/* Create the combo box to configure the process filter. The
 	 * cbFilter must be created prior to constructing pList as the
@@ -103,27 +103,27 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	xbTreeView = new TQCheckBox(i18n("&Tree View"), this, "xbTreeView");
 	TQ_CHECK_PTR(xbTreeView);
 	xbTreeView->setMinimumSize(xbTreeView->sizeHint());
-	connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
-			this, TQT_SLOT(setTreeView(bool)));
+	connect(xbTreeView, TQ_SIGNAL(toggled(bool)),
+			this, TQ_SLOT(setTreeView(bool)));
 
 
 	/* When the both cbFilter and pList are constructed we can connect the
 	 * missing link. */
-	connect(cbFilter, TQT_SIGNAL(activated(int)),
-			this, TQT_SLOT(filterModeChanged(int)));
+	connect(cbFilter, TQ_SIGNAL(activated(int)),
+			this, TQ_SLOT(filterModeChanged(int)));
 
 	// Create the 'Refresh' button.
 	bRefresh = new KPushButton( KGuiItem(  i18n( "&Refresh" ), "reload" ),
             this, "bRefresh" );
 	TQ_CHECK_PTR(bRefresh);
 	bRefresh->setMinimumSize(bRefresh->sizeHint());
-	connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
+	connect(bRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateList()));
 
 	// Create the 'Kill' button.
 	bKill = new KPushButton(i18n("&Kill"), this, "bKill");
 	TQ_CHECK_PTR(bKill);
 	bKill->setMinimumSize(bKill->sizeHint());
-	connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
+	connect(bKill, TQ_SIGNAL(clicked()), this, TQ_SLOT(killProcess()));
 	/* Disable the kill button until we know that the daemon supports the
 	 * kill command. */
 	bKill->setEnabled(false);
@@ -154,7 +154,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 void ProcessController::setSearchFocus() {
 	//stupid search line widget.  See rant in fixTabOrder
 	if(!pListSearchLine->searchLine())
-		TQTimer::singleShot(100, this, TQT_SLOT(setSearchFocus()));
+		TQTimer::singleShot(100, this, TQ_SLOT(setSearchFocus()));
 	else {
 		pListSearchLine->searchLine()->setFocus();
 	}
@@ -167,7 +167,7 @@ void ProcessController::fixTabOrder() {
 	//
 	//Did i mention I hate this?
 	if(!pListSearchLine->searchLine())
-		TQTimer::singleShot(100, this, TQT_SLOT(fixTabOrder()));
+		TQTimer::singleShot(100, this, TQ_SLOT(fixTabOrder()));
 	else {
 		setTabOrder(pListSearchLine->searchLine(), cbFilter);
 		setTabOrder(cbFilter, pList);
@@ -224,7 +224,7 @@ ProcessController::killProcess(int pid, int sig)
 
 	if ( !timerOn() )
 	    // give ksysguardd time to update its proccess list
-	    TQTimer::singleShot(3000, this, TQT_SLOT(updateList()));
+	    TQTimer::singleShot(3000, this, TQ_SLOT(updateList()));
 	else
 	    updateList();
 }
@@ -274,7 +274,7 @@ ProcessController::killProcess()
 
 	if ( !timerOn())
 		// give ksysguardd time to update its proccess list
-		TQTimer::singleShot(3000, this, TQT_SLOT(updateList()));
+		TQTimer::singleShot(3000, this, TQ_SLOT(updateList()));
 	else
 		updateList();
 }
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
index 9293ef6a0..b7e8b0c72 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
@@ -221,19 +221,19 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
 
 	/* The filter mode is controlled by a combo box of the parent. If
 	 * the mode is changed we get a signal. */
-	connect(parent, TQT_SIGNAL(setFilterMode(int)),
-			this, TQT_SLOT(setFilterMode(int)));
+	connect(parent, TQ_SIGNAL(setFilterMode(int)),
+			this, TQ_SLOT(setFilterMode(int)));
 
 	/* We need to catch this signal to show various popup menues. */
 	connect(this,
-			TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
+			TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
 			this,
-			TQT_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int)));
+			TQ_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int)));
 
 	/* Since Qt does not tell us the sorting details we have to do our
 	 * own bookkeping, so we can save and restore the sorting
 	 * settings. */
-	connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortingChanged(int)));
+	connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortingChanged(int)));
 
 	ctrlKeyDown = false;
 	shiftKeyDown = false;
@@ -260,10 +260,10 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
 	headerPM->insertItem(i18n("Add Column"), HEADER_ADD);
 	headerPM->insertItem(i18n("Help on Column"), HEADER_HELP);
 
-	connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
-			this, TQT_SLOT(sizeChanged(int, int, int)));
-	connect(header(), TQT_SIGNAL(indexChange(int, int, int)),
-			this, TQT_SLOT(indexChanged(int, int, int)));
+	connect(header(), TQ_SIGNAL(sizeChange(int, int, int)),
+			this, TQ_SLOT(sizeChanged(int, int, int)));
+	connect(header(), TQ_SIGNAL(indexChange(int, int, int)),
+			this, TQ_SLOT(indexChanged(int, int, int)));
 
 	killSupported = false;
 	setModified(false);
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h
index ccabce745..8964ccf77 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h
@@ -106,7 +106,7 @@ public:
 	/**
 	 * The udpate function can be used to update the displayed process
 	 * list.  A current list of processes is requested from the OS. In
-	 * case the list contains invalid or corrupted info, FALSE is
+	 * case the list contains invalid or corrupted info, false is
 	 * returned.
 	 */
 	bool update(const TQString& list);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
index ac029e5e2..78b49a06c 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
@@ -182,7 +182,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
       case 3: {
           TQCustomEvent *e = new TQCustomEvent( TQEvent::User );
           e->setData( this );
-          kapp->postEvent( parent(), e );
+          tdeApp->postEvent( parent(), e );
         }
         break;
       case 4:
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
index 9cdf1f507..8bd4ea288 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
@@ -146,7 +146,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t
 	monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
 	monitor->setSelectionMode(TQListView::NoSelection);
 
-	connect(monitor, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int)));
+	connect(monitor, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int)));
 
 	setTitle(i18n("Sensor Logger"));
 
@@ -237,7 +237,7 @@ SensorLogger::configureSettings()
 	sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
 	TQ_CHECK_PTR(sls);
 
-	connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
+	connect( sls, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) );
 
 	sls->setTitle(title());
 	sls->setForegroundColor(cgroup.text());
@@ -406,7 +406,7 @@ SensorLogger::RMBClicked(TQListViewItem* item, const TQPoint& point, int)
 	case 2: {
 		TQCustomEvent* ev = new TQCustomEvent(TQEvent::User);
 		ev->setData(this);
-		kapp->postEvent(parent(), ev);
+		tdeApp->postEvent(parent(), ev);
 		break;
 		}
 	case 3:	{
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
index 515cb13f6..ad1f2687b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
@@ -9,8 +9,8 @@
 
 void SensorLoggerDlgWidget::init()
 {
-  m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
-  m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+  m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+  m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
   m_timerInterval->setRange(1, 99, 1, true);
 
   m_fileName->setFocus();
diff --git a/ksysguard/gui/WorkSheet.cpp b/ksysguard/gui/WorkSheet.cpp
index d465a998d..2b0bc76dd 100644
--- a/ksysguard/gui/WorkSheet.cpp
+++ b/ksysguard/gui/WorkSheet.cpp
@@ -518,10 +518,10 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new
     mDisplayList[ row ][ column ] = newDisplay;
     if ( mDisplayList[ row ][ column ]->useGlobalUpdateInterval() )
       mDisplayList[ row ][ column ]->setUpdateInterval( updateInterval() );
-    connect( newDisplay, TQT_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ),
-             TQT_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) );
-    connect( newDisplay, TQT_SIGNAL( modified( bool ) ),
-             TQT_SLOT( setModified( bool ) ) );
+    connect( newDisplay, TQ_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ),
+             TQ_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) );
+    connect( newDisplay, TQ_SIGNAL( modified( bool ) ),
+             TQ_SLOT( setModified( bool ) ) );
   }
 
 
diff --git a/ksysguard/gui/Workspace.cpp b/ksysguard/gui/Workspace.cpp
index c5e622248..f32108662 100644
--- a/ksysguard/gui/Workspace.cpp
+++ b/ksysguard/gui/Workspace.cpp
@@ -30,7 +30,7 @@
 #include <tdeio/netaccess.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaccelmanager.h>
 
 #include "WorkSheet.h"
@@ -47,8 +47,8 @@ Workspace::Workspace( TQWidget* parent, const char* name )
   mSheetList.setAutoDelete( true );
   mAutoSave = true;
 
-  connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ),
-           TQT_SLOT( updateCaption( TQWidget* ) ) );
+  connect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ),
+           TQ_SLOT( updateCaption( TQWidget* ) ) );
 
   TQWhatsThis::add( this, i18n( "This is your work space. It holds your worksheets. You need "
                                "to create a new worksheet (Menu File->New) before "
@@ -62,8 +62,8 @@ Workspace::~Workspace()
    * administration data is already deleted but slots are still
    * being triggered. TODO: I need to ask the Trolls about this. */
 
-  disconnect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), this,
-              TQT_SLOT( updateCaption( TQWidget* ) ) );
+  disconnect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), this,
+              TQ_SLOT( updateCaption( TQWidget* ) ) );
 }
 
 void Workspace::saveProperties( TDEConfig *cfg )
@@ -148,10 +148,10 @@ void Workspace::newWorkSheet()
     insertTab( sheet, dlg.sheetTitle() );
     mSheetList.append( sheet );
     showPage( sheet );
-    connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ),
-             TQT_SLOT( updateCaption( TQWidget* ) ) );
-    connect( sheet, TQT_SIGNAL( titleChanged( TQWidget* ) ),
-             TQT_SLOT( updateSheetTitle( TQWidget* ) ) );
+    connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ),
+             TQ_SLOT( updateCaption( TQWidget* ) ) );
+    connect( sheet, TQ_SIGNAL( titleChanged( TQWidget* ) ),
+             TQ_SLOT( updateSheetTitle( TQWidget* ) ) );
   }
 }
 
@@ -370,8 +370,8 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString
   }
   
   mSheetList.append( sheet );
-  connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ),
-           TQT_SLOT( updateCaption( TQWidget* ) ) );
+  connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ),
+           TQ_SLOT( updateCaption( TQWidget* ) ) );
 
   /* Force the file name to be the new name. This also sets the modified
    * flag, so that the file will get saved on exit. */
diff --git a/ksysguard/gui/ksgrd/HostConnector.cpp b/ksysguard/gui/ksgrd/HostConnector.cpp
index da3974ce9..b2175c3ed 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cpp
+++ b/ksysguard/gui/ksgrd/HostConnector.cpp
@@ -111,12 +111,12 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
 
   layout->addMultiCellWidget( group, 1, 1, 0, 1 );
 
-  connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ),
-           mCommands, TQT_SLOT( setEnabled( bool ) ) );
-  connect( mUseDaemon, TQT_SIGNAL( toggled( bool ) ),
-           mPort, TQT_SLOT( setEnabled( bool ) ) );
-  connect( mHostNames->lineEdit(),  TQT_SIGNAL( textChanged ( const TQString & ) ),
-           this, TQT_SLOT(  slotHostNameChanged( const TQString & ) ) );
+  connect( mUseCustom, TQ_SIGNAL( toggled( bool ) ),
+           mCommands, TQ_SLOT( setEnabled( bool ) ) );
+  connect( mUseDaemon, TQ_SIGNAL( toggled( bool ) ),
+           mPort, TQ_SLOT( setEnabled( bool ) ) );
+  connect( mHostNames->lineEdit(),  TQ_SIGNAL( textChanged ( const TQString & ) ),
+           this, TQ_SLOT(  slotHostNameChanged( const TQString & ) ) );
   enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() );
   TDEAcceleratorManager::manage( this );
 }
@@ -211,7 +211,7 @@ bool HostConnector::useCustom() const
 
 void HostConnector::slotHelp()
 {
-  kapp->invokeHelp( "CONNECTINGTOOTHERHOSTS", "ksysguard/the-sensor-browser.html" );
+  tdeApp->invokeHelp( "CONNECTINGTOOTHERHOSTS", "ksysguard/the-sensor-browser.html" );
 }
 
 #include "HostConnector.moc"
diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h
index 14b9bc014..b165cf701 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.h
+++ b/ksysguard/gui/ksgrd/SensorAgent.h
@@ -43,7 +43,7 @@ class SensorRequest;
   ksysguardd. The current implementation only allowes one pending
   requests. Incoming requests are queued in an input FIFO.
 */
-class KDE_EXPORT SensorAgent : public TQObject
+class TDE_EXPORT SensorAgent : public TQObject
 {
   TQ_OBJECT
 
diff --git a/ksysguard/gui/ksgrd/SensorManager.cpp b/ksysguard/gui/ksgrd/SensorManager.cpp
index 237e73b23..a260dcb9a 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cpp
+++ b/ksysguard/gui/ksgrd/SensorManager.cpp
@@ -219,8 +219,8 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell,
     }
 
     mAgents.insert( hostName, agent );
-    connect( agent, TQT_SIGNAL( reconfigure( const SensorAgent* ) ),
-             TQT_SLOT( reconfigure( const SensorAgent* ) ) );
+    connect( agent, TQ_SIGNAL( reconfigure( const SensorAgent* ) ),
+             TQ_SLOT( reconfigure( const SensorAgent* ) ) );
 
 		emit update();
     return true;
@@ -238,7 +238,7 @@ void SensorManager::requestDisengage( const SensorAgent *agent )
 	 * So we have to post an event which is later caught by
 	 * SensorManger::customEvent(). */
   TQCustomEvent* event = new TQCustomEvent( TQEvent::User, (void*)agent );
-  kapp->postEvent( this, event );
+  tdeApp->postEvent( this, event );
 }
 
 bool SensorManager::disengage( const SensorAgent *agent )
@@ -293,7 +293,7 @@ void SensorManager::hostLost( const SensorAgent *agent )
     TQCustomEvent *event = new TQCustomEvent( TQEvent::User );
     event->setData( new TQString( i18n( "Connection to %1 has been lost." )
                     .arg( agent->hostName() ) ) );
-    kapp->postEvent( mBroadcaster, event );
+    tdeApp->postEvent( mBroadcaster, event );
   }
 }
 
@@ -305,7 +305,7 @@ void SensorManager::notify( const TQString &msg ) const
   if ( mBroadcaster ) {
     TQCustomEvent *event = new TQCustomEvent( TQEvent::User );
     event->setData( new TQString( msg ) );
-    kapp->postEvent( mBroadcaster, event );
+    tdeApp->postEvent( mBroadcaster, event );
   }
 }
 
diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h
index 906358c0d..27b24e6de 100644
--- a/ksysguard/gui/ksgrd/SensorManager.h
+++ b/ksysguard/gui/ksgrd/SensorManager.h
@@ -43,7 +43,7 @@ class SensorManagerIterator;
   connection yet or the hostname is empty, a dialog will be shown to
   enter the connections details.
  */
-class KDE_EXPORT SensorManager : public TQObject
+class TDE_EXPORT SensorManager : public TQObject
 {
   TQ_OBJECT
 
@@ -110,9 +110,9 @@ class KDE_EXPORT SensorManager : public TQObject
     HostConnector* mHostConnector;
 };
 
-KDE_EXPORT extern SensorManager* SensorMgr;
+TDE_EXPORT extern SensorManager* SensorMgr;
 
-class KDE_EXPORT SensorManagerIterator : public TQDictIterator<SensorAgent>
+class TDE_EXPORT SensorManagerIterator : public TQDictIterator<SensorAgent>
 {
   public:
     SensorManagerIterator( const SensorManager *sm )
diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cpp b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
index 7e137ad56..244e7b037 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.cpp
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <kpassdlg.h> 
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include "SensorClient.h"
 #include "SensorManager.h"
@@ -55,14 +55,14 @@ bool SensorShellAgent::start( const TQString &host, const TQString &shell,
   mShell = shell;
   mCommand = command;
 
-  connect( mDaemon, TQT_SIGNAL( processExited( TDEProcess* ) ),
-           TQT_SLOT( daemonExited( TDEProcess* ) ) );
-  connect( mDaemon, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-           TQT_SLOT( msgRcvd( TDEProcess*, char*, int ) ) );
-  connect( mDaemon, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
-           TQT_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) );
-  connect( mDaemon, TQT_SIGNAL( wroteStdin( TDEProcess* ) ),
-           TQT_SLOT( msgSent( TDEProcess* ) ) );
+  connect( mDaemon, TQ_SIGNAL( processExited( TDEProcess* ) ),
+           TQ_SLOT( daemonExited( TDEProcess* ) ) );
+  connect( mDaemon, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+           TQ_SLOT( msgRcvd( TDEProcess*, char*, int ) ) );
+  connect( mDaemon, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+           TQ_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) );
+  connect( mDaemon, TQ_SIGNAL( wroteStdin( TDEProcess* ) ),
+           TQ_SLOT( msgSent( TDEProcess* ) ) );
 
   TQString cmd;
   if ( !command.isEmpty() )
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
index 30c0cc7e9..ed52a5bd4 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
@@ -34,10 +34,10 @@ using namespace KSGRD;
 SensorSocketAgent::SensorSocketAgent( SensorManager *sm )
   : SensorAgent( sm )
 {
-  connect( &mSocket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( error( int ) ) );
-  connect( &mSocket, TQT_SIGNAL( bytesWritten( int ) ), TQT_SLOT( msgSent( int ) ) );
-  connect( &mSocket, TQT_SIGNAL( readyRead() ), TQT_SLOT( msgRcvd() ) );
-  connect( &mSocket, TQT_SIGNAL( closed() ), TQT_SLOT( connectionClosed() ) );
+  connect( &mSocket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( error( int ) ) );
+  connect( &mSocket, TQ_SIGNAL( bytesWritten( int ) ), TQ_SLOT( msgSent( int ) ) );
+  connect( &mSocket, TQ_SIGNAL( readyRead() ), TQ_SLOT( msgRcvd() ) );
+  connect( &mSocket, TQ_SIGNAL( closed() ), TQ_SLOT( connectionClosed() ) );
 }
 
 SensorSocketAgent::~SensorSocketAgent()
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cpp b/ksysguard/gui/ksgrd/StyleEngine.cpp
index ce3e3bd6b..0e7330741 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cpp
+++ b/ksysguard/gui/ksgrd/StyleEngine.cpp
@@ -143,8 +143,8 @@ void StyleEngine::configure()
   mSettingsDialog->setFontSize( mFontSize );
   mSettingsDialog->setSensorColors( mSensorColors );
 
-  connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ),
-           this, TQT_SLOT( applyToWorksheet() ) );
+  connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ),
+           this, TQ_SLOT( applyToWorksheet() ) );
 
   if ( mSettingsDialog->exec() )
     apply();
diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h
index 15a968eb6..927150f65 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.h
+++ b/ksysguard/gui/ksgrd/StyleEngine.h
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqptrlist.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 
@@ -38,7 +38,7 @@ class StyleSettings;
 
 namespace KSGRD {
 
-class KDE_EXPORT StyleEngine : public TQObject
+class TDE_EXPORT StyleEngine : public TQObject
 {
   TQ_OBJECT
 
@@ -79,7 +79,7 @@ class KDE_EXPORT StyleEngine : public TQObject
     StyleSettings *mSettingsDialog;
 };
 
-KDE_EXPORT extern StyleEngine* Style;
+TDE_EXPORT extern StyleEngine* Style;
 
 }
 
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cpp b/ksysguard/gui/ksgrd/StyleSettings.cpp
index 71a18b713..f70a387b4 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cpp
+++ b/ksysguard/gui/ksgrd/StyleSettings.cpp
@@ -92,12 +92,12 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name )
   mEditColorButton->setEnabled( false );
   layout->addWidget( mEditColorButton, 0, 1, TQt::AlignTop );
 
-  connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
-           TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
-  connect( mColorListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ),
-           TQT_SLOT( editSensorColor() ) );
-  connect( mEditColorButton, TQT_SIGNAL( clicked() ),
-           TQT_SLOT( editSensorColor() ) );
+  connect( mColorListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ),
+           TQ_SLOT( selectionChanged( TQListBoxItem* ) ) );
+  connect( mColorListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ),
+           TQ_SLOT( editSensorColor() ) );
+  connect( mEditColorButton, TQ_SIGNAL( clicked() ),
+           TQ_SLOT( editSensorColor() ) );
 
   TDEAcceleratorManager::manage( this );
 }
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cpp b/ksysguard/gui/ksgrd/TimerSettings.cpp
index 43e73ab90..4fa165f99 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cpp
+++ b/ksysguard/gui/ksgrd/TimerSettings.cpp
@@ -53,8 +53,8 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name )
   mLabel->setBuddy( mInterval );
   TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) );
 
-  connect( mUseGlobalUpdate, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( globalUpdateChanged( bool ) ) );
+  connect( mUseGlobalUpdate, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( globalUpdateChanged( bool ) ) );
 
   mUseGlobalUpdate->setChecked( true );
 
diff --git a/ksysguard/gui/ksgrd/TimerSettings.h b/ksysguard/gui/ksgrd/TimerSettings.h
index 8a2ba9588..79eb331aa 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.h
+++ b/ksysguard/gui/ksgrd/TimerSettings.h
@@ -30,7 +30,7 @@ class TQCheckBox;
 class TQLabel;
 class TQSpinBox;
 
-class KDE_EXPORT TimerSettings : public KDialogBase
+class TDE_EXPORT TimerSettings : public KDialogBase
 {
   TQ_OBJECT
 
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 2c2994eaa..ee7aeb6b5 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -47,7 +47,7 @@
 #include <ksgrd/SensorAgent.h>
 #include <ksgrd/SensorManager.h>
 #include <ksgrd/StyleEngine.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <twin.h>
@@ -83,16 +83,16 @@ TopLevel::TopLevel( const char *name )
   mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr );
   
   mServiceBrowser = new DNSSD::ServiceBrowser("_ksysguard._tcp", 0, true);
-  connect(mServiceBrowser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
-  	TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr)));
+  connect(mServiceBrowser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
+  	TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr)));
 
   mWorkSpace = new Workspace( mSplitter );
-  connect( mWorkSpace, TQT_SIGNAL( announceRecentURL( const KURL& ) ),
-           TQT_SLOT( registerRecentURL( const KURL& ) ) );
-  connect( mWorkSpace, TQT_SIGNAL( setCaption( const TQString&, bool ) ),
-           TQT_SLOT( setCaption( const TQString&, bool ) ) );
-  connect( KSGRD::Style, TQT_SIGNAL( applyStyleToWorksheet() ), mWorkSpace,
-           TQT_SLOT( applyStyle() ) );
+  connect( mWorkSpace, TQ_SIGNAL( announceRecentURL( const KURL& ) ),
+           TQ_SLOT( registerRecentURL( const KURL& ) ) );
+  connect( mWorkSpace, TQ_SIGNAL( setCaption( const TQString&, bool ) ),
+           TQ_SLOT( setCaption( const TQString&, bool ) ) );
+  connect( KSGRD::Style, TQ_SIGNAL( applyStyleToWorksheet() ), mWorkSpace,
+           TQ_SLOT( applyStyle() ) );
 
   /* Create the status bar. It displays some information about the
    * number of processes and the memory consumption of the local
@@ -105,40 +105,40 @@ TopLevel::TopLevel( const char *name )
   statusBar()->hide();
 
   // create actions for menue entries
-  new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
+  new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace,
+		   TQ_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
   
-  new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
+  new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace,
+		   TQ_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
   
   mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0,
-		   TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );	
+		   mWorkSpace, TQ_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );	
   
-  new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
+  new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace,
+		   TQ_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
 
-  new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace),
-		   TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
+  new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace,
+		   TQ_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
    
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+  KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
 
-  new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this),
-               TQT_SLOT( connectHost() ), actionCollection(), "connect_host" );
-  new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this),
-               TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
+  new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this,
+               TQ_SLOT( connectHost() ), actionCollection(), "connect_host" );
+  new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this,
+               TQ_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
 
-//  KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() );
-//  KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() );
-//  KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() );
-  new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace),
-               TQT_SLOT( configure() ), actionCollection(), "configure_sheet" );
+//  KStdAction::cut( mWorkSpace, TQ_SLOT( cut() ), actionCollection() );
+//  KStdAction::copy( mWorkSpace, TQ_SLOT( copy() ), actionCollection() );
+//  KStdAction::paste( mWorkSpace, TQ_SLOT( paste() ), actionCollection() );
+  new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace,
+               TQ_SLOT( configure() ), actionCollection(), "configure_sheet" );
 
   new TDEAction( i18n( "Load Standard Sheets" ), "document-revert",
-               0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ),
+               0, this, TQ_SLOT( resetWorkSheets() ),
                actionCollection(), "revert_all_worksheets"  );
 
-  new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this),
-               TQT_SLOT( editStyle() ), actionCollection(), "configure_style" );
+  new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this,
+               TQ_SLOT( editStyle() ), actionCollection(), "configure_style" );
 
   // TODO remove resize and fix so sizeHints() determines default size.
   if (!initialGeometrySet())
@@ -186,7 +186,7 @@ void TopLevel::showProcesses()
 void TopLevel::showOnCurrentDesktop()
 {
   KWin::setOnDesktop( winId(), KWin::currentDesktop() );
-  kapp->updateUserTimestamp();
+  tdeApp->updateUserTimestamp();
   KWin::forceActiveWindow( winId() );
 }
 
@@ -216,7 +216,7 @@ TQString TopLevel::readIntegerSensor( const TQString &sensorLocator )
   TQString sensor = sensorLocator.right( sensorLocator.length() -
                                         sensorLocator.find( ':' ) - 1 );
 
-  DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
+  DCOPClientTransaction *dcopTransaction = tdeApp->dcopClient()->beginTransaction();
   mDCopFIFO.prepend( dcopTransaction );
 
   KSGRD::SensorMgr->engage( host, "", "ksysguardd" );
@@ -233,7 +233,7 @@ TQStringList TopLevel::readListSensor( const TQString& sensorLocator )
   TQString sensor = sensorLocator.right( sensorLocator.length() -
                                         sensorLocator.find( ':' ) - 1 );
 
-  DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction();
+  DCOPClientTransaction *dcopTransaction = tdeApp->dcopClient()->beginTransaction();
   mDCopFIFO.prepend( dcopTransaction );
 
   KSGRD::SensorMgr->engage( host, "", "ksysguardd" );
@@ -293,7 +293,7 @@ void TopLevel::initStatusBar()
   
   TDEToggleAction *sb = dynamic_cast<TDEToggleAction*>(action("options_show_statusbar"));
   if (sb)
-     connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar()));
+     connect(sb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateStatusBar()));
 }
 
 void TopLevel::updateStatusBar()
@@ -317,10 +317,10 @@ void TopLevel::disconnectHost()
 
 void TopLevel::editToolbars()
 {
-  saveMainWindowSettings( kapp->config() );
+  saveMainWindowSettings( tdeApp->config() );
   KEditToolbar dlg( actionCollection() );
-  connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this,
-           TQT_SLOT( slotNewToolbarConfig() ) );
+  connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this,
+           TQ_SLOT( slotNewToolbarConfig() ) );
 
   dlg.exec();
 }
@@ -328,7 +328,7 @@ void TopLevel::editToolbars()
 void TopLevel::slotNewToolbarConfig()
 {
   createGUI();
-  applyMainWindowSettings( kapp->config() );
+  applyMainWindowSettings( tdeApp->config() );
 }
 
 void TopLevel::editStyle()
@@ -371,8 +371,8 @@ bool TopLevel::queryClose()
     if ( !mWorkSpace->saveOnQuit() )
       return false;
 
-    saveProperties( kapp->config() );
-    kapp->config()->sync();
+    saveProperties( tdeApp->config() );
+    tdeApp->config()->sync();
   }
 
   return true;
@@ -471,7 +471,7 @@ void TopLevel::answerReceived( int id, const TQString &answer )
       reply << answer;
 
       DCOPClientTransaction *dcopTransaction = mDCopFIFO.last();
-      kapp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
+      tdeApp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
       mDCopFIFO.removeLast();
       break;
     }
@@ -490,7 +490,7 @@ void TopLevel::answerReceived( int id, const TQString &answer )
       reply << resultList;
 
       DCOPClientTransaction *dcopTransaction = mDCopFIFO.last();
-      kapp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
+      tdeApp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData );
       mDCopFIFO.removeLast();
       break;
     }
diff --git a/ksysguard/ksysguardd/Makefile.am b/ksysguard/ksysguardd/Makefile.am
index 0e6da33ad..0e1f1122a 100644
--- a/ksysguard/ksysguardd/Makefile.am
+++ b/ksysguard/ksysguardd/Makefile.am
@@ -12,9 +12,6 @@ endif
 if include_ksysguardd_solaris
 solaris_SUBDIR = Solaris
 endif
-if include_ksysguardd_tru64
-tru64_SUBDIR = Tru64
-endif
 if include_ksysguardd_irix
 irix_SUBDIR = Irix
 endif
@@ -23,7 +20,7 @@ openbsd_SUBDIR = OpenBSD
 endif
 
 SUBDIRS = $(linux_SUBDIR) $(freebsd_SUBDIR) $(netbsd_SUBDIR)\
-	$(solaris_SUBDIR) $(tru64_SUBDIR) $(irix_SUBDIR) $(openbsd_SUBDIR)
+	$(solaris_SUBDIR) $(irix_SUBDIR) $(openbsd_SUBDIR)
 
 KSYSGUARDDRCFILE=$(sysconfdir)/ksysguarddrc
 INCLUDES = -DKSYSGUARDDRCFILE="\"$(KSYSGUARDDRCFILE)\"" -DOSTYPE_$(UNAME) -I$(srcdir)/../CContLib -I$(srcdir)/$(UNAME) $(all_includes)
diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
index 6130f2a83..e92bca5e4 100644
--- a/ksysguard/ksysguardd/modules.h
+++ b/ksysguard/ksysguardd/modules.h
@@ -83,12 +83,6 @@
 #include "cpu.h"
 #endif /* OSTYPE_Irix */
 
-#ifdef OSTYPE_Tru64
-#include "LoadAvg.h"
-#include "Memory.h"
-#include "NetDev.h"
-#endif /* OSTYPE_Tru64 */
-
 #ifdef OSTYPE_OpenBSD
 #include "cpu.h"
 #include "memory.h"
@@ -161,12 +155,6 @@ struct SensorModul SensorModulList[] = {
   { "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC, 0, NULLTIME },
 #endif /* OSTYPE_Irix */
 
-#ifdef OSTYPE_Tru64
-  { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME },
-  { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
-  { "NetDev", initNetDev, exitNetDev, updateNetDev, NULLVVFUNC, 0, NULLTIME },
-#endif /* OSTYPE_Tru64 */
-
 #ifdef OSTYPE_OpenBSD
   { "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC, 0, NULLTIME },
   { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
diff --git a/ksysguard/pics/tdeapp.png b/ksysguard/pics/tdeapp.png
index 9ab44b1bf..5af4c301a 100644..100755
--- a/ksysguard/pics/tdeapp.png
+++ b/ksysguard/pics/tdeapp.png
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 630079600..bb0c06c5c 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -9,7 +9,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <twinmodule.h>
 #include <tdeconfig.h>
 #include <ksystemtray.h>
@@ -26,7 +26,7 @@ KSysTrayCmd::KSysTrayCmd()
     win(0), client(0), twinmodule(0), top(0), left(0)
 {
   setAlignment( AlignCenter );
-  twinmodule = new KWinModule( TQT_TQOBJECT(this) );
+  twinmodule = new KWinModule( this );
   refresh();
 }
 
@@ -114,8 +114,8 @@ void KSysTrayCmd::setTargetWindow( WId w )
 
 void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info )
 {
-  disconnect( twinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) );
-  connect( twinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) );
+  disconnect( twinmodule, TQ_SIGNAL(windowAdded(WId)), this, TQ_SLOT(windowAdded(WId)) );
+  connect( twinmodule, TQ_SIGNAL(windowChanged(WId)), TQ_SLOT(windowChanged(WId)) );
   win = info.win();
   KWin::setSystemTrayWindowFor( winId(), win );
   refresh();
@@ -143,14 +143,14 @@ void KSysTrayCmd::refresh()
 
   TQToolTip::remove( this );
   if ( win ) {
-    TDEConfig *appCfg = kapp->config();
+    TDEConfig *appCfg = tdeApp->config();
     TDEConfigGroupSaver configSaver(appCfg, "System Tray");
     int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
 
     // ksystraycmd's icon or app's icon
     if (ownIcon)
     {
-      setPixmap( KSystemTray::loadIcon( kapp->iconName() ) );
+      setPixmap( KSystemTray::loadIcon( tdeApp->iconName() ) );
     }
     else
     {
@@ -167,7 +167,7 @@ void KSysTrayCmd::refresh()
     else
       TQToolTip::add( this, window );
 
-    setPixmap( KSystemTray::loadIcon( kapp->iconName() ) );
+    setPixmap( KSystemTray::loadIcon( tdeApp->iconName() ) );
   }
 }
 
@@ -179,9 +179,9 @@ bool KSysTrayCmd::startClient()
 {
   client = new KShellProcess();
   *client << command;
-  connect( twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) );
-  connect( client, TQT_SIGNAL( processExited(TDEProcess *) ),
-	   this, TQT_SLOT( clientExited() ) );
+  connect( twinmodule, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)) );
+  connect( client, TQ_SIGNAL( processExited(TDEProcess *) ),
+	   this, TQ_SLOT( clientExited() ) );
 
   return client->start();
 }
diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp
index e322f2cf9..caf586591 100644
--- a/ksystraycmd/main.cpp
+++ b/ksystraycmd/main.cpp
@@ -5,7 +5,7 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include "ksystraycmd.h"
 
diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp
index 0240b3d1b..93e976b69 100644
--- a/ktip/ktipwindow.cpp
+++ b/ktip/ktipwindow.cpp
@@ -23,9 +23,9 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ktip.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <twin.h>
 #include <stdlib.h>
 
@@ -37,23 +37,23 @@ int main(int argc, char *argv[])
 				"0.3", description, TDEAboutData::License_GPL,
 				"(c) 1998-2002, KDE Developers");
 	TDECmdLineArgs::init( argc, argv, &aboutData );
-	KUniqueApplication::addCmdLineOptions();
+	TDEUniqueApplication::addCmdLineOptions();
 
-	if (!KUniqueApplication::start())
+	if (!TDEUniqueApplication::start())
 		exit(-1);
 
-	KUniqueApplication app;
+	TDEUniqueApplication app;
 
 	KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("tdewizard/tips"))));
 	TQ_CHECK_PTR(tipDialog);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	KWin::setState(tipDialog->winId(), NET::StaysOnTop);
 #endif
 	tipDialog->setCaption(i18n("Useful Tips"));
 	app.dcopClient()->send("ksplash", "ksplash", "close()", TQByteArray()); // Close splash screen
 	tipDialog->show();
 
-	TQObject::connect(tqApp, TQT_SIGNAL(lastWindowClosed()), tqApp, TQT_SLOT(quit()));
+	TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit()));
 
 	app.setMainWidget(tipDialog);
 
diff --git a/kxkb/CMakeL10n.txt b/kxkb/CMakeL10n.txt
index 0238bd7e3..66ed038d9 100644
--- a/kxkb/CMakeL10n.txt
+++ b/kxkb/CMakeL10n.txt
@@ -27,3 +27,9 @@ tde_l10n_create_template(
     SOURCES *.desktop
     DESTINATION "${CMAKE_SOURCE_DIR}/translations"
 )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kxkb-eventsrc/"
+    SOURCES eventsrc
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
\ No newline at end of file
diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
index b8bb14912..83ca72be7 100644
--- a/kxkb/CMakeLists.txt
+++ b/kxkb/CMakeLists.txt
@@ -33,6 +33,12 @@ tde_create_translated_desktop(
   PO_DIR kxkb-desktops
 )
 
+tde_create_translated_desktop(
+  SOURCE eventsrc
+  DESTINATION ${DATA_INSTALL_DIR}/kxkb
+  PO_DIR kxkb-eventsrc
+)
+
 install( FILES kxkb_groups DESTINATION ${CONFIG_INSTALL_DIR} )
 
 tde_create_translated_desktop(
@@ -61,5 +67,5 @@ tde_add_tdeinit_executable( kxkb AUTOMOC
     extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
     pixmap.cpp layoutmap.cpp kxkb.cpp kxkbtraywindow.cpp
     kxkb.skel
-  LINK tdeui-shared ${XKBFILE_LIBRARIES}
+  LINK tdeui-shared ${XKBFILE_LIBRARIES} ${TDEHW_LIBRARIES}
 )
diff --git a/kxkb/eventsrc b/kxkb/eventsrc
new file mode 100644
index 000000000..1e06d70c3
--- /dev/null
+++ b/kxkb/eventsrc
@@ -0,0 +1,13 @@
+[!Global!]
+IconName=kxkb
+Comment=TDE Keyboard Tool
+
+[LayoutChange]
+Name=Keyboard layout switch
+Comment=The keyboard layout was switched
+default_presentation=16
+
+[Error]
+Name=Keyboard layout switching error
+Comment=Error while attempting to switch the keyboard layout
+default_presentation=16
\ No newline at end of file
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index df61e2fa2..0fada6932 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -1,3 +1,32 @@
+/*******************************************************************************
+
+  Xkb extension for KXkb
+  Copyright © 2009-2025 Trinity Desktop project
+  Copyright © 2001      S.R. Haque <srhaque@iee.org>
+
+  Derived from an original by Matthias H�zer-Klpfel released under the QPL.
+
+  Some portions come from kkbswitch released under the GNU GPL v2 (or later).
+  Copyright © 2001      Leonid Zeitlin <lz@europe.com>
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library 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
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*******************************************************************************/
+
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
@@ -5,10 +34,13 @@
 #include <tqmap.h>
 #include <tqfile.h>
 #include <tqdir.h>
+#include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdeapplication.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
+#include <dcopclient.h>
 
 #include <X11/Xatom.h>
 #include <X11/Xos.h>
@@ -21,58 +53,77 @@
 
 #include "extension.h"
 
+extern "C"
+{
+	static int IgnoreXError(Display *, XErrorEvent *) { return 0; }
+}
 
 static TQString getLayoutKey(const TQString& layout, const TQString& variant)
 {
 	return layout + "." + variant;
 }
 
-XKBExtension::XKBExtension(Display *d)
+static XKBExtension *xkbExtension = nullptr;
+
+XKBExtension *XKBExtension::the()
 {
-	if ( d == NULL )
-		d = tqt_xdisplay();
-	m_dpy = d;
-	
-//	TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
-//	m_tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
-	m_tempDir = locateLocal("tmp", "");
+	if (!xkbExtension)
+	{
+		xkbExtension = new XKBExtension;
+		if (!xkbExtension->init())
+		{
+			kdFatal() << "xkb initialization failed, exiting..." << endl;
+			::exit(1);
+		}
+	}
+	return xkbExtension;
 }
 
 bool XKBExtension::init()
 {
-    // Verify the Xlib has matching XKB extension.
-
-    int major = XkbMajorVersion;
-    int minor = XkbMinorVersion;
-	
-    if (!XkbLibraryVersion(&major, &minor))
-    {
-        kdError() << "[kxkb-extension] Xlib XKB extension " << major << '.' << minor <<
-            " != " << XkbMajorVersion << '.' << XkbMinorVersion << endl;
-        return false;
-    }
-
-    // Verify the X server has matching XKB extension.
-
-    int opcode_rtrn;
-    int error_rtrn;
-    int xkb_opcode;
-    if (!XkbQueryExtension(m_dpy, &opcode_rtrn, &xkb_opcode, &error_rtrn,
-                         &major, &minor))
-    {
-        kdError() << "[kxkb-extension] X server XKB extension " << major << '.' << minor <<
-            " != " << XkbMajorVersion << '.' << XkbMinorVersion << endl;
-        return false;
-    }
-
-    // Do it, or face horrible memory corrupting bugs
-    ::XkbInitAtoms(NULL);
-
-    // watch group change events
-    XkbSelectEventDetails(m_dpy, XkbUseCoreKbd, XkbStateNotify,
-                          XkbAllStateComponentsMask, XkbGroupStateMask);
-
-    return true;
+	m_configureFilterCounter = 0;
+
+	kdDebug() << "[kxkb-extension] Initializing Xkb extension" << endl;
+	m_dpy = tqt_xdisplay();
+
+	// Verify the Xlib has matching XKB extension.
+	int major = XkbMajorVersion;
+	int minor = XkbMinorVersion;
+
+	if (!XkbLibraryVersion(&major, &minor))
+	{
+		kdError() << "[kxkb-extension] Xlib XKB extension " << major << '.' << minor <<
+				" != " << XkbMajorVersion << '.' << XkbMinorVersion << endl;
+		return false;
+	}
+
+	// Verify the X server has matching XKB extension.
+	int opcode_rtrn;
+	int error_rtrn;
+	if (!XkbQueryExtension(m_dpy, &opcode_rtrn, &m_xkb_opcode, &error_rtrn, &major, &minor))
+	{
+		kdError() << "[kxkb-extension] X server XKB extension " << major << '.' << minor <<
+				" != " << XkbMajorVersion << '.' << XkbMinorVersion << endl;
+		return false;
+	}
+
+	enableConfigureFilter();
+
+	// Do it, or face horrible memory corrupting bugs
+	::XkbInitAtoms(nullptr);
+
+	// Watch for interesting events
+	XkbSelectEventDetails(m_dpy, XkbUseCoreKbd, XkbStateNotify,
+	                      XkbAllStateComponentsMask, XkbGroupStateMask);
+
+	XkbSelectEventDetails(m_dpy, XkbUseCoreKbd, XkbNewKeyboardNotify,
+	                      XkbAllNewKeyboardEventsMask, XkbAllNewKeyboardEventsMask);
+
+
+	m_tempDir = locateLocal("tmp", "");
+
+	disableConfigureFilter();
+	return true;
 }
 
 XKBExtension::~XKBExtension()
@@ -81,11 +132,32 @@ XKBExtension::~XKBExtension()
 		deletePrecompiledLayouts();*/
 }
 
+void XKBExtension::enableConfigureFilter()
+{
+	++m_configureFilterCounter;
+}
+
+void XKBExtension::disableConfigureFilter()
+{
+	// Without this protection in place KXkb would react to configuration
+	// changes caused by itself
+	TQTimer::singleShot(500, this, TQ_SLOT(slotReleaseConfigureLock()));
+}
+
+void XKBExtension::slotReleaseConfigureLock()
+{
+	--m_configureFilterCounter;
+}
+
 bool XKBExtension::setXkbOptions(const XkbOptions options)
 {
+	enableConfigureFilter();
+
 	TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
 	if (exe.isEmpty())
+	{
 		return false;
+	}
 
 	TDEProcess p;
 	p << exe;
@@ -101,7 +173,7 @@ bool XKBExtension::setXkbOptions(const XkbOptions options)
 		p << "-variant";
 		p << options.variants;
 	}
-	
+
 	if (!options.model.isEmpty()) {
 		p << "-model";
 		p << options.model;
@@ -112,16 +184,15 @@ bool XKBExtension::setXkbOptions(const XkbOptions options)
 	}
 
 	if (!options.options.isEmpty()) {
-		p << "-option";
-
 		if (options.resetOld)
 		{
-			p << options.options;
+			p << "-option" << options.options;
 		}
 		else
 		{
 			// Avoid duplication of options in Append mode
-			TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+			XkbOptions _opt = getServerOptions();
+			TQStringList srvOptions = TQStringList::split(",", _opt.options);
 			TQStringList kxkbOptions = TQStringList::split(",", options.options);
 			TQStringList newOptions;
 			for (TQStringList::Iterator it = kxkbOptions.begin(); it != kxkbOptions.end(); ++it)
@@ -132,48 +203,87 @@ bool XKBExtension::setXkbOptions(const XkbOptions options)
 					newOptions << option;
 				}
 			}
-			p << newOptions.join(",");
+			if (!newOptions.isEmpty()) {
+				p <<  "-option" <<  newOptions.join(",");
+			}
 		}
 	}
 
+	if (p.args().count() < 2)
+	{
+		// Either the user has not configured any Xkb options or these options
+		// are already set and we are in append mode so we want to avoid
+		// duplicates
+		kdWarning() << "[setXkbOptions] No options need to be set" << endl;
+		slotReleaseConfigureLock(); // immediately release the lock
+		return true;
+	}
+
+	p << "-synch";
+
 	kdDebug() << "[setXkbOptions] Command: " << p.args() << endl;
 
 	p.start(TDEProcess::Block);
 
+	disableConfigureFilter();
+
 	return p.normalExit() && (p.exitStatus() == 0);
 }
 
-TQString XKBExtension::getServerOptions()
+XkbOptions XKBExtension::getServerOptions()
 {
-    XkbRF_VarDefsRec vd;
-    if (XkbRF_GetNamesProp(tqt_xdisplay(), nullptr, &vd) && vd.options)
-    {
-        kdDebug() << "[kxkb-extension] Got server options " << vd.options << endl;
-        return TQString(vd.options);
-    }
-    return TQString::null;
+	XkbOptions options;
+	XkbRF_VarDefsRec vd;
+	if (XkbRF_GetNamesProp(tqt_xdisplay(), nullptr, &vd))
+	{
+		options.model = vd.model;
+		options.layouts = vd.layout;
+		options.variants = vd.variant;
+		options.options = vd.options;
+	}
+	return options;
 }
 
 bool XKBExtension::setGroup(unsigned int group)
 {
 	kdDebug() << "[kxkb-extension] Setting group " << group << endl;
-	return XkbLockGroup( m_dpy, XkbUseCoreKbd, group );
+	return XkbLockGroup(m_dpy, XkbUseCoreKbd, group);
 }
 
-unsigned int XKBExtension::getGroup() const
+uint XKBExtension::getGroup() const
 {
 	XkbStateRec xkbState;
-	XkbGetState( m_dpy, XkbUseCoreKbd, &xkbState );
+	XkbGetState(m_dpy, XkbUseCoreKbd, &xkbState);
 	return xkbState.group;
 }
 
-/** Examines an X Event passed to it and takes actions if the event is of
-  * interest to KXkb */
+bool XKBExtension::kcmlayoutRunning()
+{
+	return tdeApp->dcopClient()->isApplicationRegistered("TDECModuleProxy-keyboard_layout");
+}
+
+// Examines an X Event passed to it and takes actions if the event is of
+// interest to KXkb
 void XKBExtension::processXEvent(XEvent *event) {
-	XkbEvent* xkb_event = (XkbEvent*)event;
-    if (xkb_event->any.xkb_type == XkbStateNotify) {
-		emit groupChanged(xkb_event->state.group);
-    }
+	if (event->type == m_xkb_opcode)
+	{
+		XkbEvent *xkb_event = (XkbEvent*)event;
+		if (xkb_event->any.xkb_type == XkbStateNotify && xkb_event->state.changed & XkbGroupStateMask)
+		{
+			emit groupChanged((uint)xkb_event->state.group);
+		}
+
+		else if (xkb_event->any.xkb_type == XkbNewKeyboardNotify)
+		{
+			if (m_configureFilterCounter > 0 || kcmlayoutRunning())
+			{
+				return;
+			}
+			enableConfigureFilter();
+			emit optionsChanged();
+			disableConfigureFilter();
+		}
+	}
 }
 
 #include "extension.moc"
diff --git a/kxkb/extension.h b/kxkb/extension.h
index 9a3d2da8e..e8c9c7d7c 100644
--- a/kxkb/extension.h
+++ b/kxkb/extension.h
@@ -1,7 +1,36 @@
+/*******************************************************************************
+
+  Xkb extension for KXkb
+  Copyright © 2009-2025 Trinity Desktop project
+  Copyright © 2001      S.R. Haque <srhaque@iee.org>
+
+  Derived from an original by Matthias H�zer-Klpfel released under the QPL.
+
+  Some portions come from kkbswitch released under the GNU GPL v2 (or later).
+  Copyright © 2001      Leonid Zeitlin <lz@europe.com>
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library 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
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*******************************************************************************/
+
 #ifndef __EXTENSION_H__
 #define __EXTENSION_H__
 
 #include <X11/Xlib.h>
+
 #include <tqobject.h>
 
 #include "kxkbconfig.h"
@@ -11,24 +40,44 @@ class XKBExtension : public TQObject
     TQ_OBJECT
 
 public:
-	XKBExtension(Display *display=NULL);
+	static XKBExtension *the();
 	~XKBExtension();
+
+	XKBExtension(XKBExtension const&) = delete;
+	void operator=(XKBExtension const&) = delete;
+
 	bool init();
 
-	static bool setXkbOptions(const XkbOptions options);
-	static TQString getServerOptions();
-	bool setGroup(unsigned int group);
-	unsigned int getGroup() const;
+	bool setXkbOptions(const XkbOptions options);
+	bool setGroup(uint group);
+
+	uint getGroup() const;
+	XkbOptions getServerOptions();
+
 	void processXEvent(XEvent *ev);
 
+	void enableConfigureFilter();
+	void disableConfigureFilter();
+
+	bool kcmlayoutRunning();
+
+private slots:
+	void slotReleaseConfigureLock();
+
+protected:
+	XKBExtension() {}
+
 private:
-    Display *m_dpy;
+	Display *m_dpy;
 	TQString m_tempDir;
 	int m_keycode;
 	static TQMap<TQString, FILE*> fileCache;
+	int m_configureFilterCounter;
+	int m_xkb_opcode;
 
 signals:
 	void groupChanged(uint group);
+	void optionsChanged();
 };
 
 #endif
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index 3744f5a1c..d9efb9e57 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -14,6 +14,7 @@
 #include <tqbuttongroup.h>
 #include <tqspinbox.h>
 #include <tqvbox.h>
+#include <tqtimer.h>
 
 #include <tdefontrequester.h>
 #include <kcolorbutton.h>
@@ -21,12 +22,12 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 
@@ -36,6 +37,7 @@
 #include "pixmap.h"
 #include "kcmmisc.h"
 #include "kcmlayoutwidget.h"
+#include "x11helper.h"
 
 #include "kcmlayout.h"
 #include "kcmlayout.moc"
@@ -105,50 +107,64 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
     m_rules(NULL),
     m_forceGrpOverwrite(false)
 {
+  X11Helper::initializeTranslations();
+
+  m_icoMgr = new LayoutIconManager(&m_kxkbConfig);
+
   TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   widget = new LayoutConfigWidget(this, "widget");
-  main->addWidget(TQT_TQWIDGET(widget));
+  main->addWidget(widget);
 
-  connect( TQT_TQOBJECT(widget->chkEnable), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( TQT_TQOBJECT(widget->chkShowSingle), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect( widget->chkEnable, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed()));
+  connect( widget->chkShowSingle, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed()));
 
-  connect( TQT_TQOBJECT(widget->comboHotkey), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(hotkeyComboChanged()));
-  connect( TQT_TQOBJECT(widget->comboHotkey), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(updateOptionsCommand()));
-  connect( TQT_TQOBJECT(widget->comboHotkey), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( TQT_TQOBJECT(widget->comboModel), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(hotkeyComboChanged()));
+  connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateOptionsCommand()));
+  connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+  connect( widget->comboModel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
 
-  connect( TQT_TQOBJECT(widget->listLayoutsSrc), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
-									TQT_TQOBJECT(this), TQT_SLOT(add()));
-  connect( TQT_TQOBJECT(widget->btnAdd), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(add()));
-  connect( TQT_TQOBJECT(widget->btnRemove), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(remove()));
+  connect( widget->listLayoutsSrc, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
+									this, TQ_SLOT(add()));
+  connect( widget->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(add()));
+  connect( widget->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove()));
 
-  connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(variantChanged()));
-  connect( TQT_TQOBJECT(widget->listLayoutsDst), TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-		TQT_TQOBJECT(this), TQT_SLOT(layoutSelChanged(TQListViewItem *)));
+  connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+  connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(variantChanged()));
+  connect( widget->listLayoutsDst, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+		this, TQ_SLOT(layoutSelChanged(TQListViewItem *)));
 
-  connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(displayNameChanged(const TQString&)));
+  connect( widget->editDisplayName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(displayNameChanged(const TQString&)));
 
   widget->btnUp->setIconSet(SmallIconSet("1uparrow"));
-  connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveUp()));
+  connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()));
   widget->btnDown->setIconSet(SmallIconSet("1downarrow"));
-  connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveDown()));
+  connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()));
+
+  connect( widget->grpStyle, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
+  connect( widget->grpSwitching, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
+  connect( widget->grpLabel, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
+
+  connect( widget->chkFitToBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+  connect( widget->chkDimFlag, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+
+  connect( widget->bgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
+  connect( widget->fgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
+  connect( widget->chkBgTransparent, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(changed()));
+  connect( widget->labelFont, TQ_SIGNAL( fontSelected(const TQFont&) ), this, TQ_SLOT(changed()));
+  connect( widget->chkLabelShadow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT(changed()));
+  connect( widget->shColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
 
-  connect( widget->grpStyle, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
-  connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
-  connect( widget->grpLabel, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
+  connect( widget->chkBevel, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
 
-  connect( widget->bgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->fgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->labelFont, TQT_SIGNAL( fontSelected(const TQFont&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->chkLabelShadow, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->shColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect( widget->chkEnableSticky, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+  connect( widget->spinStickyDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
 
-  connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+  connect(widget->chkEnableNotify,       TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(widget->chkNotifyUseKMilo,     TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(widget->chkEnableNotify, TQ_SIGNAL(toggled(bool)), widget->chkNotifyUseKMilo, TQ_SLOT(setEnabled(bool)));
 
   widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, "");
   widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, "");
@@ -157,7 +173,7 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
   widget->listLayoutsSrc->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
   widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
 
-  widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_DISPLAY_NAME);
+  widget->listLayoutsDst->header()->setResizeEnabled(false, LAYOUT_COLUMN_DISPLAY_NAME);
 //  widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_DISPLAY_NAME, 0);
 
   widget->listLayoutsDst->setSorting(-1);
@@ -172,31 +188,41 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
 
   // Load global shortcuts
 #define NOSLOTS
-  keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+  keys = new TDEGlobalAccel(this);
 #include "kxkbbindings.cpp"
+  keys->readSettings();
 
   makeOptionsTab();
-  load();
   makeShortcutsTab();
+  TQTimer::singleShot(0, this, TQ_SLOT(load()));
 }
 
 
 LayoutConfig::~LayoutConfig()
 {
-	delete m_rules;
+    delete m_rules;
+    delete m_icoMgr;
 }
 
 
 void LayoutConfig::load()
 {
-	m_kxkbConfig.load(KxkbConfig::LOAD_ALL);
+	bool modified = false;
+	m_kxkbConfig.load(KxkbConfig::LOAD_ALL_OPTIONS);
 
-	keys->readSettings();
+	// Check if the active settings are different from the saved settings
+	if (m_kxkbConfig.m_useKxkb)
+	{
+		XkbOptions options = XKBExtension::the()->getServerOptions();
+		modified = m_kxkbConfig.setFromXkbOptions(options);
+	}
 
-	initUI();
+	m_kxkbConfig.load(KxkbConfig::LOAD_ALL_OPTIONS);
+	keys->readSettings();
+	initUI(modified);
 }
 
-void LayoutConfig::initUI() {
+void LayoutConfig::initUI(bool modified) {
 	const char* modelName = m_rules->models()[m_kxkbConfig.m_model];
 	if( modelName == NULL )
 		modelName = DEFAULT_MODEL;
@@ -213,7 +239,6 @@ void LayoutConfig::initUI() {
 
 		for ( ; src_it.current(); ++src_it ) {
 			TQListViewItem* srcItem = src_it.current();
-
 			if ( layoutUnit.layout == src_it.current()->text(LAYOUT_COLUMN_MAP) ) {	// check if current config knows about this layout
 				TQListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst);
 
@@ -240,7 +265,7 @@ void LayoutConfig::initUI() {
 		const char *hkOpt  = tqstrdup(TQString("grp:" + (*hk)).ascii());
 		const char *hkDesc = allOptions[hkOpt];
 		if (hkDesc != 0) { // the option exists
-			widget->comboHotkey->insertItem(i18n(hkDesc));
+			widget->comboHotkey->insertItem(XkbRules::trOpt(hkDesc));
 		}
 	}
 	widget->comboHotkey->insertItem(i18n("None"));
@@ -254,6 +279,8 @@ void LayoutConfig::initUI() {
 	widget->radFlagLabel->setChecked( showFlag && showLabel );
 	widget->radFlagOnly->setChecked( showFlag && !showLabel );
 	widget->radLabelOnly->setChecked( !showFlag && showLabel );
+	widget->chkFitToBox->setChecked(m_kxkbConfig.m_fitToBox);
+	widget->chkDimFlag->setChecked(m_kxkbConfig.m_dimFlag);
 
 	widget->xkbOptsMode->setButton(m_kxkbConfig.m_resetOldOptions ? 0 : 1);
 
@@ -265,11 +292,15 @@ void LayoutConfig::initUI() {
 	widget->chkLabelShadow->setChecked( m_kxkbConfig.m_labelShadow );
 	widget->shColor->setColor( m_kxkbConfig.m_colorShadow );
 
+	widget->chkBevel->setChecked(m_kxkbConfig.m_bevel);
+
 	widget->grpLabel->setDisabled(showFlag && !showLabel);
 	widget->grpLabelColors->setDisabled(m_kxkbConfig.m_useThemeColors);
 	widget->labelBgColor->setDisabled(showFlag);
 	widget->bgColor->setDisabled(showFlag);
 	widget->chkBgTransparent->setDisabled(showFlag);
+	widget->grpFlag->setEnabled(showFlag);
+	widget->chkDimFlag->setEnabled(showFlag && showLabel);
 
 	switch( m_kxkbConfig.m_switchingPolicy ) {
 		default:
@@ -288,6 +319,10 @@ void LayoutConfig::initUI() {
 	widget->spinStickyDepth->setEnabled(m_kxkbConfig.m_stickySwitching);
 	widget->spinStickyDepth->setValue( m_kxkbConfig.m_stickySwitchingDepth);
 
+	widget->chkEnableNotify->setChecked(m_kxkbConfig.m_enableNotify);
+	widget->chkNotifyUseKMilo->setChecked(m_kxkbConfig.m_notifyUseKMilo);
+	widget->chkNotifyUseKMilo->setEnabled(m_kxkbConfig.m_enableNotify);
+
 	updateStickyLimit();
 
 	widget->chkEnable->setChecked( m_kxkbConfig.m_useKxkb );
@@ -308,7 +343,7 @@ void LayoutConfig::initUI() {
 			foundGrp = true;
 		}
 
-		OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())];
+		OptionListItem *item = m_optionGroups[optionKey];
 
 		if (item != NULL) {
 			OptionListItem *child = item->findChildItem( option );
@@ -332,7 +367,7 @@ void LayoutConfig::initUI() {
 
 	updateOptionsCommand();
 	updateHotkeyCombo(true);
-	emit TDECModule::changed( false );
+	emit TDECModule::changed(modified);
 }
 
 
@@ -344,6 +379,9 @@ void LayoutConfig::save()
 	m_kxkbConfig.m_resetOldOptions = widget->radXkbOverwrite->isOn();
 	m_kxkbConfig.m_options = createOptionString();
 
+	m_kxkbConfig.m_fitToBox = widget->chkFitToBox->isChecked();
+	m_kxkbConfig.m_dimFlag = widget->chkDimFlag->isChecked();
+
 	m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked();
 	m_kxkbConfig.m_colorBackground = widget->bgColor->color();
 	m_kxkbConfig.m_colorLabel = widget->fgColor->color();
@@ -352,6 +390,8 @@ void LayoutConfig::save()
 	m_kxkbConfig.m_labelShadow = widget->chkLabelShadow->isChecked();
 	m_kxkbConfig.m_colorShadow = widget->shColor->color();
 
+	m_kxkbConfig.m_bevel = widget->chkBevel->isChecked();
+
 	TQListViewItem *item = widget->listLayoutsDst->firstChild();
 	TQValueList<LayoutUnit> layouts;
 	while (item) {
@@ -397,13 +437,17 @@ void LayoutConfig::save()
 	m_kxkbConfig.m_stickySwitching = widget->chkEnableSticky->isChecked();
 	m_kxkbConfig.m_stickySwitchingDepth = widget->spinStickyDepth->value();
 
+	m_kxkbConfig.m_enableNotify = widget->chkEnableNotify->isChecked();
+	m_kxkbConfig.m_notifyUseKMilo = widget->chkNotifyUseKMilo->isChecked();
+
 	m_kxkbConfig.save();
 
 	// We might need to unset previous hotkey options
 	if (m_forceGrpOverwrite)
 	{
 		// First get all the server's options
-		TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+		XkbOptions _opt = XKBExtension::the()->getServerOptions();
+		TQStringList srvOptions = TQStringList::split(",", _opt.options);
 		TQStringList newOptions;
 
 		// Then remove all grp: options
@@ -420,7 +464,7 @@ void LayoutConfig::save()
 		xkbOptions.options = newOptions.join(",");
 		xkbOptions.resetOld = true;
 
-		if (!XKBExtension::setXkbOptions(xkbOptions))
+		if (!XKBExtension::the()->setXkbOptions(xkbOptions))
 		{
 			kdWarning() << "[LayoutConfig::save] Could not overwrite previous grp: options!" << endl;
 		}
@@ -433,8 +477,8 @@ void LayoutConfig::save()
 	keys->writeSettings(0, true);
 
 	// Get current layout from Kxkb
-	if (!kapp->dcopClient()->isAttached())
-		kapp->dcopClient()->attach();
+	if (!tdeApp->dcopClient()->isAttached())
+		tdeApp->dcopClient()->attach();
 
 	DCOPRef kxkbref("kxkb", "kxkb");
 	DCOPReply reply = kxkbref.call( "getCurrentLayout" );
@@ -447,7 +491,7 @@ void LayoutConfig::save()
 	}
 
 	// Cause Kxkb to reread configuration
-	kapp->tdeinitExecWait("kxkb");
+	tdeApp->tdeinitExecWait("kxkb");
 
 	// If previous call was valid, try to change layout
 	if ( reply.isValid() ) {
@@ -659,13 +703,13 @@ TQWidget* LayoutConfig::makeOptionsTab()
   listView->setColumnText( 0, i18n( "Options" ) );
   listView->clear();
 
-  connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(changed()));
-  connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(resolveConflicts(TQListViewItem *)));
-  connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateHotkeyCombo()));
+  connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(changed()));
+  connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(resolveConflicts(TQListViewItem *)));
+  connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(updateHotkeyCombo()));
 
-  connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(changed()));
-  connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateOptionsCommand()));
-  connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateHotkeyCombo()));
+  connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(changed()));
+  connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateOptionsCommand()));
+  connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateHotkeyCombo()));
 
   //Create controllers for all options
   TQDictIterator<char> it(m_rules->options());
@@ -676,25 +720,25 @@ TQWidget* LayoutConfig::makeOptionsTab()
     {
       if( it.currentKey() == "ctrl" || it.currentKey() == "caps"
           || it.currentKey() == "altwin") {
-        parent = new OptionListItem(listView, i18n( it.current() ),
+        parent = new OptionListItem(listView, XkbRules::trOpt( it.current() ),
             TQCheckListItem::RadioButtonController, it.currentKey());
         OptionListItem *item = new OptionListItem(parent, i18n( "None" ),
             TQCheckListItem::RadioButton, "none");
         item->setState(TQCheckListItem::On);
       }
       else if (it.currentKey() == "grp") {
-        parent = new OptionListItem(listView, i18n(it.current()),
+        parent = new OptionListItem(listView, XkbRules::trOpt(it.current()),
             TQCheckListItem::RadioButtonController, it.currentKey());
         parent->setSelectable(false);
         OptionListItem *item = new OptionListItem(parent, i18n("None"),
             TQCheckListItem::CheckBox, "grp:none");
       }
       else {
-        parent = new OptionListItem(listView, i18n( it.current() ),
+        parent = new OptionListItem(listView, XkbRules::trOpt( it.current() ),
             TQCheckListItem::CheckBoxController, it.currentKey());
       }
       parent->setOpen(true);
-      m_optionGroups.insert(i18n(it.currentKey().local8Bit()), parent);
+      m_optionGroups.insert(it.currentKey(), parent);
     }
   }
 
@@ -714,10 +758,10 @@ TQWidget* LayoutConfig::makeOptionsTab()
         text = text.replace( "Cap$", "Caps." );
         if ( parent->type() == TQCheckListItem::CheckBoxController
              || key.startsWith("grp:"))
-            new OptionListItem(parent, i18n(text.utf8()),
+            new OptionListItem(parent, XkbRules::trOpt(text),
                 TQCheckListItem::CheckBox, key);
         else
-            new OptionListItem(parent, i18n(text.utf8()),
+            new OptionListItem(parent, XkbRules::trOpt(text),
                 TQCheckListItem::RadioButton, key);
       }
     }
@@ -730,7 +774,7 @@ TQWidget* LayoutConfig::makeOptionsTab()
 
 TQWidget* LayoutConfig::makeShortcutsTab() {
   m_keyChooser = new KKeyChooser(keys, widget->tabShortcuts, false, false);
-  connect(m_keyChooser, SIGNAL(keyChange()), this, SLOT(changed()));
+  connect(m_keyChooser, TQ_SIGNAL(keyChange()), this, TQ_SLOT(changed()));
   widget->tabShortcuts->layout()->add(m_keyChooser);
   return m_keyChooser;
 }
@@ -978,7 +1022,8 @@ void LayoutConfig::updateHotkeyCombo(bool initial) {
     // Get server options first
     if (initial || widget->xkbOptsMode->selectedId() == 1)
     {
-        TQStringList opts = TQStringList::split(",", XKBExtension::getServerOptions());
+        XkbOptions _opt = XKBExtension::the()->getServerOptions();
+		TQStringList opts = TQStringList::split(",", _opt.options);
         for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
         {
             TQString option(*it);
@@ -1129,7 +1174,7 @@ void LayoutConfig::loadRules()
 		TQString layoutName = it2.current();
 		TQListViewItem *item = new TQListViewItem(widget->listLayoutsSrc);
 
-		item->setPixmap(LAYOUT_COLUMN_FLAG, LayoutIcon::getInstance().findPixmap(layout, false));
+		item->setPixmap(LAYOUT_COLUMN_FLAG, m_icoMgr->find(layout, PIXMAP_STYLE_CONTEXTMENU));
 		item->setText(LAYOUT_COLUMN_NAME, i18n(layoutName.latin1()));
 		item->setText(LAYOUT_COLUMN_MAP, layout);
 		++it2;
@@ -1217,17 +1262,17 @@ OptionListItem * OptionListItem::findChildItem( const TQString& optionName )
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_keyboard_layout(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_keyboard_layout(TQWidget *parent, const char *)
 	{
 		return new LayoutConfig(parent, "kcmlayout");
 	}
 
-	KDE_EXPORT TDECModule *create_keyboard(TQWidget *parent, const char *)
+	TDE_EXPORT TDECModule *create_keyboard(TQWidget *parent, const char *)
 	{
 		return new KeyboardConfig(parent, "kcmlayout");
 	}
 
-	KDE_EXPORT void init_keyboard()
+	TDE_EXPORT void init_keyboard()
 	{
 		KeyboardConfig::init_keyboard();
 
@@ -1235,10 +1280,10 @@ extern "C"
 		m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS);
 
 		if( m_kxkbConfig.m_useKxkb == true ) {
-			kapp->startServiceByDesktopName("kxkb");
+			tdeApp->startServiceByDesktopName("kxkb");
 		}
 		else {
-			if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) {
+			if (!XKBExtension::the()->setXkbOptions(m_kxkbConfig.getKXkbOptions())) {
 				kdDebug() << "Setting XKB options failed!" << endl;
 			}
 		}
@@ -1323,7 +1368,7 @@ extern "C"
 
 //these seem to be new in XFree86 4.4.0
  I18N_NOOP("Shift with numpad keys works as in MS Windows.");
- I18N_NOOP("Special keys (Ctrl+Alt+<key>) handled in a server.");
+ I18N_NOOP("Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.");
  I18N_NOOP("Miscellaneous compatibility options");
  I18N_NOOP("Right Control key works as Right Alt");
 
diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h
index db0f89690..0d2e153b2 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -11,6 +11,7 @@
 
 
 class OptionListItem;
+class LayoutIconManager;
 class LayoutConfigWidget;
 class XkbRules;
 
@@ -22,11 +23,13 @@ public:
   LayoutConfig(TQWidget *parent = 0L, const char *name = 0L);
   virtual ~LayoutConfig();
 
+  void initUI(bool modified = false);
+  virtual TQString handbookDocPath() const;
+
+public slots:
   void load();
   void save();
   void defaults();
-  void initUI();
-  virtual TQString handbookDocPath() const;
 
 protected:
   TQString createOptionString();
@@ -52,6 +55,7 @@ protected slots:
   void changed();
 
 private:
+  LayoutIconManager *m_icoMgr;
   LayoutConfigWidget* widget;
 
   XkbRules *m_rules;
diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui
index c35df0921..52cab2e88 100644
--- a/kxkb/kcmlayoutwidget.ui
+++ b/kxkb/kcmlayoutwidget.ui
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>709</width>
-            <height>563</height>
+            <width>700</width>
+            <height>600</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -22,8 +22,8 @@
     </property>
     <property name="minimumSize">
         <size>
-            <width>600</width>
-            <height>510</height>
+            <width>700</width>
+            <height>600</height>
         </size>
     </property>
     <grid>
@@ -611,6 +611,41 @@
                                     </widget>
                                 </grid>
                             </widget>
+                            <widget class="TQGroupBox">
+                                <property name="name">
+                                    <cstring>grpBoxNotifications</cstring>
+                                </property>
+                                <property name="title">
+                                    <string>Notifications</string>
+                                </property>
+                                <vbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkEnableNotify</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Enable keyboard layout notification</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>If this option is enabled, a little notification will pop up on the screen displaying the name of the currently selected layout whenever it changes.</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkNotifyUseKMilo</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Use KMilo for notifications, if available</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>If this option is enabled and KMilo is available, it will be used to display the notifications instead of the standard notification system. If KMilo is not available, notifications will be showed via the standard TDE notification system.</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
+                            </widget>
                         </vbox>
                     </widget>
                     <spacer>
@@ -869,36 +904,19 @@
                                                     </size>
                                                 </property>
                                             </spacer>
-                                            <spacer row="4" column="0">
-                                                <property name="name">
-                                                    <cstring>spacer22</cstring>
-                                                </property>
-                                                <property name="orientation">
-                                                    <enum>Horizontal</enum>
-                                                </property>
-                                                <property name="sizeType">
-                                                    <enum>Fixed</enum>
-                                                </property>
-                                                <property name="sizeHint">
-                                                    <size>
-                                                        <width>20</width>
-                                                        <height>20</height>
-                                                    </size>
-                                                </property>
-                                            </spacer>
-                                            <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="3">
-                                                <property name="name">
-                                                    <cstring>chkBgTransparent</cstring>
-                                                </property>
-                                                <property name="text">
-                                                    <string>Transparent background</string>
-                                                </property>
-                                                <property name="whatsThis" stdset="0">
-                                                    <string>Check this to remove the indicator's background. Only applicable in "Label only" mode.</string>
-                                                </property>
-                                            </widget>
                                         </grid>
                                     </widget>
+                                    <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="4">
+                                        <property name="name">
+                                            <cstring>chkBgTransparent</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Transparent background</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Check this to remove the indicator's background. Only applicable in "Label only" mode.</string>
+                                        </property>
+                                            </widget>
                                     <widget class="KSeparator" row="5" column="0" rowspan="1" colspan="3">
                                         <property name="name">
                                             <cstring>separator1</cstring>
@@ -957,7 +975,8 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                    </widget>                                           <spacer row="7" column="2">
+                                    </widget>
+                                    <spacer row="7" column="2">
                                         <property name="name">
                                             <cstring>spacer23</cstring>
                                         </property>
@@ -976,6 +995,35 @@
                                     </spacer>
                                 </grid>
                             </widget>
+                            <widget class="TQButtonGroup" row="2" column="0" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>grpFlag</cstring>
+                                </property>
+                                <property name="title">
+                                    <string>Flag Style</string>
+                                </property>
+                                <vbox>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkFitToBox</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Stretc&amp;h flag</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>If this option is enabled, the flag will be stretched to fit the tray indicator size.</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkDimFlag</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Dim flag to make the label more visible</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
+                            </widget>
                             <widget class="TQButtonGroup" row="0" column="1">
                                 <property name="name">
                                     <cstring>grpMisc</cstring>
@@ -992,6 +1040,17 @@
                                             <string>Show indicator for single layout</string>
                                         </property>
                                     </widget>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkBevel</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Show indicator bevel</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>If this option is enabled, the layout indicator will be drawn with a thin 3D bevel around it.</string>
+                                        </property>
+                                    </widget>
                                 </vbox>
                             </widget>
                         </grid>
@@ -1174,8 +1233,8 @@
         <signal>toggled(bool)</signal>
         <receiver>bgColor</receiver>
         <slot>setEnabled(bool)</slot>
-      </connection>
-      <connection>
+    </connection>
+    <connection>
         <sender>radLabelOnly</sender>
         <signal>toggled(bool)</signal>
         <receiver>labelBgColor</receiver>
@@ -1193,6 +1252,36 @@
         <receiver>labelBgColor</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
+    <connection>
+        <sender>chkEnableNotify</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>chkNotifyUseKMilo</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radFlagOnly</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>grpFlag</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radFlagLabel</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>grpFlag</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radLabelOnly</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>grpFlag</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radFlagLabel</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>chkDimFlag</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 358d10450..0fb62a466 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -42,12 +42,13 @@
 #include <knuminput.h>
 #include <tdeapplication.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <kdialog.h>
 
 #include "kcmmisc.h"
 #include "kcmmiscwidget.h"
+#include "x11helper.h"
 #include <X11/Xlib.h>
 
 KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
@@ -60,25 +61,27 @@ KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
   lay->addStretch();
 
   ui->click->setRange(0, 100, 10);
-  ui->delay->setRange(100, 5000, 50, false);
+  ui->delay->setRange(0, 5000, 10, false);
   ui->rate->setRange(5, 50, 5, false);
 
-  ui->delaySlider->setRange(1000, 50000);
+  // Values multiplied by 10 compated to the integer input field
+  ui->delaySlider->setRange(0, 50000);
   ui->delaySlider->setSteps(50, 500);
   ui->delaySlider->setTickInterval(2500);
 
+  // Values multiplied by 100 compated to the integer input field
   ui->rateSlider->setRange(500, 5000);
-  ui->rateSlider->setSteps(50, 500);
+  ui->rateSlider->setSteps(100, 500);
   ui->rateSlider->setTickInterval(500);
 
-  connect(ui->repeatBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
-  connect(ui->delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySpinboxChanged(int)));
-  connect(ui->delaySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySliderChanged(int)));
-  connect(ui->rate, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(rateSpinboxChanged(double)));
-  connect(ui->rateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rateSliderChanged(int)));
+  connect(ui->repeatBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+  connect(ui->delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySpinboxChanged(int)));
+  connect(ui->delaySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySliderChanged(int)));
+  connect(ui->rate, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(rateSpinboxChanged(double)));
+  connect(ui->rateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rateSliderChanged(int)));
 
-  connect(ui->click, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-  connect(ui->numlockGroup, TQT_SIGNAL(released(int)), this, TQT_SLOT(changed()));
+  connect(ui->click, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+  connect(ui->numlockGroup, TQ_SIGNAL(released(int)), this, TQ_SLOT(changed()));
 
 #if !defined(HAVE_XTEST) && !defined(HAVE_XKB)
   ui->numlockGroup->setDisabled( true );
@@ -126,7 +129,7 @@ void KeyboardConfig::load()
 
   XKeyboardState kbd;
 
-  XGetKeyboardControl(kapp->getDisplay(), &kbd);
+  XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 
   config.setGroup("Keyboard");
   bool key = config.readBoolEntry("KeyboardRepeating", true);
@@ -153,7 +156,7 @@ void KeyboardConfig::save()
 
   kbd.key_click_percent = clickVolume;
   kbd.auto_repeat_mode = keyboardRepeat;
-  XChangeKeyboardControl(kapp->getDisplay(),
+  XChangeKeyboardControl(tdeApp->getDisplay(),
                            KBKeyClickPercent | KBAutoRepeatMode,
                            &kbd);
   if( keyboardRepeat ) {
@@ -535,12 +538,12 @@ void KeyboardConfig::init_keyboard()
 	XKeyboardState   kbd;
 	XKeyboardControl kbdc;
 
-	XGetKeyboardControl(kapp->getDisplay(), &kbd);
+	XGetKeyboardControl(tdeApp->getDisplay(), &kbd);
 	bool key = config->readBoolEntry("KeyboardRepeating", true);
 	kbdc.key_click_percent = config->readNumEntry("ClickVolume", kbd.key_click_percent);
 	kbdc.auto_repeat_mode = (key ? AutoRepeatModeOn : AutoRepeatModeOff);
 
-	XChangeKeyboardControl(kapp->getDisplay(),
+	XChangeKeyboardControl(tdeApp->getDisplay(),
 						   KBKeyClickPercent | KBAutoRepeatMode,
 						   &kbdc);
 
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 8d725e3e5..6aa5b8ee2 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -24,29 +24,35 @@ DESCRIPTION
 */
 
 #include <unistd.h>
-#include <stdlib.h>
 #include <assert.h>
 
 #include <tqregexp.h>
 #include <tqfile.h>
 #include <tqstringlist.h>
 #include <tqimage.h>
+#include <tqtimer.h>
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
+#ifdef WITH_TDEHWLIB
+#include <tdehardwaredevices.h>
+#endif
 #include <tdeglobal.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <twinmodule.h>
 #include <twin.h>
 #include <tdetempfile.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kipc.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
+#include <knotifyclient.h>
+#include <dcopclient.h>
+#include <dcopref.h>
 
 #include "x11helper.h"
 #include "kxkb.h"
@@ -59,35 +65,38 @@ DESCRIPTION
 
 
 KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
-    : KUniqueApplication(allowStyles, GUIenabled),
+    : TDEUniqueApplication(allowStyles, GUIenabled),
     m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID),
-    m_rules(NULL),
-    m_tray(NULL),
-    kWinModule(NULL)
+    m_rules(nullptr),
+    m_tray(nullptr),
+    kWinModule(nullptr)
 {
-	m_extension = new XKBExtension();
-    if( !m_extension->init() ) {
-		kdDebug() << "xkb initialization failed, exiting..." << endl;
-		::exit(1);
-    }
-    connect(m_extension, TQT_SIGNAL(groupChanged(uint)), this, TQT_SLOT(slotGroupChanged(uint)));
+	X11Helper::initializeTranslations();
+	XKBExtension *xkb = XKBExtension::the();
+	connect(xkb, TQ_SIGNAL(groupChanged(uint)), this, TQ_SLOT(slotGroupChanged(uint)));
+	connect(xkb, TQ_SIGNAL(optionsChanged()), this, TQ_SLOT(slotSyncXkbOptions()));
 
 	m_layoutOwnerMap = new LayoutMap(kxkbConfig);
 
 	// keep in sync with kcmlayout.cpp
-	keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+	keys = new TDEGlobalAccel(this);
 #include "kxkbbindings.cpp"
 
-    connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) );
+    connect( this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)) );
     addKipcEventMask( KIPC::SettingsChanged );
-}
 
+#if WITH_TDEHWLIB
+    TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+    connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(hardwareChanged(TDEGenericDevice*)));
+    connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(hardwareChanged(TDEGenericDevice*)));
+    connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(hardwareChanged(TDEGenericDevice*)));
+#endif
+}
 
 KXKBApp::~KXKBApp()
 {
 	delete m_tray;
 	delete m_rules;
-	delete m_extension;
 	delete m_layoutOwnerMap;
 	delete kWinModule;
 	delete keys;
@@ -95,193 +104,298 @@ KXKBApp::~KXKBApp()
 
 int KXKBApp::newInstance()
 {
-    if (settingsRead()) {
-        layoutApply();
-    }
-
+    readSettings();
     return 0;
 }
 
-bool KXKBApp::settingsRead()
+void KXKBApp::readSettings()
 {
-	XkbOptions options = kxkbConfig.getKXkbOptions();
-	if( !m_extension->setXkbOptions(options) ) {
-		kdDebug() << "Setting XKB options failed!" << endl;
-	}
+    // Xkb options
+    kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS);
 
-    if ( kxkbConfig.m_useKxkb == false ) {
-        kapp->quit();
-        return false;
+    if (!kxkbConfig.m_useKxkb)
+    {
+        kdDebug() << "kxkb is disabled, applying xkb options and exiting" << endl;
+        applyXkbOptions();
+        quit();
+        return;
     }
-	
-	m_prevWinId = X11Helper::UNKNOWN_WINDOW_ID;
-	
-	if( kxkbConfig.m_switchingPolicy == SWITCH_POLICY_GLOBAL ) {
-		delete kWinModule;
-		kWinModule = NULL;
-	}
-	else {
-		TQDesktopWidget desktopWidget;
-		if( desktopWidget.numScreens() > 1 && desktopWidget.isVirtualDesktop() == false ) {
-			kdWarning() << "With non-virtual desktop only global switching policy supported on non-primary screens" << endl;
-			//TODO: find out how to handle that
-		}
-		
-		if( kWinModule == NULL ) {
-			kWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
-			connect(kWinModule, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(windowChanged(WId)));
-		}
-		m_prevWinId = kWinModule->activeWindow();
-		kdDebug() << "Active window " << m_prevWinId << endl;
-	}
-	
-	m_layoutOwnerMap->reset();
-	m_layoutOwnerMap->setCurrentWindow( m_prevWinId );
-
-	if( m_rules == NULL )
-		m_rules = new XkbRules(false);
-	
-	for(int ii=0; ii<(int)kxkbConfig.m_layouts.count(); ii++) {
-		LayoutUnit& layoutUnit = kxkbConfig.m_layouts[ii];
-	}
-	
-	m_currentLayout = kxkbConfig.m_layouts[0];
-	kdDebug() << "default layout is " << m_currentLayout.toPair() << endl;
-	
-	if( kxkbConfig.m_layouts.count() == 1 && !kxkbConfig.m_showSingle) {
-		kapp->quit();
-		return false;
- 	}
-
-	initTray();
-	
-	TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
-	keys->readSettings();
-	keys->updateConnections();
-
-	return true;
+
+    kdDebug() << "applying xkb options and layouts" << endl;
+    kxkbConfig.load(KxkbConfig::LOAD_ALL_OPTIONS);
+    applyXkbOptions();
+
+    // Active window watcher
+    m_prevWinId = X11Helper::UNKNOWN_WINDOW_ID;
+
+    if (kxkbConfig.m_switchingPolicy == SWITCH_POLICY_GLOBAL)
+    {
+        delete kWinModule;
+        kWinModule = nullptr;
+    }
+
+    else
+    {
+        TQDesktopWidget desktopWidget;
+        if (desktopWidget.numScreens() > 1 && !desktopWidget.isVirtualDesktop())
+        {
+            kdWarning() << "With non-virtual desktop only global switching policy supported on non-primary screens" << endl;
+            //TODO: find out how to handle that
+        }
+
+        if (!kWinModule)
+        {
+            kWinModule = new KWinModule(nullptr, KWinModule::INFO_DESKTOP);
+            connect(kWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId)));
+        }
+
+        m_prevWinId = kWinModule->activeWindow();
+        kdDebug() << "Active window " << m_prevWinId << endl;
+    }
+
+    // Init layout owner map
+    m_layoutOwnerMap->reset();
+    m_layoutOwnerMap->setCurrentWindow( m_prevWinId );
+
+    // Init rules
+    if (!m_rules)
+    {
+        m_rules = new XkbRules(false);
+    }
+
+    // Init layouts
+    for (int i = 0; i < kxkbConfig.m_layouts.count(); i++)
+    {
+        LayoutUnit& layoutUnit = kxkbConfig.m_layouts[i];
+    }
+
+    m_currentLayout = kxkbConfig.m_layouts[0];
+    setLayout(m_currentLayout);
+
+    kdDebug() << "default layout is " << m_currentLayout.toPair() << endl;
+
+    if (kxkbConfig.m_layouts.count() == 1 && !kxkbConfig.m_showSingle)
+    {
+        quit();
+        return;
+    }
+
+    TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
+
+    // Init tray
+    if (!m_tray)
+    {
+        m_tray = new KxkbSystemTray(&kxkbConfig);
+        connect(m_tray, TQ_SIGNAL(menuActivated(int)), this, TQ_SLOT(menuActivated(int)));
+        connect(m_tray, TQ_SIGNAL(toggled()), this, TQ_SLOT(nextLayout()));
+    }
+
+    m_tray->initLayoutList(kxkbConfig.m_layouts, *m_rules);
+    m_tray->setCurrentLayout(m_currentLayout);
+    m_tray->show();
+
+    // Init keybindings
+    keys->readSettings();
+    keys->updateConnections();
 }
 
-void KXKBApp::initTray()
+void KXKBApp::applyXkbOptions()
 {
-	if( !m_tray )
-	{
-		KSystemTray* sysTray = new KxkbSystemTray();
-		TDEPopupMenu* popupMenu = sysTray->contextMenu();
-	//	popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() );
-
-		m_tray = new KxkbLabelController(sysTray, popupMenu);
- 		connect(popupMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuActivated(int)));
-		connect(sysTray, TQT_SIGNAL(toggled()), this, TQT_SLOT(nextLayout()));
-	}
-	
-	m_tray->setShowFlag(kxkbConfig.m_showFlag);
-	m_tray->initLayoutList(kxkbConfig.m_layouts, *m_rules);
-	m_tray->setCurrentLayout(m_currentLayout);
-	m_tray->show();
+    XkbOptions options = kxkbConfig.getKXkbOptions();
+    if (!XKBExtension::the()->setXkbOptions(options)) {
+        kdWarning() << "Setting XKB options failed!" << endl;
+    }
 }
 
-// This function activates the keyboard layout specified by the
-// configuration members (m_currentLayout)
-void KXKBApp::layoutApply()
+void KXKBApp::hardwareChanged(TDEGenericDevice *dev)
 {
-    setLayout(m_currentLayout);
+#   if WITH_TDEHWLIB
+    if (dev->type() == TDEGenericDeviceType::Keyboard)
+    {
+        TQTimer::singleShot(500, this, TQ_SLOT(applyXkbOptions()));
+    }
+#   endif
 }
 
 // kdcop
 bool KXKBApp::setLayout(const TQString& layoutPair)
 {
-	const LayoutUnit layoutUnitKey(layoutPair);
-	if( kxkbConfig.m_layouts.contains(layoutUnitKey) ) {
-		return setLayout( *kxkbConfig.m_layouts.find(layoutUnitKey) );
-	}
-	return false;
+    return setLayout((LayoutUnit)layoutPair);
 }
 
 // Activates the keyboard layout specified by 'layoutUnit'
 bool KXKBApp::setLayout(const LayoutUnit& layoutUnit)
 {
-	uint group = kxkbConfig.m_layouts.findIndex(layoutUnit);
-	bool res = m_extension->setGroup(group);
-	if (res) {
-		m_currentLayout = layoutUnit;
-	}
-
-    if (m_tray) {
-		if (res) {
-			m_tray->setCurrentLayout(layoutUnit);
-		} else {
-			m_tray->setError(layoutUnit.toPair());
-		}
-	}
-
-	return res;
+    const int group = kxkbConfig.m_layouts.findIndex(layoutUnit);
+    if (group >= 0) {
+        return setLayout(group);
+    }
+    return false;
 }
+
 // Activates the keyboard layout specified by group number
 bool KXKBApp::setLayout(const uint group)
 {
-	bool res = m_extension->setGroup(group);
-	if (res) {
-		m_currentLayout = kxkbConfig.m_layouts[group];
-	}
+    // If this group is already set, just show the notification and return
+    if (XKBExtension::the()->getGroup() == group) {
+        if (kxkbConfig.m_enableNotify) {
+            showLayoutNotification();
+        }
+        return true;
+    }
 
-	if (m_tray) {
-		if (res)
-			m_tray->setCurrentLayout(m_currentLayout);
-		else
-			m_tray->setError(m_currentLayout.toPair());
-	}
+    bool ok = XKBExtension::the()->setGroup(group);
+    if (!ok) {
+        TQString layout = kxkbConfig.m_layouts[group].toPair();
+        if (m_tray) {
+            m_tray->setError(layout);
+        }
 
-	return res;
+        if (kxkbConfig.m_enableNotify) {
+            showErrorNotification(layout);
+        }
+    }
+    return ok;
 }
 
-
 void KXKBApp::nextLayout()
 {
-	const LayoutUnit& layout = m_layoutOwnerMap->getNextLayout().layoutUnit;
-	setLayout(layout);
+    const LayoutUnit& layout = m_layoutOwnerMap->getNextLayout().layoutUnit;
+    setLayout(layout);
 }
 
 void KXKBApp::prevLayout()
 {
-	const LayoutUnit& layout = m_layoutOwnerMap->getPrevLayout().layoutUnit;
-	setLayout(layout);
+    const LayoutUnit& layout = m_layoutOwnerMap->getPrevLayout().layoutUnit;
+    setLayout(layout);
 }
 
-
 void KXKBApp::menuActivated(int id)
 {
-	if( KxkbLabelController::START_MENU_ID <= id 
-		   && id < KxkbLabelController::START_MENU_ID + (int)kxkbConfig.m_layouts.count() )
-	{
-		const LayoutUnit& layout = kxkbConfig.m_layouts[id - KxkbLabelController::START_MENU_ID];
-		m_layoutOwnerMap->setCurrentLayout( layout );
-		setLayout( layout );
-	}
-	else if (id == KxkbLabelController::CONFIG_MENU_ID)
+    if (id >= KxkbSystemTray::START_MENU_ID &&
+        id <  KxkbSystemTray::START_MENU_ID + kxkbConfig.m_layouts.count())
+    {
+        setLayout(id - KxkbSystemTray::START_MENU_ID);
+    }
+    else if (id == KxkbSystemTray::CONFIG_MENU_ID)
     {
         TDEProcess p;
         p << "tdecmshell" << "keyboard_layout";
         p.start(TDEProcess::DontCare);
-	}
-	else if (id == KxkbLabelController::HELP_MENU_ID)
-	{
-		TDEApplication::kApplication()->invokeHelp(0, "kxkb");
-	}
-//	else
-//	{
-//		quit();
-//	}
+    }
+    else if (id == KxkbSystemTray::HELP_MENU_ID)
+    {
+        invokeHelp(0, "kxkb");
+    }
+    else
+    {
+        quit();
+    }
 }
 
 void KXKBApp::slotGroupChanged(uint group)
 {
-	if (group >= kxkbConfig.m_layouts.count())
+    if (!kxkbConfig.m_layouts.count()) {
+      kdError() << "[kxkb] no layout found!" << endl;
+      return;
+    }
+
+    if (group >= kxkbConfig.m_layouts.count()) {
+        kdError() << "[kxkb] unknown group requested: " << group << endl;
+        if (m_tray)
+        {
+            m_tray->setError(i18n("Unknown"));
+        }
+        if (kxkbConfig.m_enableNotify)
+        {
+            showErrorNotification(i18n("Unknown"));
+        }
+        return;
+    }
+
+    m_currentLayout = kxkbConfig.m_layouts[group];
+    m_layoutOwnerMap->setCurrentLayout(m_currentLayout);
+
+    if (m_tray) {
+        m_tray->setCurrentLayout(m_currentLayout);
+    }
+
+    if (kxkbConfig.m_enableNotify) {
+        showLayoutNotification();
+    }
+}
+
+void KXKBApp::slotSyncXkbOptions()
+{
+	// Make sure the X11 server has had enough time to apply the change
+	TQTimer::singleShot(100, this, TQ_SLOT(syncXkbOptions()));
+}
+
+void KXKBApp::syncXkbOptions()
+{
+	XkbOptions options = XKBExtension::the()->getServerOptions();
+	if (kxkbConfig.setFromXkbOptions(options))
 	{
-		group = 0;
+		m_layoutOwnerMap->reset();
+		if (m_tray)
+		{
+			m_tray->initLayoutList(kxkbConfig.m_layouts, *m_rules);
+		}
 	}
-	m_currentLayout = kxkbConfig.m_layouts[group];
-	m_tray->setCurrentLayout(m_currentLayout);
+	slotGroupChanged(XKBExtension::the()->getGroup());
+}
+
+void KXKBApp::showLayoutNotification()
+{
+    bool useKMilo = kxkbConfig.m_notifyUseKMilo && isKMiloAvailable(),
+         notificationSent = false;
+
+    TQString layoutName(m_rules->getLayoutName(m_currentLayout));
+
+    if (useKMilo) {
+        DCOPRef kmilo("kded", "kmilod");
+        if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, miniIcon())) {
+            notificationSent = true;
+        }
+    }
+
+    if (!notificationSent) {
+        WId wid = (m_tray ? m_tray->winId() : 0);
+        KNotifyClient::event(wid, "LayoutChange", layoutName);
+    }
+}
+
+void KXKBApp::showErrorNotification(TQString layout) {
+    bool useKMilo = kxkbConfig.m_notifyUseKMilo && isKMiloAvailable(),
+         notificationSent = false;
+
+    if (useKMilo) {
+        DCOPRef kmilo("kded", "kmilod");
+        if (kmilo.send("displayText(TQString,TQPixmap)", i18n("Error changing keyboard layout to '%1'").arg(layout), miniIcon())) {
+            notificationSent = true;
+        }
+    }
+
+    if (!notificationSent) {
+        WId wid = (m_tray ? m_tray->winId() : 0);
+        KNotifyClient::event(wid, "Error");
+    }
+}
+
+bool KXKBApp::isKMiloAvailable() {
+    QCStringList modules;
+    TQCString replyType;
+    TQByteArray replyData;
+    if (dcopClient()->call("kded", "kded", "loadedModules()",
+                                 TQByteArray(), replyType, replyData))
+    {
+        if (replyType == "QCStringList") {
+            TQDataStream reply(replyData, IO_ReadOnly);
+            reply >> modules;
+            return modules.contains("kmilod");
+        }
+    }
+    return false;
 }
 
 // TODO: we also have to handle deleted windows
@@ -294,18 +408,18 @@ void KXKBApp::windowChanged(WId winId)
 	}
 
 	kdDebug() << "old WinId: " << m_prevWinId << ", new WinId: " << winId << endl;
-	
+
 	if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) {	// saving layout from previous window
 // 		m_layoutOwnerMap->setCurrentWindow(m_prevWinId);
 		m_layoutOwnerMap->setCurrentLayout(m_currentLayout);
 	}
- 
+
 	m_prevWinId = winId;
 
 	if( winId != X11Helper::UNKNOWN_WINDOW_ID ) {
 		m_layoutOwnerMap->setCurrentWindow(winId);
 		const LayoutState& layoutState = m_layoutOwnerMap->getCurrentLayout();
-		
+
 		if( layoutState.layoutUnit != m_currentLayout ) {
 			kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << " for "  << winId << endl;
 			setLayout(layoutState.layoutUnit);
@@ -313,7 +427,6 @@ void KXKBApp::windowChanged(WId winId)
 	}
 }
 
-
 void KXKBApp::slotSettingsChanged(int category)
 {
 	if (category == TDEApplication::SETTINGS_SHORTCUTS) {
@@ -325,13 +438,13 @@ void KXKBApp::slotSettingsChanged(int category)
 
 bool KXKBApp::x11EventFilter(XEvent *e) {
     // let the extension process the event and emit signals if necessary
-    m_extension->processXEvent(e);
+    XKBExtension::the()->processXEvent(e);
     return TDEApplication::x11EventFilter(e);
 }
 
 const char *DESCRIPTION = I18N_NOOP("A utility to switch keyboard maps");
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
     TDEAboutData about("kxkb", I18N_NOOP("TDE Keyboard Tool"), "1.0",
                      DESCRIPTION, TDEAboutData::License_LGPL,
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index 67e61ab56..803057f61 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -31,7 +31,12 @@ DESCRIPTION
 #include <tqdict.h>
 #include <tqptrqueue.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
+#ifdef WITH_TDEHWLIB
+#include <tdegenericdevice.h>
+#else
+#define TDEGenericDevice void
+#endif
 
 #include "kxkbtraywindow.h"
 #include "kxkbconfig.h"
@@ -47,7 +52,7 @@ class LayoutMap;
     and switching layouts
 */
 
-class KXKBApp : public KUniqueApplication
+class KXKBApp : public TDEUniqueApplication
 {
     TQ_OBJECT
     K_DCOP
@@ -72,18 +77,23 @@ public slots:
 protected slots:
     void menuActivated(int id);
     void windowChanged(WId winId);
-    void layoutApply();
     void slotGroupChanged(uint group);
 
     void slotSettingsChanged(int category);
+    void showLayoutNotification();
+    void showErrorNotification(TQString layout);
+
+    void hardwareChanged(TDEGenericDevice *dev);
 
-protected:
-    // Read settings, and apply them.
-    bool settingsRead();
+    void readSettings();
+    void applyXkbOptions();
+    void slotSyncXkbOptions();
+    void syncXkbOptions();
 
 private:
     void initTray();
     bool x11EventFilter(XEvent *e);
+    bool isKMiloAvailable();
 
 private:
     KxkbConfig kxkbConfig;
@@ -95,7 +105,7 @@ private:
 
     XKBExtension *m_extension;
     XkbRules *m_rules;
-    KxkbLabelController *m_tray;
+    KxkbSystemTray *m_tray;
     TDEGlobalAccel *keys;
     KWinModule* kWinModule;
     bool m_forceSetXKBMap;
diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp
index f4a0fb5c3..02da8a4ea 100644
--- a/kxkb/kxkbbindings.cpp
+++ b/kxkb/kxkbbindings.cpp
@@ -1,6 +1,6 @@
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4, 0, 0 )
diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp
index 52ba6941b..fd86f049a 100644
--- a/kxkb/kxkbconfig.cpp
+++ b/kxkb/kxkbconfig.cpp
@@ -30,108 +30,150 @@ static const char* switchModes[SWITCH_POLICY_COUNT] = {
 const LayoutUnit DEFAULT_LAYOUT_UNIT = LayoutUnit("us", "");
 const char* DEFAULT_MODEL = "pc104";
 
-bool KxkbConfig::load(int loadMode)
+void KxkbConfig::load(int loadMode)
 {
+	// INITIAL OPTIONS (loaded regardless of whether KXkb is enabled)
+
 	TDEConfig *config = new TDEConfig("kxkbrc", true, false);
 	config->setGroup("Layout");
 
-	if( loadMode == LOAD_ALL ) {
-		m_resetOldOptions = config->readBoolEntry("ResetOldOptions", true);
-		m_options = config->readEntry("Options", "");
-	}
-
 	m_useKxkb = config->readBoolEntry("Use", false);
-	kdDebug() << "Use kxkb " << m_useKxkb << endl;
 
-	if( (m_useKxkb == false && loadMode == LOAD_ACTIVE_OPTIONS )
-	  		|| loadMode == LOAD_INIT_OPTIONS )
-		return true;
+	m_resetOldOptions = config->readBoolEntry("ResetOldOptions", true);
+	m_options = config->readEntry("Options", "");
+
+	if (loadMode == LOAD_INIT_OPTIONS)
+	{
+		return;
+	}
+
+	// BASIC OPTIONS (passed to setxkbmap)
 
 	m_model = config->readEntry("Model", DEFAULT_MODEL);
-	kdDebug() << "Model: " << m_model << endl;
 
+	// Layouts
 	TQStringList layoutList;
-	if( config->hasKey("LayoutList") ) {
+	if (config->hasKey("LayoutList"))
+	{
 		layoutList = config->readListEntry("LayoutList");
 	}
-	else { // old config
+	else
+	{ // old config
 		TQString mainLayout = config->readEntry("Layout", DEFAULT_LAYOUT_UNIT.toPair());
 		layoutList = config->readListEntry("Additional");
 		layoutList.prepend(mainLayout);
 	}
-	if( layoutList.count() == 0 )
+
+	if (layoutList.count() == 0)
+	{
 		layoutList.append("us");
+	}
+
+	TQStringList::ConstIterator it;
 
 	m_layouts.clear();
-	for(TQStringList::ConstIterator it = layoutList.begin(); it != layoutList.end() ; ++it) {
+	for (it = layoutList.begin(); it != layoutList.end(); ++it)
+	{
 		m_layouts.append( LayoutUnit(*it) );
-		kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains( LayoutUnit(*it) ) << endl;
+		kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains(LayoutUnit(*it)) << endl;
 	}
 
 	kdDebug() << "Found " << m_layouts.count() << " layouts" << endl;
 
+	// Display names
 	TQStringList displayNamesList = config->readListEntry("DisplayNames", ',');
-	for(TQStringList::ConstIterator it = displayNamesList.begin(); it != displayNamesList.end() ; ++it) {
+	for (it = displayNamesList.begin(); it != displayNamesList.end() ; ++it)
+	{
 		TQStringList displayNamePair = TQStringList::split(':', *it );
-		if( displayNamePair.count() == 2 ) {
-			LayoutUnit layoutUnit( displayNamePair[0] );
-			if( m_layouts.contains( layoutUnit ) ) {
+		if (displayNamePair.count() == 2)
+		{
+			LayoutUnit layoutUnit(displayNamePair[0]);
+			if (m_layouts.contains(layoutUnit))
+			{
 				m_layouts[m_layouts.findIndex(layoutUnit)].displayName = displayNamePair[1].left(3);
 			}
 		}
 	}
 
+	if (loadMode == LOAD_BASIC_OPTIONS)
+	{
+		return;
+	}
+
+	// ALL OTHER OPTIONS (of interest only to KXkb itself)
+
+	// Tray indicator
 	m_showSingle = config->readBoolEntry("ShowSingle", false);
+
 	m_showFlag = config->readBoolEntry("ShowFlag", true);
 	m_showLabel = config->readBoolEntry("ShowLabel", true);
 
+	m_fitToBox = config->readBoolEntry("FitFlagToBox", true);
+
 	m_useThemeColors = config->readBoolEntry("UseThemeColors", false);
 	m_colorBackground = config->readColorEntry("ColorBackground", new TQColor(TQt::gray));
 	m_bgTransparent = config->readBoolEntry("BgTransparent", false);
 	m_colorLabel = config->readColorEntry("ColorLabel", new TQColor(TQt::white));
+
 	m_labelFont = config->readFontEntry("LabelFont", new TQFont("sans", 10, TQFont::Bold));
 	m_labelShadow = config->readBoolEntry("LabelShadow", true);
 	m_colorShadow = config->readColorEntry("ColorShadow", new TQColor(TQt::black));
 
+	m_dimFlag = config->readBoolEntry("DimFlag", true);
+	m_bevel = config->readBoolEntry("IndicatorBevel", false);
+
+	// Switching policy
 	TQString layoutOwner = config->readEntry("SwitchMode", "Global");
 
-	if( layoutOwner == "WinClass" ) {
+	if (layoutOwner == "WinClass")
+	{
 		m_switchingPolicy = SWITCH_POLICY_WIN_CLASS;
 	}
-	else if( layoutOwner == "Window" ) {
+	else if (layoutOwner == "Window")
+	{
 		m_switchingPolicy = SWITCH_POLICY_WINDOW;
 	}
-	else /*if( layoutOwner == "Global" )*/ {
+	else
+	{
 		m_switchingPolicy = SWITCH_POLICY_GLOBAL;
 	}
 
-	if( m_layouts.count() < 2 && m_switchingPolicy != SWITCH_POLICY_GLOBAL ) {
+	if (m_layouts.count() < 2 && m_switchingPolicy != SWITCH_POLICY_GLOBAL)
+	{
 		kdWarning() << "Layout count is less than 2, using Global switching policy" << endl;
 		m_switchingPolicy = SWITCH_POLICY_GLOBAL;
 	}
 
 	kdDebug() << "Layout owner mode " << layoutOwner << endl;
 
+	// Sticky switching
 	m_stickySwitching = config->readBoolEntry("StickySwitching", false);
-	m_stickySwitchingDepth = config->readEntry("StickySwitchingDepth", "2").toInt();
-	if( m_stickySwitchingDepth < 2 )
+	m_stickySwitchingDepth = config->readNumEntry("StickySwitchingDepth", 2);
+	if (m_stickySwitchingDepth < 2)
+	{
 		m_stickySwitchingDepth = 2;
+	}
 
-	if( m_stickySwitching == true ) {
-		if( m_layouts.count() < 3 ) {
+	if (m_stickySwitching)
+	{
+		if (m_layouts.count() < 3)
+		{
 			kdWarning() << "Layout count is less than 3, sticky switching will be off" << endl;
 			m_stickySwitching = false;
 		}
-		else
-		if( (int)m_layouts.count() - 1 < m_stickySwitchingDepth ) {
+		else if (m_layouts.count() - 1 < m_stickySwitchingDepth)
+		{
 			kdWarning() << "Sticky switching depth is more than layout count -1, adjusting..." << endl;
 			m_stickySwitchingDepth = m_layouts.count() - 1;
 		}
 	}
 
-	delete config;
+	// Notifications
+	config->setGroup("Notifications");
+	m_enableNotify = config->readBoolEntry("Enable", false);
+	m_notifyUseKMilo = config->readBoolEntry("UseKMilo", true);
 
-	return true;
+	delete config;
 }
 
 void KxkbConfig::save()
@@ -139,55 +181,65 @@ void KxkbConfig::save()
 	TDEConfig *config = new TDEConfig("kxkbrc", false, false);
 	config->setGroup("Layout");
 
-	config->writeEntry("Model", m_model);
+	config->writeEntry("Use", m_useKxkb);
 
 	config->writeEntry("ResetOldOptions", m_resetOldOptions);
 	config->writeEntry("Options", m_options );
 
+	config->writeEntry("Model", m_model);
+
+	// Layouts
 	TQStringList layoutList;
 	TQStringList displayNamesList;
 
 	TQValueList<LayoutUnit>::ConstIterator it;
-	for(it = m_layouts.begin(); it != m_layouts.end(); ++it) {
+	for (it = m_layouts.begin(); it != m_layouts.end(); ++it) {
 		const LayoutUnit& layoutUnit = *it;
+		layoutList.append(layoutUnit.toPair());
 
-		layoutList.append( layoutUnit.toPair() );
-
-		TQString displayName( layoutUnit.displayName );
-		kdDebug() << " displayName " << layoutUnit.toPair() << " : " << displayName << endl;
-		if( displayName.isEmpty() == false && displayName != layoutUnit.layout ) {
+		// Display name
+		TQString displayName(layoutUnit.displayName);
+		if (!displayName.isEmpty() && displayName != layoutUnit.layout)
+		{
 			displayName = TQString("%1:%2").arg(layoutUnit.toPair(), displayName);
-			displayNamesList.append( displayName );
+			displayNamesList.append(displayName);
 		}
 	}
-
 	config->writeEntry("LayoutList", layoutList);
-	kdDebug() << "Saving Layouts: " << layoutList << endl;
-
-//	if( displayNamesList.empty() == false )
-		config->writeEntry("DisplayNames", displayNamesList);
-// 	else
-// 		config->deleteEntry("DisplayNames");
+	config->writeEntry("DisplayNames", displayNamesList);
 
-	config->writeEntry("Use", m_useKxkb);
+	// Tray indicator
 	config->writeEntry("ShowSingle", m_showSingle);
 
 	config->writeEntry("ShowFlag", m_showFlag);
 	config->writeEntry("ShowLabel", m_showLabel);
 
+	config->writeEntry("FitFlagToBox", m_fitToBox);
+
 	config->writeEntry("UseThemeColors", m_useThemeColors);
 	config->writeEntry("ColorBackground", m_colorBackground);
 	config->writeEntry("BgTransparent", m_bgTransparent);
 	config->writeEntry("ColorLabel", m_colorLabel);
+
 	config->writeEntry("LabelFont", m_labelFont);
 	config->writeEntry("LabelShadow", m_labelShadow);
 	config->writeEntry("ColorShadow", m_colorShadow);
 
+	config->writeEntry("DimFlag", m_dimFlag);
+	config->writeEntry("IndicatorBevel", m_bevel);
+
+	// Switching policy
 	config->writeEntry("SwitchMode", switchModes[m_switchingPolicy]);
 
+	// Sticky switching
 	config->writeEntry("StickySwitching", m_stickySwitching);
 	config->writeEntry("StickySwitchingDepth", m_stickySwitchingDepth);
 
+	// Notifications
+	config->setGroup("Notifications");
+	config->writeEntry("Enable", m_enableNotify);
+	config->writeEntry("UseKMilo", m_notifyUseKMilo);
+
 	// remove old options
  	config->deleteEntry("Variants");
 	config->deleteEntry("Includes");
@@ -197,7 +249,6 @@ void KxkbConfig::save()
 	config->deleteEntry("Layout");
 
 	config->sync();
-
 	delete config;
 }
 
@@ -214,6 +265,10 @@ void KxkbConfig::setDefaults()
 	m_useKxkb = false;
 	m_showSingle = false;
 	m_showFlag = true;
+	m_fitToBox = true;
+	m_dimFlag = true;
+
+	m_bevel = false;
 
 	m_switchingPolicy = SWITCH_POLICY_GLOBAL;
 
@@ -221,6 +276,74 @@ void KxkbConfig::setDefaults()
 	m_stickySwitchingDepth = 2;
 }
 
+bool KxkbConfig::setFromXkbOptions(XkbOptions options)
+{
+	XkbOptions curOptions = getKXkbOptions();
+
+	bool modified = false;
+
+	// We need to fix the variants string if it is empty, otherwise the
+	// comparison below will often wrongly assume that the variants have
+	// changed
+	if (options.variants.isEmpty())
+	{
+		options.variants = ""; // ensure the string is empty but not null
+		for (int i = 0; i < options.layouts.contains(","); ++i)
+		{
+			options.variants += ",";
+		}
+	}
+
+	// Check if keyboard layout options have changed
+	if ((options.model != curOptions.model && !options.model.isNull()))
+	{
+		modified = true;
+		m_model = options.model;
+	}
+
+	if ((options.layouts != curOptions.layouts) || (options.variants != curOptions.variants))
+	{
+		modified = true;
+		m_layouts.clear();
+
+		TQStringList layouts = TQStringList::split(",", options.layouts, true);
+		TQStringList variants = TQStringList::split(",", options.variants, true);
+		TQStringList::Iterator lit = layouts.begin();
+		TQStringList::Iterator vit = variants.begin();
+
+		if (layouts.empty())
+		{
+			layouts << "us";
+		}
+
+		while (lit != layouts.end())
+		{
+			TQString layout = *lit;
+			TQString variant = vit != variants.end() ? *vit : TQString::null;
+			m_layouts.append(LayoutUnit(layout, variant));
+
+			++lit;
+			if (vit != variants.end())
+			{
+				++vit;
+			}
+		}
+	}
+
+	TQStringList serverOpts = TQStringList::split(",", options.options);
+	TQStringList kxkbOpts = TQStringList::split(",", curOptions.options);
+	serverOpts.sort();
+	kxkbOpts.sort();
+
+	if (serverOpts != kxkbOpts)
+	{
+		modified = true;
+		m_options = options.options;
+	}
+
+	return modified;
+}
+
 TQStringList KxkbConfig::getLayoutStringList(/*bool compact*/)
 {
 	TQStringList layoutList;
@@ -267,22 +390,25 @@ TQString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool si
 }
 
 const XkbOptions KxkbConfig::getKXkbOptions() {
-	load(LOAD_ALL);
-
 	XkbOptions options;
 	TQStringList layouts;
 	TQStringList variants;
-	for(TQValueList<LayoutUnit>::ConstIterator it = m_layouts.begin(); it != m_layouts.end(); ++it) {
+	for (TQValueList<LayoutUnit>::ConstIterator it = m_layouts.begin(); it != m_layouts.end(); ++it) {
 		const LayoutUnit& layoutUnit = *it;
 		layouts << layoutUnit.layout;
 		variants << layoutUnit.variant;
 	}
 	options.layouts  = layouts.join(",");
 	options.variants = variants.join(",");
-	options.model    = m_model;
 	options.options  = m_options;
-	kdDebug() << "[getKXkbOptions] options: " << m_options << endl;
 	options.resetOld = m_resetOldOptions;
+	options.model    = m_model;
+
+	if (options.model.isEmpty())
+	{
+		options.model = DEFAULT_MODEL;
+	}
+
 	return options;
 }
 
@@ -321,4 +447,4 @@ const TQString LayoutUnit::parseVariant(const TQString &layvar)
 	if( pos < 2 || len < 2 )
 		return "";
 	return varLine.mid(pos+1, len-2);
-}
\ No newline at end of file
+}
diff --git a/kxkb/kxkbconfig.h b/kxkb/kxkbconfig.h
index 140a2b763..7d02fd3a3 100644
--- a/kxkb/kxkbconfig.h
+++ b/kxkb/kxkbconfig.h
@@ -19,6 +19,8 @@
 #include <tqptrqueue.h>
 #include <tqmap.h>
 
+#include "layoutunit.h"
+
 struct XkbOptions {
 	TQString layouts;
 	TQString variants;
@@ -36,59 +38,6 @@ enum SwitchingPolicy {
 	SWITCH_POLICY_COUNT = 3
 };
 
-
-
-inline TQString createPair(TQString key, TQString value)
-{
-	if( value.isEmpty() )
-		return key;
-	return TQString("%1(%2)").arg(key, value);
-}
-
-struct LayoutUnit {
-	TQString layout;
-	TQString variant;
-	TQString displayName;
-
-	LayoutUnit() {}
-
-	LayoutUnit(TQString layout_, TQString variant_):
-		layout(layout_),
-		variant(variant_)
-	{}
-
-	LayoutUnit(TQString pair) {
-		setFromPair( pair );
-	}
-
-	void setFromPair(const TQString& pair) {
-		layout = parseLayout(pair);
-		variant = parseVariant(pair);
-	}
-
-	TQString toPair() const {
-		return createPair(layout, variant);
-	}
-
-	bool operator<(const LayoutUnit& lu) const {
-		return layout<lu.layout ||
-				(layout==lu.layout && variant<lu.variant);
-	}
-
-	bool operator!=(const LayoutUnit& lu) const {
-		return layout!=lu.layout || variant!=lu.variant;
-	}
-
-	bool operator==(const LayoutUnit& lu) const {
-// 		kdDebug() << layout << "==" << lu.layout << "&&" << variant << "==" << lu.variant << endl;
-		return layout==lu.layout && variant==lu.variant;
-	}
-
-//private:
-	static const TQString parseLayout(const TQString &layvar);
-	static const TQString parseVariant(const TQString &layvar);
-};
-
 extern const LayoutUnit DEFAULT_LAYOUT_UNIT;
 extern const char* DEFAULT_MODEL;
 
@@ -96,17 +45,22 @@ extern const char* DEFAULT_MODEL;
 class KxkbConfig
 {
 public:
-	enum { LOAD_INIT_OPTIONS, LOAD_ACTIVE_OPTIONS, LOAD_ALL };
+	enum { LOAD_INIT_OPTIONS, LOAD_BASIC_OPTIONS, LOAD_ALL_OPTIONS };
 
 	bool m_useKxkb;
 	bool m_showSingle;
 	bool m_showFlag;
 	bool m_showLabel;
+	bool m_fitToBox;
+	bool m_dimFlag;
+	bool m_bevel;
 	bool m_enableXkbOptions;
 	bool m_resetOldOptions;
 	SwitchingPolicy m_switchingPolicy;
 	bool m_stickySwitching;
 	int m_stickySwitchingDepth;
+	bool m_enableNotify;
+	bool m_notifyUseKMilo;
 
 	bool m_useThemeColors;
 	TQColor m_colorBackground;
@@ -120,7 +74,7 @@ public:
 	TQString m_options;
 	TQValueList<LayoutUnit> m_layouts;
 
-	bool load(int loadMode);
+	void load(int loadMode);
 	void save();
 	void setDefaults();
 
@@ -128,6 +82,7 @@ public:
 	static TQString getDefaultDisplayName(const TQString& code_);
 	static TQString getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single=false);
 
+	bool setFromXkbOptions(XkbOptions options);
 	const XkbOptions getKXkbOptions();
 
 private:
diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp
index 46b03da15..7871f443a 100644
--- a/kxkb/kxkbtraywindow.cpp
+++ b/kxkb/kxkbtraywindow.cpp
@@ -17,114 +17,101 @@
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kuniqueapplication.h>
 
 #include "kxkbtraywindow.h"
 #include "pixmap.h"
 #include "rules.h"
-#include "kxkbconfig.h"
 
-
-KxkbLabelController::KxkbLabelController(TQLabel* label_, TDEPopupMenu* contextMenu_) :
-    label(label_),
-    contextMenu(contextMenu_),
- 	m_menuStartIndex(contextMenu_->count()),
-	m_prevLayoutCount(0)
+KxkbSystemTray::KxkbSystemTray(KxkbConfig *kxkbConfig)
+    : KSystemTray(nullptr),
+      m_prevLayoutCount(0)
 {
-// 	kdDebug() << "Creating KxkbLabelController with " << label_ << ", " << contextMenu_ << endl;
-// 	kdDebug() << "Creating KxkbLabelController with startMenuIndex " << m_menuStartIndex << endl;
+    m_icoMgr = new LayoutIconManager(kxkbConfig);
 }
 
-void KxkbLabelController::setToolTip(const TQString& tip)
+KxkbSystemTray::~KxkbSystemTray()
 {
-	TQToolTip::remove(label);
-	TQToolTip::add(label, tip);
+    delete m_icoMgr;
 }
 
-void KxkbLabelController::setPixmap(const TQPixmap& pixmap)
+void KxkbSystemTray::setToolTip(const TQString& tip)
 {
-	TDEIconEffect iconeffect;
-	label->setPixmap( iconeffect.apply(pixmap, TDEIcon::Panel, TDEIcon::DefaultState) );
+    TQToolTip::remove(this);
+    TQToolTip::add(this, tip);
 }
 
-
-void KxkbLabelController::setCurrentLayout(const LayoutUnit& layoutUnit)
+void KxkbSystemTray::setPixmap(const TQPixmap& pix)
 {
-	setToolTip(m_descriptionMap[layoutUnit.toPair()]);
-	setPixmap( LayoutIcon::getInstance().findPixmap(layoutUnit.layout, PIXMAP_STYLE_INDICATOR, layoutUnit.displayName) );
+    TDEIconEffect iconeffect;
+    KSystemTray::setPixmap(iconeffect.apply(pix, TDEIcon::Panel, TDEIcon::DefaultState));
 }
 
+void KxkbSystemTray::setCurrentLayout(const LayoutUnit& layoutUnit)
+{
+    setToolTip(m_descriptionMap[layoutUnit.toPair()]);
+    setPixmap(m_icoMgr->find(layoutUnit.layout, PIXMAP_STYLE_INDICATOR, layoutUnit.displayName));
+}
 
-void KxkbLabelController::setError(const TQString& layoutInfo)
+void KxkbSystemTray::setError(const TQString& layoutInfo)
 {
-    TQString msg = i18n("Error changing keyboard layout to '%1'").arg(layoutInfo);
-	setToolTip(msg);
+    TQString layout(layoutInfo);
+    if (layout.isNull()) {
+        layout = i18n("Unknown");
+    }
 
-	label->setPixmap(LayoutIcon::getInstance().findPixmap("error", PIXMAP_STYLE_NORMAL));
+    TQString msg = i18n("Error changing keyboard layout to '%1'").arg(layoutInfo);
+    setToolTip(msg);
+    setPixmap(m_icoMgr->find(ERROR_CODE, PIXMAP_STYLE_NORMAL));
 }
 
-
-void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules)
+void KxkbSystemTray::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules)
 {
-	TDEPopupMenu* menu = contextMenu;
-//	TQPopupMenu* menu = contextMenu;
-//	int index = menu->indexOf(0);
-
     m_descriptionMap.clear();
-//    menu->clear();
-//    menu->insertTitle( kapp->miniIcon(), kapp->caption() );
 
-	for(int ii=0; ii<m_prevLayoutCount; ++ii) {
-		menu->removeItem(START_MENU_ID + ii);
-		kdDebug() << "remove item: " << START_MENU_ID + ii << endl;
-	}
-/*	menu->removeItem(CONFIG_MENU_ID);
-	menu->removeItem(HELP_MENU_ID);*/
+    int i;
+    for (i = 0; i < m_prevLayoutCount; ++i) {
+        contextMenu()->removeItem(START_MENU_ID + i);
+    }
 
     TDEIconEffect iconeffect;
 
-	int cnt = 0;
+    i = 0;
     TQValueList<LayoutUnit>::ConstIterator it;
-    for (it=layouts.begin(); it != layouts.end(); ++it)
+    for (it = layouts.begin(); it != layouts.end(); ++it)
     {
-		const TQString layoutName = (*it).layout;
-		const TQString variantName = (*it).variant;
+        const TQString layoutName = (*it).layout;
+        const TQString variantName = (*it).variant;
 
-		const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, PIXMAP_STYLE_CONTEXTMENU, (*it).displayName);
+        const TQPixmap& layoutPixmap = m_icoMgr->find((*it).layout, PIXMAP_STYLE_CONTEXTMENU, (*it).displayName);
         const TQPixmap pix = iconeffect.apply(layoutPixmap, TDEIcon::Small, TDEIcon::DefaultState);
 
-		TQString fullName = i18n((rules.layouts()[layoutName]));
-		if( variantName.isEmpty() == false )
-			fullName += " (" + variantName + ")";
-		contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt, m_menuStartIndex + cnt);
-		m_descriptionMap.insert((*it).toPair(), fullName);
+        TQString fullName = rules.getLayoutName((*it));
+        contextMenu()->insertItem(pix, fullName, START_MENU_ID + i, i + 1);
+
+        m_descriptionMap.insert((*it).toPair(), fullName);
 
-		cnt++;
+        ++i;
     }
 
-	m_prevLayoutCount = cnt;
-
-	// if show config, if show help
-	if( menu->indexOf(CONFIG_MENU_ID) == -1 ) {
-		contextMenu->insertSeparator();
-		contextMenu->insertItem(SmallIcon("configure"), i18n("Configure..."), CONFIG_MENU_ID);
-		if( menu->indexOf(HELP_MENU_ID) == -1 )
-			contextMenu->insertItem(SmallIcon("help"), i18n("Help"), HELP_MENU_ID);
-	}
-
-/*    if( index != -1 ) { //not first start
-		menu->insertSeparator();
-		TDEAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection());
-        if (quitAction)
-    	    quitAction->plug(menu);
-    }*/
+    m_prevLayoutCount = i;
+
+    if (contextMenu()->indexOf(CONFIG_MENU_ID) == -1) {
+        contextMenu()->insertSeparator();
+        contextMenu()->insertItem(SmallIcon("configure"), i18n("Configure..."), CONFIG_MENU_ID);
+
+        if (contextMenu()->indexOf(HELP_MENU_ID) == -1) {
+            contextMenu()->insertItem(SmallIcon("help"), i18n("Help"), HELP_MENU_ID);
+        }
+    }
+
+    connect(contextMenu(), TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(menuActivated(int)));
 }
 
-// void KxkbLabelController::mouseReleaseEvent(TQMouseEvent *ev)
-// {
-//     if (ev->button() == TQMouseEvent::LeftButton)
-//         emit toggled();
-//     KSystemTray::mouseReleaseEvent(ev);
-// }
+void KxkbSystemTray::mouseReleaseEvent(TQMouseEvent *ev) {
+    if (ev->button() == TQt::LeftButton) {
+        emit toggled();
+    }
+    KSystemTray::mouseReleaseEvent(ev);
+}
 
 #include "kxkbtraywindow.moc"
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index 01529f0f3..3e1ae2c05 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -1,7 +1,7 @@
 //
 // C++ Interface: kxkbtraywindow
 //
-// Description: 
+// Description:
 //
 //
 // Author: Andriy Rysin <rysin@kde.org>, (C) 2006
@@ -17,75 +17,40 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include "kxkbconfig.h"
+#include "layoutunit.h"
 
-
-class TQLabel;
-class TDEPopupMenu;
 class XkbRules;
+class KxkbConfig;
+class LayoutIconManager;
 
-/* This class is responsible for displaying flag/label for the layout,
-    catching keyboard/mouse events and displaying menu when selected
-*/
-
-class KxkbLabelController: public TQObject
+class KxkbSystemTray : public KSystemTray
 {
-// 	TQ_OBJECT
-			
-public:
-	enum { START_MENU_ID = 100, CONFIG_MENU_ID = 130, HELP_MENU_ID = 131 };
+    TQ_OBJECT
 
-    KxkbLabelController(TQLabel *label, TDEPopupMenu* contextMenu);
+    public:
+        KxkbSystemTray(KxkbConfig *kxkbConfig);
+        ~KxkbSystemTray();
+        void initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rule);
+        void setCurrentLayout(const LayoutUnit& layout);
+        void setError(const TQString& layoutInfo = TQString::null);
 
-    void initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rule);
-    void setCurrentLayout(const LayoutUnit& layout);
-// 	void setCurrentLayout(const TQString& layout, const TQString &variant);
-	void setError(const TQString& layoutInfo="");
-    void setShowFlag(bool showFlag) { m_showFlag = showFlag; }
-	void show() { label->show(); }
-	
-// signals:
-// 
-// 	void menuActivated(int);
-//     void toggled();
+        enum { START_MENU_ID = 100, CONFIG_MENU_ID = 130, HELP_MENU_ID = 131 };
 
-// protected:
-// 
-//     void mouseReleaseEvent(TQMouseEvent *);
+    protected:
+        void mouseReleaseEvent(TQMouseEvent *ev);
 
-private:
-	TQLabel* label;
-	TDEPopupMenu* contextMenu;
-	
-	const int m_menuStartIndex;
-	bool m_showFlag;
-	int m_prevLayoutCount;
-    TQMap<TQString, TQString> m_descriptionMap;
-	
-	void setToolTip(const TQString& tip);
-	void setPixmap(const TQPixmap& pixmap);
-};
+    private slots:
+        void setToolTip(const TQString& tip);
+        void setPixmap(const TQPixmap& pix);
 
+    signals:
+        void menuActivated(int);
+        void toggled();
 
-class KxkbSystemTray : public KSystemTray
-{
-	TQ_OBJECT 
-			
-	public:
-	KxkbSystemTray():
-		KSystemTray(NULL)
-	{}
-	
-	void mouseReleaseEvent(TQMouseEvent *ev)
-	{
-		if (ev->button() == TQt::LeftButton)
-			emit toggled();
-		KSystemTray::mouseReleaseEvent(ev);
-	}
-
-	signals:
- 		void menuActivated(int);
-		void toggled();
+    private:
+        LayoutIconManager *m_icoMgr;
+        int m_prevLayoutCount;
+        TQMap<TQString, TQString> m_descriptionMap;
 };
 
 
diff --git a/kxkb/layoutunit.h b/kxkb/layoutunit.h
new file mode 100644
index 000000000..f4d82f73f
--- /dev/null
+++ b/kxkb/layoutunit.h
@@ -0,0 +1,64 @@
+//
+//
+// Author: Andriy Rysin <rysin@kde.org>, (C) 2006
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+#ifndef _LAYOUTUNIT_H
+#define _LAYOUTUNIT_H
+
+#include <tqstring.h>
+
+inline TQString createPair(TQString key, TQString value)
+{
+	if (value.isEmpty()) return key;
+	return TQString("%1(%2)").arg(key, value);
+}
+
+struct LayoutUnit {
+	TQString layout;
+	TQString variant;
+	TQString displayName;
+
+	LayoutUnit() {}
+
+	LayoutUnit(TQString layout_, TQString variant_):
+		layout(layout_),
+		variant(variant_)
+	{}
+
+	LayoutUnit(TQString pair) {
+		setFromPair( pair );
+	}
+
+	void setFromPair(const TQString& pair) {
+		layout = parseLayout(pair);
+		variant = parseVariant(pair);
+	}
+
+	TQString toPair() const {
+		return createPair(layout, variant);
+	}
+
+	bool operator<(const LayoutUnit& lu) const {
+		return layout<lu.layout ||
+				(layout==lu.layout && variant<lu.variant);
+	}
+
+	bool operator!=(const LayoutUnit& lu) const {
+		return layout!=lu.layout || variant!=lu.variant;
+	}
+
+	bool operator==(const LayoutUnit& lu) const {
+// 		kdDebug() << layout << "==" << lu.layout << "&&" << variant << "==" << lu.variant << endl;
+		return layout==lu.layout && variant==lu.variant;
+	}
+
+//private:
+	static const TQString parseLayout(const TQString &layvar);
+	static const TQString parseVariant(const TQString &layvar);
+};
+
+#endif // _LAYOUTUNIT_H
\ No newline at end of file
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index 63fc4f1db..01866e71e 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -1,11 +1,13 @@
+#include <tqapplication.h>
 #include <tqimage.h>
 #include <tqbitmap.h>
 #include <tqfont.h>
 #include <tqpainter.h>
 #include <tqregexp.h>
 #include <tqdict.h>
+#include <tqdrawutil.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -13,56 +15,42 @@
 #include "pixmap.h"
 #include "x11helper.h"
 
+const TQString LayoutIconManager::flagTemplate("l10n/%1/flag.png");
 
-static const int FLAG_MAX_DIM = 24;
-
-const TQString LayoutIcon::flagTemplate("l10n/%1/flag.png");
-const TQString& LayoutIcon::ERROR_CODE("error");
-LayoutIcon* LayoutIcon::instance;
-
-
-LayoutIcon& LayoutIcon::getInstance() {
-	if( instance == NULL ) {
-		instance = new LayoutIcon();
-	}
-	return *instance;
-}
-
-LayoutIcon::LayoutIcon():
-		m_pixmapCache(80)
+LayoutIconManager::LayoutIconManager(KxkbConfig *kxkbConfig)
+    : m_pixmapCache(80),
+      m_kxkbConfig(kxkbConfig)
 {
 }
 
-const TQPixmap&
-LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& displayName_)
+const TQPixmap& LayoutIconManager::find(const TQString& code_, int pixmapStyle, const TQString& displayName_)
 {
-	m_kxkbConfig.load(KxkbConfig::LOAD_ALL);  // (re)load settings
-
-	if (m_kxkbConfig.m_useThemeColors) { // use colors from color scheme
+	if (m_kxkbConfig->m_useThemeColors) { // use colors from color scheme
 		m_bgColor = TDEGlobalSettings::highlightColor();
 		m_fgColor = TDEGlobalSettings::highlightedTextColor();
 	} else {
-		m_bgColor = m_kxkbConfig.m_colorBackground;
-		m_fgColor = m_kxkbConfig.m_colorLabel;
+		m_bgColor = m_kxkbConfig->m_colorBackground;
+		m_fgColor = m_kxkbConfig->m_colorLabel;
 	}
 
-	m_labelFont = m_kxkbConfig.m_labelFont;
-	m_labelShadow = m_kxkbConfig.m_labelShadow;
-	m_shColor = m_kxkbConfig.m_colorShadow;
-	m_bgTransparent = m_kxkbConfig.m_bgTransparent;
+	m_labelFont = m_kxkbConfig->m_labelFont;
+	m_labelShadow = m_kxkbConfig->m_labelShadow;
+	m_shColor = m_kxkbConfig->m_colorShadow;
+	m_bgTransparent = m_kxkbConfig->m_bgTransparent;
+	m_fitToBox = m_kxkbConfig->m_fitToBox;
+	m_dimFlag = m_kxkbConfig->m_dimFlag;
+	m_bevel = m_kxkbConfig->m_bevel && !m_bgTransparent && pixmapStyle == PIXMAP_STYLE_INDICATOR;
 
 	// Decide on how to style the pixmap
 	switch(pixmapStyle) {
 		case PIXMAP_STYLE_NORMAL:
-			m_fitToBox = true;
 			m_showFlag = true;
 			m_showLabel = false;
 			break;
 
 		case PIXMAP_STYLE_INDICATOR:
-			m_fitToBox = true;
-			m_showFlag = m_kxkbConfig.m_showFlag;
-			m_showLabel = m_kxkbConfig.m_showLabel;
+			m_showFlag = m_kxkbConfig->m_showFlag;
+			m_showLabel = m_kxkbConfig->m_showLabel;
 			break;
 
 		case PIXMAP_STYLE_CONTEXTMENU:
@@ -73,7 +61,7 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
 	}
 
 	// Label only mode is always 'fit to box'
-	if( m_showLabel && !m_showFlag )
+	if (m_showLabel && !m_showFlag)
 		m_fitToBox = true;
 
 	TQPixmap* pm = NULL;
@@ -89,57 +77,92 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
 
 	TQString displayName(displayName_);
 
-	if( displayName.isEmpty() ) {
+	if (displayName.isEmpty()) {
 		displayName = KxkbConfig::getDefaultDisplayName(code_);
 	}
-	if( displayName.length() > 3 )
+	if (displayName.length() > 3)
 		displayName = displayName.left(3);
 
 	const TQString pixmapKey(
-		TQString( m_showFlag ? "f" : "" ) + TQString( m_showLabel ? "l" : "" ) + TQString( m_labelShadow ? "s" : "" ) + "." +
+		TQString(m_showFlag ? "f" : "") + TQString(m_showLabel ? "l" : "") + TQString(m_labelShadow ? "s" : "") + "." +
+		TQString(m_fitToBox ? "F" : "") + TQString(m_dimFlag ? "D" : "") + TQString(m_bevel ? "B" : "") + "." +
 		m_labelFont.key() + "." + ( m_bgTransparent ? "x" : m_bgColor.name() ) + "." + m_fgColor.name() + "." + m_shColor.name() + '.' + code_ + "." + displayName
 	);
 
 	// Only use cache for indicator
-	if( pixmapStyle == PIXMAP_STYLE_INDICATOR ) {
+	if (pixmapStyle == PIXMAP_STYLE_INDICATOR) {
 		pm = m_pixmapCache[pixmapKey];
-		if( pm )
+		if (pm)
 			return *pm;
 	}
 
-	// Need to create new pixmap
-	pm = new TQPixmap();
+	pm = new TQPixmap(FLAG_MAX_DIM, FLAG_MAX_DIM);
 
-	if( m_fitToBox ) // Resize to box size
-		pm->resize(FLAG_MAX_DIM, FLAG_MAX_DIM);
+	TQRect r = pm->rect();
+	TQPainter p_(pm);
 
-	if( m_showFlag ) {
-		TQString countryCode = getCountryFromLayoutName( code_ );
+	if (m_showFlag) {
+		TQString countryCode = getCountryFromLayoutName(code_);
 		TQString flag = locate("locale", flagTemplate.arg(countryCode));
 
-		if( flag.isEmpty() ) {
+		if (flag.isEmpty()) {
 			pm->fill(m_bgColor);
 			m_showLabel = true;
 		} else {
-			if( m_fitToBox ) { // Resize flag
-				TQPainter p_(pm);
-				p_.drawPixmap(TQRect(0, 0, FLAG_MAX_DIM, FLAG_MAX_DIM), flag);
-			} else { // Show the flag as is
-				pm->load(flag);
+			TQPixmap fp(flag);
+
+			if (m_dimFlag && m_showLabel)
+			{
+				TQImage image = fp.convertToImage();
+				for (int y = 0; y < image.height(); y++)
+				{
+					for(int x = 0; x < image.width(); x++)
+					{
+						TQRgb rgb = image.pixel(x,y);
+						TQRgb dimRgb(tqRgb(tqRed(rgb) * 3/4, tqGreen(rgb) * 3/4, tqBlue(rgb) * 3/4));
+						image.setPixel(x, y, dimRgb);
+					}
+				}
+				fp.convertFromImage(image);
+			}
+
+			if (!m_fitToBox)
+			{
+				r = TQRect((FLAG_MAX_DIM - fp.width()) / 2, (FLAG_MAX_DIM - fp.height()) / 2, fp.width(), fp.height());
+			}
+
+			TQRect fr(r); // flag rect might be smaller to accomodate the bevel
+			if (m_bevel)
+			{
+				fr.setX(fr.x() + 1);
+				fr.setY(fr.y() + 1);
+				fr.setWidth(fr.width() - 1);
+				fr.setHeight(fr.height() - 1);
 			}
 
-			if( m_showLabel ) // only dim for label
-				dimPixmap( *pm );
+			p_.drawPixmap(fr, fp);
+
+			// If we don't stretch the flag, we need to apply a mask to it
+			if (!m_fitToBox)
+			{
+				TQPixmap fpmask(FLAG_MAX_DIM, FLAG_MAX_DIM);
+				TQPainter fpmaskp(&fpmask);
+				fpmask.fill(TQt::white);
+				fpmaskp.fillRect(r, TQt::black);
+				TQBitmap fpmask_;
+				fpmask_ = fpmask;
+				pm->setMask((TQBitmap)fpmask_);
+			}
 		}
 	} else {
 		pm->fill(m_bgColor);
 	}
 
-	if( m_showLabel ) {
+	if (m_showLabel) {
 		TQPainter p(pm);
 		p.setFont(m_labelFont);
 
-		if( m_labelShadow ) {
+		if (m_labelShadow) {
 			p.setPen(m_shColor);
 			p.drawText(1, 1, pm->width(), pm->height(), TQt::AlignCenter, displayName);
 		}
@@ -168,8 +191,14 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
 		}
 	}
 
+	if (m_bevel)
+	{
+		TQPainter p_(pm);
+		qDrawShadePanel(&p_, r.x(), r.y(), r.width(), r.height(), tqApp->palette().active(), false, 1, nullptr);
+	}
+
 
-	if( pixmapStyle == PIXMAP_STYLE_INDICATOR )
+	if (pixmapStyle == PIXMAP_STYLE_INDICATOR)
 		m_pixmapCache.insert(pixmapKey, pm);
 
 	return *pm;
@@ -178,7 +207,7 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
 /**
 @brief Try to get country code from layout name in xkb before xorg 6.9.0
 */
-TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
+TQString LayoutIconManager::getCountryFromLayoutName(const TQString& layoutName)
 {
 	TQString flag;
 
@@ -285,24 +314,8 @@ TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
     return flag;
 }
 
-
-void LayoutIcon::dimPixmap(TQPixmap& pm)
-{
-	TQImage image = pm.convertToImage();
-	for (int y=0; y<image.height(); y++)
-		for(int x=0; x<image.width(); x++)
-	{
-		TQRgb rgb = image.pixel(x,y);
-		TQRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4));
-		image.setPixel(x, y, dimRgb);
-	}
-	pm.convertFromImage(image);
-}
-
-static const char* ERROR_LABEL = "err";
-
 //private
-TQPixmap* LayoutIcon::createErrorPixmap()
+TQPixmap* LayoutIconManager::createErrorPixmap()
 {
 	TQPixmap* pm = new TQPixmap(21, 14);
 	pm->fill(TQt::white);
diff --git a/kxkb/pixmap.h b/kxkb/pixmap.h
index a17f48d89..08dee8a87 100644
--- a/kxkb/pixmap.h
+++ b/kxkb/pixmap.h
@@ -8,41 +8,34 @@
 
 #include "kxkbconfig.h"
 
-enum PixmapStyle {
-  PIXMAP_STYLE_NORMAL = 0,
-  PIXMAP_STYLE_INDICATOR = 1,
-  PIXMAP_STYLE_CONTEXTMENU = 2
-};
-
-class LayoutIcon {
+#define ERROR_CODE "error"
+#define ERROR_LABEL "!"
 
-private:
-  static LayoutIcon* instance;
-  static const TQString flagTemplate;
+#define FLAG_MAX_DIM 24
 
-  KxkbConfig m_kxkbConfig;
-  bool m_showFlag;
-  bool m_showLabel;
-  TQColor m_bgColor;
-  bool m_bgTransparent;
-  TQColor m_fgColor;
-  TQFont m_labelFont;
-  bool m_labelShadow;
-  TQColor m_shColor;
-  bool m_fitToBox;
+enum PixmapStyle {
+    PIXMAP_STYLE_NORMAL = 0,
+    PIXMAP_STYLE_INDICATOR = 1,
+    PIXMAP_STYLE_CONTEXTMENU = 2
+};
 
-  TQDict<TQPixmap> m_pixmapCache;
+class LayoutIconManager {
+    public:
+        LayoutIconManager(KxkbConfig *kxkbConfig);
+        const TQPixmap& find(const TQString& code, int pixmapStyle, const TQString& displayName = TQString::null);
 
-  LayoutIcon();
-  TQPixmap* createErrorPixmap();
-  void dimPixmap(TQPixmap& pixmap);
-  TQString getCountryFromLayoutName(const TQString& layoutName);
+    private:
+        TQPixmap* createErrorPixmap();
+        TQString getCountryFromLayoutName(const TQString& layoutName);
 
-public:
-  static const TQString& ERROR_CODE;
+    private:
+        KxkbConfig *m_kxkbConfig;
+        static const TQString flagTemplate;
+        bool m_showFlag, m_showLabel, m_bgTransparent, m_labelShadow, m_fitToBox, m_dimFlag, m_bevel;
+        TQColor m_bgColor, m_fgColor, m_shColor;
+        TQFont m_labelFont;
 
-  static LayoutIcon& getInstance();
-  const TQPixmap& findPixmap(const TQString& code, int pixmapStyle, const TQString& displayName="");
+        TQDict<TQPixmap> m_pixmapCache;
 };
 
 #endif
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 37cdc9bc4..f0f4b38b2 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -5,7 +5,7 @@
 #include <tqstringlist.h>
 #include <tqdir.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -73,3 +73,17 @@ XkbRules::getAvailableVariants(const TQString& layout)
     return *result;
 }
 
+TQString XkbRules::getLayoutName(LayoutUnit layout) const {
+	TQString fullName = i18n(m_layouts[layout.layout]);
+	if (!layout.variant.isEmpty()) {
+		fullName += " (" + layout.variant + ")";
+	}
+	return fullName;
+}
+
+TQString XkbRules::trOpt(TQString opt) {
+    // xkeyboard-config's translation is generated directly from the xml and has some querks
+    // like sustitution for the '<' and '>'. We will have to workaroung those manually:
+    TQString translated = i18n(opt.replace("<", "&lt;").replace(">", "&gt;").utf8());
+    return translated.replace("&lt;", "<").replace("&gt;", ">");
+}
diff --git a/kxkb/rules.h b/kxkb/rules.h
index 38dd40fb6..0a68f3dbf 100644
--- a/kxkb/rules.h
+++ b/kxkb/rules.h
@@ -3,8 +3,10 @@
 
 #include <tqstring.h>
 #include <tqdict.h>
+#include <tqstringlist.h>
 #include <tqmap.h>
 
+#include "layoutunit.h"
 
 class XkbRules
 {
@@ -18,6 +20,11 @@ public:
 
   TQStringList getAvailableVariants(const TQString& layout);
 
+  TQString getLayoutName(LayoutUnit layout) const;
+
+  /// A helper to translate option description
+  static TQString trOpt(TQString opt);
+
 protected:
   void loadRules(TQString filename, bool layoutsOnly=false);
 
diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp
index 2663bf4d4..d325b32a0 100644
--- a/kxkb/x11helper.cpp
+++ b/kxkb/x11helper.cpp
@@ -8,6 +8,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
+#include <tdestandarddirs.h>
+#include <tdelocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -214,25 +216,12 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly) {
 
       // workaround for empty 'compose' options group description
       if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) {
-          rulesInfo->options.replace("compose", "Compose Key Position");
+          rulesInfo->options.replace("compose", I18N_NOOP("Compose Key Position"));
       }
   }
 
 
   for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) {
-      // HACK 2023/06/01 some descriptions in xkb rule files have "< >" in place
-      // of an actual key name, both in *.lst and *.xml files
-      TQString descFix = TQString::null;
-      if (it.currentKey().contains("lsgt_switch")) {
-          descFix = TQString(it.current()).replace("< >", "LSGT");
-      }
-      else if (it.currentKey().startsWith("compose:102")) {
-          descFix = TQString(it.current()).replace("< >", "102");
-      }
-      if (!descFix.isNull()) {
-          rulesInfo->options.replace(it.currentKey(), tqstrdup(descFix.ascii()));
-      }
-
       // Add missing option groups
       TQString option(it.currentKey());
       int columnPos = option.find(":");
@@ -403,3 +392,13 @@ bool X11Helper::areSingleGroupsSupported()
 {
 	return true; //TODO:
 }
+
+void X11Helper::initializeTranslations() {
+    // TDE is usually installed into some non-standard prefix and by default system-wide locale
+    // dirs are not considered when searching for gettext message catalogues, so we have to add
+    // it explicitly.
+#ifdef WITH_XKB_TRANSLATIONS
+    TDEGlobal::dirs()->addResourceDir("locale", XKB_CONFIG_LOCALE_DIR);
+    TDEGlobal::locale()->insertCatalogue("xkeyboard-config");
+#endif
+}
diff --git a/kxkb/x11helper.h b/kxkb/x11helper.h
index 042fb4ce5..8315dc446 100644
--- a/kxkb/x11helper.h
+++ b/kxkb/x11helper.h
@@ -3,6 +3,7 @@
 
 #include <tqdict.h>
 #include <tqstringlist.h>
+#include <tqwindowdefs.h>
 
 
 struct RulesInfo {
@@ -36,6 +37,7 @@ public:
 	
 	static bool areLayoutsClean() { return m_layoutsClean; }
 	static bool areSingleGroupsSupported();
+	static void initializeTranslations();
 };
 
 #endif /*X11HELPER_H_*/
diff --git a/l10n/ar/entry.desktop b/l10n/ar/entry.desktop
index 6ecdbf145..da6b2a7da 100644
--- a/l10n/ar/entry.desktop
+++ b/l10n/ar/entry.desktop
@@ -1,7 +1,7 @@
 [KCM Locale]
 Name=Argentina
 Region=southamerica
-Languages=es
+Languages=es_AR
 DecimalSymbol=,
 ThousandsSeparator=
 CurrencySymbol=$
diff --git a/l10n/bn/entry.desktop b/l10n/bn/entry.desktop
index 906046657..7f6da1a25 100644
--- a/l10n/bn/entry.desktop
+++ b/l10n/bn/entry.desktop
@@ -2,7 +2,7 @@
 # FIXME Which Chinese??
 Name=Brunei Darussalam
 Region=southeastasia
-Languages=ms,zn_CN
+Languages=ms,zh_CN
 #DecimalSymbol=,
 #ThousandsSeparator=
 CurrencySymbol=B$
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index eab4a4479..d0bde9fc3 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -29,8 +29,8 @@
 #include <kdatastream.h> // DO NOT REMOVE, otherwise bool marshalling breaks
 #include <kicontheme.h>
 #include <kimageio.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <tdeio/job.h>
 
 #include "favicons.moc"
@@ -47,7 +47,7 @@ struct FaviconsModulePrivate
     };
     TQMap<TDEIO::Job *, DownloadInfo> downloads;
     TQStringList failedDownloads;
-    KSimpleConfig *config;
+    TDESimpleConfig *config;
     TQPtrList<TDEIO::Job> killJobs;
     TDEIO::MetaData metaData;
     TQString faviconsDir;
@@ -66,7 +66,7 @@ FaviconsModule::FaviconsModule(const TQCString &obj)
     d->metaData.insert("UseCache", "false");
     d->metaData.insert("cookies", "none");
     d->metaData.insert("no-auth", "true");
-    d->config = new KSimpleConfig(locateLocal("data", "konqueror/faviconrc"));
+    d->config = new TDESimpleConfig(locateLocal("data", "konqueror/faviconrc"));
     d->killJobs.setAutoDelete(true);
     d->faviconsCache.setAutoDelete(true);
 }
@@ -186,9 +186,9 @@ void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const
 
     TDEIO::Job *job = TDEIO::get(iconURL, false, false);
     job->addMetaData(d->metaData);
-    connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-    connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
-    connect(job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
+    connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+    connect(job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
     FaviconsModulePrivate::DownloadInfo download;
     download.hostOrURL = hostOrURL;
     download.isHost = isHost;
@@ -202,7 +202,7 @@ void FaviconsModule::slotData(TDEIO::Job *job, const TQByteArray &data)
     if (oldSize > 0x10000)
     {
         d->killJobs.append(job);
-        TQTimer::singleShot(0, this, TQT_SLOT(slotKill()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotKill()));
     }
     download.iconData.resize(oldSize + data.size());
     memcpy(download.iconData.data() + oldSize, data.data(), data.size());
@@ -265,7 +265,7 @@ void FaviconsModule::slotKill()
 }
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_favicons(const TQCString &obj)
+    TDE_EXPORT KDEDModule *create_favicons(const TQCString &obj)
     {
         KImageIO::registerFormats();
         return new FaviconsModule(obj);
diff --git a/libkonq/kivdirectoryoverlay.cpp b/libkonq/kivdirectoryoverlay.cpp
index bb1b0d6c2..a9e780134 100644
--- a/libkonq/kivdirectoryoverlay.cpp
+++ b/libkonq/kivdirectoryoverlay.cpp
@@ -27,7 +27,7 @@
 #include <tdefileitem.h>
 #include <tdeapplication.h>
 #include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <konq_settings.h>
 #include <tdelocale.h>
@@ -43,8 +43,8 @@ KIVDirectoryOverlay::KIVDirectoryOverlay(KFileIVI* directory)
     {
         m_lister = new KDirLister;
         m_lister->setAutoErrorHandlingEnabled(false, 0);
-        connect(m_lister, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
-        connect(m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(slotNewItems( const KFileItemList& )));
+        connect(m_lister, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted()));
+        connect(m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(slotNewItems( const KFileItemList& )));
         m_lister->setShowingDotFiles(false);
     }
     m_directory = directory;
diff --git a/libkonq/kivfreespaceoverlay.cpp b/libkonq/kivfreespaceoverlay.cpp
index 0343a4ab6..6651a9d53 100644
--- a/libkonq/kivfreespaceoverlay.cpp
+++ b/libkonq/kivfreespaceoverlay.cpp
@@ -32,7 +32,7 @@
 #include <tdefileitem.h>
 #include <tdeapplication.h>
 #include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <konq_settings.h>
 #include <tdelocale.h>
@@ -63,7 +63,7 @@ void KIVFreeSpaceOverlay::start()
     if ( !m_freespace->item()->isReadable() ) {
         emit finished();
     }
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDisplay()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDisplay()));
 }
 
 void KIVFreeSpaceOverlay::timerEvent(TQTimerEvent *)
diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp
index 042bb4e92..1051ba7eb 100644
--- a/libkonq/knewmenu.cpp
+++ b/libkonq/knewmenu.cpp
@@ -20,13 +20,13 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdirwatch.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kinputdialog.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprotocolinfo.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
@@ -145,8 +145,8 @@ void KNewMenu::parseFiles()
             TQString templatePath;
             // If a desktop file, then read the name from it.
             // Otherwise (or if no name in it?) use file name
-            if ( KDesktopFile::isDesktopFile( filePath ) ) {
-                KSimpleConfig config( filePath, true );
+            if ( TDEDesktopFile::isDesktopFile( filePath ) ) {
+                TDESimpleConfig config( filePath, true );
                 config.setDesktopGroup();
                 text = config.readEntry("Name");
                 (*templ).icon = config.readEntry("Icon");
@@ -238,7 +238,7 @@ void KNewMenu::fillMenu()
                 // The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template
                 if ( (*templ).templatePath.endsWith( "emptydir" ) )
                 {
-                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ),
+                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewDir() ),
                                      d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
                     act->setGroup( "KNewMenu" );
                     act->plug( popupMenu() );
@@ -248,7 +248,7 @@ void KNewMenu::fillMenu()
                 }
                 else
                 {
-                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ),
+                    TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewFile() ),
                                              d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) );
                     act->setGroup( "KNewMenu" );
 
@@ -260,9 +260,9 @@ void KNewMenu::fillMenu()
                     {
                         linkApp = act;
                     }
-                    else if ( KDesktopFile::isDesktopFile( entry.templatePath ) )
+                    else if ( TDEDesktopFile::isDesktopFile( entry.templatePath ) )
                     {
-                        KDesktopFile df( entry.templatePath );
+                        TDEDesktopFile df( entry.templatePath );
                         if(df.readType() == "FSDevice")
                             act->plug( d->m_menuDev->popupMenu() );
                         else
@@ -302,12 +302,12 @@ void KNewMenu::slotFillTemplates()
             //kdDebug(1203) << "Templates resource dir: " << *it << endl;
             s_pDirWatch->addDir( *it );
         }
-        connect ( s_pDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
-                  this, TQT_SLOT ( slotFillTemplates() ) );
-        connect ( s_pDirWatch, TQT_SIGNAL( created( const TQString & ) ),
-                  this, TQT_SLOT ( slotFillTemplates() ) );
-        connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
-                  this, TQT_SLOT ( slotFillTemplates() ) );
+        connect ( s_pDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+                  this, TQ_SLOT ( slotFillTemplates() ) );
+        connect ( s_pDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+                  this, TQ_SLOT ( slotFillTemplates() ) );
+        connect ( s_pDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+                  this, TQ_SLOT ( slotFillTemplates() ) );
         // Ok, this doesn't cope with new dirs in TDEDIRS, but that's another story
     }
     s_templatesVersion++;
@@ -333,7 +333,7 @@ void KNewMenu::slotFillTemplates()
                 s_templatesList->prepend( e );
             else
             {
-                KSimpleConfig config( *it, true );
+                TDESimpleConfig config( *it, true );
                 config.setDesktopGroup();
 
                 // tricky solution to ensure that TextFile is at the beginning
@@ -388,9 +388,9 @@ void KNewMenu::slotNewFile()
     }
     m_isURLDesktopFile = false;
     TQString name;
-    if ( KDesktopFile::isDesktopFile( entry.templatePath ) )
+    if ( TDEDesktopFile::isDesktopFile( entry.templatePath ) )
     {
-	KDesktopFile df( entry.templatePath );
+	TDEDesktopFile df( entry.templatePath );
     	//kdDebug(1203) <<  df.readType() << endl;
     	if ( df.readType() == "Link" )
     	{
@@ -468,11 +468,11 @@ void KNewMenu::slotNewFile()
         //kdDebug(1203) << "KNewMenu : TDEIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl;
         TDEIO::CopyJob * job = TDEIO::copyAs( uSrc, dest );
         job->setDefaultPermissions( true );
-        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                TQ_SLOT( slotResult( TDEIO::Job * ) ) );
         if ( m_isURLDesktopFile )
-		connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
-        	     TQT_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
+		connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ),
+        	     TQ_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) );
     	KURL::List lst;
     	lst.append( uSrc );
     	(void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job );
@@ -505,7 +505,7 @@ void KNewMenu::slotResult( TDEIO::Job * job )
                 // destURL is the original destination for the new file.
                 // But in case of a renaming (due to a conflict), the real path is in m_destPath
                 kdDebug(1203) << " destURL=" << destURL.path() << " " << " d->m_destPath=" << d->m_destPath << endl;
-                KDesktopFile df( d->m_destPath );
+                TDEDesktopFile df( d->m_destPath );
                 df.writeEntry( "Icon", KProtocolInfo::icon( KURL(m_linkURL).protocol() ) );
                 df.writePathEntry( "URL", m_linkURL );
                 df.sync();
@@ -549,8 +549,8 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
     label->setBuddy(m_leFileName);  // please "scheck" style
     m_leFileName->setText( defaultName );
     m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
-    connect( m_leFileName, TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(slotNameTextChanged(const TQString&)) );
+    connect( m_leFileName, TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(slotNameTextChanged(const TQString&)) );
 
     // Second line: url
     TQHBox * urlBox = new TQHBox( plainPage() );
@@ -560,13 +560,13 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
     m_urlRequester->setMode( KFile::File | KFile::Directory );
 
     m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
-    connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(slotURLTextChanged(const TQString&)) );
+    connect( m_urlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(slotURLTextChanged(const TQString&)) );
     label->setBuddy(m_urlRequester);  // please "scheck" style
 
     m_urlRequester->setFocus();
     enableButtonOK( !defaultName.isEmpty() && !defaultUrl.isEmpty() );
-    connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) );
+    connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) );
     m_fileNameEdited = false;
 }
 
diff --git a/libkonq/konq_bgnddlg.cpp b/libkonq/konq_bgnddlg.cpp
index f4c0c41a6..53039e908 100644
--- a/libkonq/konq_bgnddlg.cpp
+++ b/libkonq/konq_bgnddlg.cpp
@@ -29,7 +29,7 @@
 #include <kimagefilepreview.h>
 #include <tdelocale.h>
 //#include <tderecentdocument.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurlrequester.h>
 
 #include "konq_bgnddlg.h"
@@ -54,8 +54,8 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     groupLayout->setAlignment( TQt::AlignTop );
     mainLayout->addWidget( m_buttonGroup );
 
-    connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
-             this, TQT_SLOT( slotBackgroundModeChanged() ) );
+    connect( m_buttonGroup, TQ_SIGNAL( clicked(int) ),
+             this, TQ_SLOT( slotBackgroundModeChanged() ) );
 
     // color
     m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
@@ -65,8 +65,8 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
                                 TQSizePolicy::Minimum );
     groupLayout->addWidget( m_buttonColor, 0, 1 );
 
-    connect( m_buttonColor, TQT_SIGNAL( changed( const TQColor& ) ),
-             this, TQT_SLOT( slotColorChanged() ) );
+    connect( m_buttonColor, TQ_SIGNAL( changed( const TQColor& ) ),
+             this, TQ_SLOT( slotColorChanged() ) );
 
     // picture
     m_radioPicture = new TQRadioButton( i18n("&Picture:"), m_buttonGroup );
@@ -75,10 +75,10 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     groupLayout->addMultiCellWidget( m_comboPicture, 1, 1, 1, 2 );
     initPictures();
 
-    connect( m_comboPicture->comboBox(), TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( slotPictureChanged() ) );
-    connect( m_comboPicture, TQT_SIGNAL( urlSelected(const TQString &) ),
-             this, TQT_SLOT( slotPictureChanged() ) );
+    connect( m_comboPicture->comboBox(), TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( slotPictureChanged() ) );
+    connect( m_comboPicture, TQ_SIGNAL( urlSelected(const TQString &) ),
+             this, TQ_SLOT( slotPictureChanged() ) );
 
     TQSpacerItem* spacer1 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding,
                                             TQSizePolicy::Minimum );
diff --git a/libkonq/konq_dirpart.cpp b/libkonq/konq_dirpart.cpp
index 32e6acb7c..2066d9600 100644
--- a/libkonq/konq_dirpart.cpp
+++ b/libkonq/konq_dirpart.cpp
@@ -133,12 +133,12 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
     resetCount();
     //m_bMultipleItemsSelected = false;
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+    connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
 
     actionCollection()->setHighlightingEnabled( true );
 
-    m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
-    m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
+    m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQ_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" );
+    m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQ_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" );
 
     m_paDefaultIcons = new TDERadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" );
     d->aEnormousIcons = new TDERadioAction( i18n( "&Huge" ), 0,
@@ -158,17 +158,17 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
     d->aSmallMediumIcons->setExclusiveGroup( "ViewMode" );
     m_paSmallIcons->setExclusiveGroup( "ViewMode" );
 
-    connect( m_paDefaultIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( d->aEnormousIcons, TQT_SIGNAL( toggled( bool ) ),
-	    this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paHugeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paLargeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paMediumIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( d->aSmallMediumIcons, TQT_SIGNAL( toggled( bool ) ),
-	    this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-    connect( m_paSmallIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) );
-
-    connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
+    connect( m_paDefaultIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( d->aEnormousIcons, TQ_SIGNAL( toggled( bool ) ),
+	    this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paHugeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paLargeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paMediumIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( d->aSmallMediumIcons, TQ_SIGNAL( toggled( bool ) ),
+	    this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+    connect( m_paSmallIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) );
+
+    connect( tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
 #if 0
     // Extract 6 icon sizes from the icon theme.
     // Use 16,22,32,48,64,128 as default.
@@ -219,7 +219,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
     m_iIconSize[4] = TDEIcon::SizeHuge;
     // ... up to here
 
-    TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ),
+    TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQ_SLOT( slotBackgroundSettings() ),
                               actionCollection(), "bgsettings" );
 
     a->setToolTip( i18n( "Allows choosing of background settings for this view" ) );
@@ -665,25 +665,25 @@ void KonqDirPart::setFindPart( KParts::ReadOnlyPart * part )
 {
     assert(part);
     m_findPart = part;
-    connect( m_findPart, TQT_SIGNAL( started() ),
-             this, TQT_SLOT( slotStarted() ) );
-    connect( m_findPart, TQT_SIGNAL( started() ),
-             this, TQT_SLOT( slotStartAnimationSearching() ) );
-    connect( m_findPart, TQT_SIGNAL( clear() ),
-             this, TQT_SLOT( slotClear() ) );
-    connect( m_findPart, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-             this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-    connect( m_findPart, TQT_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
-             this, TQT_SLOT( slotCompleted() ) );
-    connect( m_findPart, TQT_SIGNAL( finished() ),
-             this, TQT_SLOT( slotStopAnimationSearching() ) );
-    connect( m_findPart, TQT_SIGNAL( canceled() ),
-             this, TQT_SLOT( slotCanceled() ) );
-    connect( m_findPart, TQT_SIGNAL( canceled() ),
-             this, TQT_SLOT( slotStopAnimationSearching() ) );
-
-    connect( m_findPart, TQT_SIGNAL( findClosed() ),
-             this, TQT_SLOT( slotFindClosed() ) );
+    connect( m_findPart, TQ_SIGNAL( started() ),
+             this, TQ_SLOT( slotStarted() ) );
+    connect( m_findPart, TQ_SIGNAL( started() ),
+             this, TQ_SLOT( slotStartAnimationSearching() ) );
+    connect( m_findPart, TQ_SIGNAL( clear() ),
+             this, TQ_SLOT( slotClear() ) );
+    connect( m_findPart, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+             this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+    connect( m_findPart, TQ_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal
+             this, TQ_SLOT( slotCompleted() ) );
+    connect( m_findPart, TQ_SIGNAL( finished() ),
+             this, TQ_SLOT( slotStopAnimationSearching() ) );
+    connect( m_findPart, TQ_SIGNAL( canceled() ),
+             this, TQ_SLOT( slotCanceled() ) );
+    connect( m_findPart, TQ_SIGNAL( canceled() ),
+             this, TQ_SLOT( slotStopAnimationSearching() ) );
+
+    connect( m_findPart, TQ_SIGNAL( findClosed() ),
+             this, TQ_SLOT( slotFindClosed() ) );
 
     emit findOpened( this );
 
diff --git a/libkonq/konq_faviconmgr.cpp b/libkonq/konq_faviconmgr.cpp
index c5c828ec0..411d680f9 100644
--- a/libkonq/konq_faviconmgr.cpp
+++ b/libkonq/konq_faviconmgr.cpp
@@ -44,7 +44,7 @@ void KonqFavIconMgr::setIconForURL(const KURL &url, const KURL &iconURL)
     TQByteArray data;
     TQDataStream str(data, IO_WriteOnly);
     str << url << iconURL;
-    kapp->dcopClient()->send("kded", "favicons", "setIconForURL(KURL, KURL)", data);
+    tdeApp->dcopClient()->send("kded", "favicons", "setIconForURL(KURL, KURL)", data);
 }
 
 void KonqFavIconMgr::downloadHostIcon(const KURL &url)
@@ -52,6 +52,6 @@ void KonqFavIconMgr::downloadHostIcon(const KURL &url)
     TQByteArray data;
     TQDataStream str(data, IO_WriteOnly);
     str << url;
-    kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
+    tdeApp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
 }
 
diff --git a/libkonq/konq_filetip.cpp b/libkonq/konq_filetip.cpp
index 8ad1e0d6f..b70a3158c 100644
--- a/libkonq/konq_filetip.cpp
+++ b/libkonq/konq_filetip.cpp
@@ -23,7 +23,7 @@
 
 #include <tdefileitem.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 
 #include <tqlabel.h>
@@ -114,7 +114,7 @@ void KonqFileTip::setItem( KFileItem *item, const TQRect &rect, const TQPixmap *
         // Don't start immediately, because the user could move the mouse over another item
         // This avoids a quick sequence of started preview-jobs
         m_timer->disconnect( this );
-        connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed()));
+        connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDelayed()));
         m_timer->start( 300, true );
     }
 }
@@ -217,12 +217,12 @@ void KonqFileTip::setFilter( bool enable )
     if ( enable == m_filter ) return;
 
     if ( enable ) {
-        kapp->installEventFilter( this );
+        tdeApp->installEventFilter( this );
         TQApplication::setGlobalMouseTracking( true );
     }
     else {
         TQApplication::setGlobalMouseTracking( false );
-        kapp->removeEventFilter( this );
+        tdeApp->removeEventFilter( this );
     }
     m_filter = enable;
 }
@@ -234,7 +234,7 @@ void KonqFileTip::showTip()
     if ( text.isEmpty() ) return;
 
     m_timer->disconnect( this );
-    connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip()));
+    connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideTip()));
     m_timer->start( 15000, true );
 
     m_textLabel->setText( text );
@@ -261,14 +261,14 @@ void KonqFileTip::startDelayed()
         oneItem.append( m_item );
 
         m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
-        connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
-                 this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
-        connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                 this, TQT_SLOT( gotPreviewResult() ) );
+        connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+                 this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
+        connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                 this, TQ_SLOT( gotPreviewResult() ) );
     }
 
     m_timer->disconnect( this );
-    connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip()));
+    connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showTip()));
     m_timer->start( 400, true );
 }
 
diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp
index 25cfef345..7ee04f170 100644
--- a/libkonq/konq_historymgr.cpp
+++ b/libkonq/konq_historymgr.cpp
@@ -24,8 +24,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksavefile.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 #include <zlib.h>
 
@@ -50,8 +50,8 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
     m_filename = locateLocal( "data",
 			      TQString::fromLatin1("konqueror/konq_history" ));
 
-    if ( !kapp->dcopClient()->isAttached() )
-	kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+	tdeApp->dcopClient()->attach();
 
 
     // take care of the completion object
@@ -61,7 +61,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
     // and load the history
     loadHistory();
 
-    connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotEmitUpdated() ));
+    connect( m_updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotEmitUpdated() ));
 }
 
 
@@ -355,7 +355,7 @@ void KonqHistoryManager::emitAddToHistory( const KonqHistoryEntry& entry )
     // Protection against very long urls (like data:)
     if ( data.size() > 4096 )
         return;
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyHistoryEntry(KonqHistoryEntry, TQCString)",
 			      data );
 }
@@ -397,7 +397,7 @@ void KonqHistoryManager::emitRemoveFromHistory( const KURL& url )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << url << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyRemove(KURL, TQCString)", data );
 }
 
@@ -406,7 +406,7 @@ void KonqHistoryManager::emitRemoveFromHistory( const KURL::List& urls )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << urls << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyRemove(KURL::List, TQCString)", data );
 }
 
@@ -415,7 +415,7 @@ void KonqHistoryManager::emitClear()
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyClear(TQCString)", data );
 }
 
@@ -424,7 +424,7 @@ void KonqHistoryManager::emitSetMaxCount( TQ_UINT32 count )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << count << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxCount(TQ_UINT32, TQCString)", data );
 }
 
@@ -433,7 +433,7 @@ void KonqHistoryManager::emitSetMaxAge( TQ_UINT32 days )
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << days << objId();
-    kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+    tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
 			      "notifyMaxAge(TQ_UINT32, TQCString)", data );
 }
 
@@ -594,7 +594,7 @@ bool KonqHistoryManager::loadFallback()
 	return false;
 
     KonqHistoryEntry *entry;
-    KSimpleConfig config( file );
+    TDESimpleConfig config( file );
     config.setGroup("History");
     TQStringList items = config.readListEntry( "CompletionItems" );
     TQStringList::Iterator it = items.begin();
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 6022f1850..226a34413 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -45,7 +45,7 @@
 #include <kicontheme.h>
 #include <kiconeffect.h>
 #include <kurldrag.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kprotocolinfo.h>
 #include <ktrader.h>
 
@@ -121,17 +121,17 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
       m_bSetGridX( !kdesktop ) /* No line breaking on the desktop */
 {
     d = new KonqIconViewWidgetPrivate;
-    connect( this, TQT_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
-             this, TQT_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) );
+    connect( this, TQ_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ),
+             this, TQ_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) );
 
-    connect( this, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
+    connect( this, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
 
-    kapp->addKipcEventMask( KIPC::IconChanged );
-    connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) );
-    connect( this, TQT_SIGNAL(onItem(TQIconViewItem *)), TQT_SLOT(slotOnItem(TQIconViewItem *)) );
-    connect( this, TQT_SIGNAL(onViewport()), TQT_SLOT(slotOnViewport()) );
-    connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+    tdeApp->addKipcEventMask( KIPC::IconChanged );
+    connect( tdeApp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) );
+    connect( this, TQ_SIGNAL(onItem(TQIconViewItem *)), TQ_SLOT(slotOnItem(TQIconViewItem *)) );
+    connect( this, TQ_SIGNAL(onViewport()), TQ_SLOT(slotOnViewport()) );
+    connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
 
     m_pSettings = KonqFMSettings::settings();  // already needed in setItemTextPos(), calculateGridX()
     d->bBoostPreview = boostPreview();
@@ -284,7 +284,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
                     else {
                         kdDebug(1203) << "we go ahead.." << endl;
                         d->m_movieBlocked++;
-                        TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
+                        TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation()));
                         d->m_movie->restart();
                         d->m_movie->unpause();
                     }
@@ -307,8 +307,8 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
                         }
                         if (!hasPixmap && backgroundMode() != NoBackground)
                            d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
-                        d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) );
-                        d->m_movie->connectStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
+                        d->m_movie->connectUpdate( this, TQ_SLOT( slotMovieUpdate(const TQRect &) ) );
+                        d->m_movie->connectStatus( this, TQ_SLOT( slotMovieStatus(int) ) );
                         d->movieFileName = d->pActiveItem->mouseOverAnimation();
                         d->pActiveItem->setAnimated( true );
                     }
@@ -349,14 +349,14 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
         d->pSoundPlayer->mimeTypes().contains(
             item->item()->mimetype())
         && TDEGlobalSettings::showFilePreview(item->item()->url())
-        && topLevelWidget() == kapp->activeWindow())
+        && topLevelWidget() == tdeApp->activeWindow())
     {
         d->pSoundItem = item;
         d->bSoundItemClicked = false;
         if (!d->pSoundTimer)
         {
             d->pSoundTimer = new TQTimer(this);
-            connect(d->pSoundTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartSoundPreview()));
+            connect(d->pSoundTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartSoundPreview()));
         }
         if (d->pSoundTimer->isActive())
             d->pSoundTimer->stop();
@@ -394,7 +394,7 @@ void KonqIconViewWidget::slotOnViewport()
             d->m_movie->pause();
             d->m_movieBlocked++;
             kdDebug(1203) << "on viewport, blocking" << endl;
-            TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation()));
+            TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation()));
         }
 #endif
         d->pActiveItem->refreshIcon( true );
@@ -840,7 +840,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
       KLibFactory *factory = KLibLoader::self()->factory("konq_sound");
       if (factory)
         d->pSoundPlayer = static_cast<KonqSoundPlayer *>(
-          factory->create(TQT_TQOBJECT(this), 0, "KonqSoundPlayer"));
+          factory->create(this, 0, "KonqSoundPlayer"));
       d->bSoundPreviews = (d->pSoundPlayer != 0L);
     }
 
@@ -874,10 +874,10 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
     d->pPreviewJob = TDEIO::filePreview( items, size, size, iconSize,
         m_pSettings->textPreviewIconTransparency(), true /* scale */,
         true /* save */, &(d->previewSettings) );
-    connect( d->pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
-             this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
-    connect( d->pPreviewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             this, TQT_SLOT( slotPreviewResult() ) );
+    connect( d->pPreviewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+             this, TQ_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) );
+    connect( d->pPreviewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQ_SLOT( slotPreviewResult() ) );
 }
 
 void KonqIconViewWidget::stopImagePreview()
@@ -1386,7 +1386,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
              if (!d->pActivateDoubleClick)
              {
                  d->pActivateDoubleClick = new TQTimer(this);
-                 connect(d->pActivateDoubleClick, TQT_SIGNAL(timeout()), this, TQT_SLOT(doubleClickTimeout()));
+                 connect(d->pActivateDoubleClick, TQ_SIGNAL(timeout()), this, TQ_SLOT(doubleClickTimeout()));
              }
              if( d->pActivateDoubleClick->isActive () )
                  d->pActivateDoubleClick->stop();
@@ -1433,7 +1433,7 @@ void KonqIconViewWidget::slotSaveIconPositions()
   if ( !m_bDesktop )
     return; // Currently not available in Konqueror
   kdDebug(1214) << "KonqIconViewWidget::slotSaveIconPositions" << endl;
-  KSimpleConfig dotDirectory( m_dotDirectoryPath );
+  TDESimpleConfig dotDirectory( m_dotDirectoryPath );
   TQIconViewItem *it = firstItem();
   if ( !it )
     return; // No more icons. Maybe we're closing and they've been removed already
@@ -1502,7 +1502,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item)
 
     TQMemArray<TQRect> rects = r.rects();
     TQMemArray<TQRect>::Iterator it = rects.begin();
-    bool foundPlace = FALSE;
+    bool foundPlace = false;
     for (; it != rects.end(); ++it)
     {
         TQRect rect = *it;
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index 9f00e3aee..75e3c1f37 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -56,7 +56,7 @@ public:
     /**
      * Constructor
      */
-    KonqIconViewWidget( TQWidget *parent = 0L, const char *name = 0L, WFlags f = 0, bool kdesktop = FALSE );
+    KonqIconViewWidget( TQWidget *parent = 0L, const char *name = 0L, WFlags f = 0, bool kdesktop = false );
     virtual ~KonqIconViewWidget();
 
     /**
diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp
index 0761fe246..7c715d084 100644
--- a/libkonq/konq_operations.cpp
+++ b/libkonq/konq_operations.cpp
@@ -42,7 +42,7 @@
 #include <kipc.h>
 #include <kdebug.h>
 #include <tdefileitem.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kurldrag.h>
 #include <tdeglobalsettings.h>
 #include <kimageio.h>
@@ -54,7 +54,7 @@
 #include <konq_drag.h>
 #include <konq_iconviewwidget.h>
 #include <kprotocolinfo.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kstringhandler.h>
 #include <tqpopupmenu.h>
 #include <unistd.h>
@@ -221,8 +221,8 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
             delete this;
             return;
         }
-        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                 TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                 TQ_SLOT( slotResult( TDEIO::Job * ) ) );
     } else
         delete this;
 }
@@ -231,8 +231,8 @@ void KonqOperations::_restoreTrashedItems( const KURL::List& urls )
 {
     m_method = RESTORE;
     KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget )
@@ -296,7 +296,7 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int
       if (!keyName.isEmpty())
       {
          // Check kmessagebox setting... erase & copy to konquerorrc.
-         TDEConfig *config = kapp->config();
+         TDEConfig *config = tdeApp->config();
          TDEConfigGroupSaver saver(config, "Notification Messages");
          if (!config->readBoolEntry(keyName, true))
          {
@@ -376,7 +376,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, TQDr
         else
         {
             // we need to stat to get it.
-            op->_statURL( dest, op, TQT_SLOT( asyncDrop( const KFileItem * ) ) );
+            op->_statURL( dest, op, TQ_SLOT( asyncDrop( const KFileItem * ) ) );
         }
         // In both cases asyncDrop will delete op when done
 
@@ -428,7 +428,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
       || (destItem->mimetype() == "media/builtin-webbrowser") )
     {
         // Local .desktop file. What type ?
-        KDesktopFile desktopFile( m_destURL.path() );
+        TDEDesktopFile desktopFile( m_destURL.path() );
         if ( desktopFile.hasApplicationType() )
         {
             TQString error;
@@ -458,7 +458,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem )
                     bool ro = desktopFile.readBoolEntry( "ReadOnly", false );
                     TQString fstype = desktopFile.readEntry( "FSType" );
                     KAutoMount* am = new KAutoMount( ro, fstype, dev, point, m_destURL.path(), false );
-                    connect( am, TQT_SIGNAL( finished() ), this, TQT_SLOT( doFileCopy() ) );
+                    connect( am, TQ_SIGNAL( finished() ), this, TQ_SLOT( doFileCopy() ) );
                 }
                 return;
             }
@@ -503,7 +503,7 @@ void KonqOperations::doFileCopy()
         bool local = (*it).isLocalFile();
         if ( KProtocolInfo::supportsDeleting( *it ) && (!local || TQFileInfo((*it).directory()).isWritable() ))
             mlst.append(*it);
-        if ( local && KDesktopFile::isDesktopFile((*it).path()))
+        if ( local && TDEDesktopFile::isDesktopFile((*it).path()))
             isDesktopFile = true;
         if ( local && (*it).path().startsWith(TDEGlobalSettings::desktopPath()))
             itemIsOnDesktop = true;
@@ -512,7 +512,7 @@ void KonqOperations::doFileCopy()
     }
 
     bool linkOnly = false;
-    if (isDesktopFile && !kapp->authorize("run_desktop_files") &&
+    if (isDesktopFile && !tdeApp->authorize("run_desktop_files") &&
         (m_destURL.path(1) == TDEGlobalSettings::desktopPath()) )
     {
        linkOnly = true;
@@ -520,7 +520,7 @@ void KonqOperations::doFileCopy()
 
     if ( !mlst.isEmpty() && m_destURL.protocol() == "trash" )
     {
-        if ( itemIsOnDesktop && !kapp->authorize("editable_desktop_icons") )
+        if ( itemIsOnDesktop && !tdeApp->authorize("editable_desktop_icons") )
         {
             delete this;
             return;
@@ -658,16 +658,16 @@ void KonqOperations::setOperation( TDEIO::Job * job, int method, const KURL::Lis
     m_destURL = dest;
     if ( job )
     {
-        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-                 TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+        connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+                 TQ_SLOT( slotResult( TDEIO::Job * ) ) );
         TDEIO::CopyJob *copyJob = dynamic_cast<TDEIO::CopyJob*>(job);
         KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
         if (copyJob && iconView)
         {
-            connect(copyJob, TQT_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),
-                 this, TQT_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)));
-            connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)),
-                 iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)));
+            connect(copyJob, TQ_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)),
+                 this, TQ_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)));
+            connect(this, TQ_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)),
+                 iconView, TQ_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)));
         }
     }
     else // for link
@@ -688,10 +688,10 @@ void KonqOperations::statURL( const KURL & url, const TQObject *receiver, const
 
 void KonqOperations::_statURL( const KURL & url, const TQObject *receiver, const char *member )
 {
-    connect( this, TQT_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
+    connect( this, TQ_SIGNAL( statFinished( const KFileItem * ) ), receiver, member );
     TDEIO::StatJob * job = TDEIO::stat( url /*, false?*/ );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotStatResult( TDEIO::Job * ) ) );
 }
 
 void KonqOperations::slotStatResult( TDEIO::Job * job )
@@ -763,7 +763,7 @@ KonqMultiRestoreJob::KonqMultiRestoreJob( const KURL::List& urls, bool showProgr
       m_urls( urls ), m_urlsIterator( m_urls.begin() ),
       m_progress( 0 )
 {
-  TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
 }
 
 void KonqMultiRestoreJob::slotStart()
diff --git a/libkonq/konq_pixmapprovider.cpp b/libkonq/konq_pixmapprovider.cpp
index 20a740eb4..e560cc63c 100644
--- a/libkonq/konq_pixmapprovider.cpp
+++ b/libkonq/konq_pixmapprovider.cpp
@@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L;
 KonqPixmapProvider * KonqPixmapProvider::self()
 {
     if ( !s_self )
-	s_self = new KonqPixmapProvider( TQT_TQOBJECT(kapp), "KonqPixmapProvider" );
+	s_self = new KonqPixmapProvider( tdeApp, "KonqPixmapProvider" );
 
     return s_self;
 }
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index fa096a239..4ed65e189 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kxmlguifactory.h>
 #include <kxmlguibuilder.h>
 #include <tdeparts/componentfactory.h>
@@ -38,7 +38,7 @@
 #include <assert.h>
 
 #include <tdefileshare.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include "kpropertiesdialog.h"
 #include "knewmenu.h"
@@ -287,7 +287,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
             name.setNum( id );
             name.prepend( isBuiltin ? "builtinservice_" : "userservice_" );
             TDEAction * act = new TDEAction( TQString((*it).m_strName).replace('&',"&&"), 0,
-                                         TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
+                                         this, TQ_SLOT( slotRunService() ),
                                          &m_ownActions, name );
 
             if ( !(*it).m_strIcon.isEmpty() )
@@ -314,13 +314,13 @@ bool KonqPopupMenu::KIOSKAuthorizedAction(TDEConfig& cfg)
     }
 
     TQStringList list = cfg.readListEntry("X-TDE-AuthorizeAction");
-    if (kapp && !list.isEmpty())
+    if (tdeApp && !list.isEmpty())
     {
         for(TQStringList::ConstIterator it = list.begin();
             it != list.end();
             ++it)
         {
-            if (!kapp->authorize((*it).stripWhiteSpace()))
+            if (!tdeApp->authorize((*it).stripWhiteSpace()))
             {
                 return false;
             }
@@ -430,10 +430,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         d->localURLSlotFired = false;
         TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL);
         if (localURLJob) {
-            connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
-            connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
+            connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
+            connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed()));
             while (!d->localURLSlotFired) {
-                kapp->eventLoop()->enterLoop();
+                tdeApp->eventLoop()->enterLoop();
             }
             if (d->localURLResultIsLocal) {
                 realURL = d->localURLResultURL;
@@ -459,7 +459,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                       || (m_sMimeType == "media/builtin-printers")
                       || (m_sMimeType == "media/builtin-trash")
                       || (m_sMimeType == "media/builtin-webbrowser")) ) {
-            KSimpleConfig cfg( firstPopupURL.path(), true );
+            TDESimpleConfig cfg( firstPopupURL.path(), true );
             cfg.setDesktopGroup();
             isTrashLink = ( cfg.readEntry("Type") == "Link" && cfg.readEntry("URL") == "trash:/" );
         }
@@ -488,10 +488,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     if (!isCurrentTrash)
         addMerge( "konqueror" );
 
-    bool isKDesktop = TQCString( kapp->name() ) == "kdesktop";
+    bool isKDesktop = TQCString( tdeApp->name() ) == "kdesktop";
 
     if (( kpf & ShowProperties ) && isKDesktop &&
-        !kapp->authorize("editable_desktop_icons"))
+        !tdeApp->authorize("editable_desktop_icons"))
     {
         kpf &= ~ShowProperties; // remove flag
     }
@@ -501,7 +501,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     if ( ((kpf & ShowNewWindow) != 0) && sReading  && !isEncryptedMediaFile)
     {
         TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
-        TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
+        TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQ_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
         actNewWindow->setToolTip( i18n( "Open item in a new window" ) );
         addAction( actNewWindow );
         addSeparator();
@@ -523,14 +523,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         {
             if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
             {
-                TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
+                TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQ_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
                 addAction( actNewDir );
                 addSeparator();
             }
         }
     } else if ( isIntoTrash ) {
         // Trashed item, offer restoring
-        act = new TDEAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
+        act = new TDEAction( i18n( "&Restore" ), 0, this, TQ_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
         addAction( act );
     }
 
@@ -584,7 +584,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     addDel = true;
                 }
                 else {
-                    TDEConfigGroup configGroup( kapp->config(), "KDE" );
+                    TDEConfigGroup configGroup( tdeApp->config(), "KDE" );
                     if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) )
                         addDel = true;
                 }
@@ -598,8 +598,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     }
     if ( isCurrentTrash )
     {
-        act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
-        KSimpleConfig trashConfig( "trashrc", true );
+        act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQ_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
+        TDESimpleConfig trashConfig( "trashrc", true );
         trashConfig.setGroup( "Status" );
         act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
         addAction( act );
@@ -631,10 +631,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         else
            caption = i18n("&Bookmark This File");
 
-        act = new TDEAction( caption, "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
+        act = new TDEAction( caption, "bookmark_add", 0, this, TQ_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
         if (m_lstItems.count() > 1)
             act->setEnabled(false);
-        if (kapp->authorizeTDEAction("bookmarks"))
+        if (tdeApp->authorizeTDEAction("bookmarks"))
             addAction( act );
         if (bIsLink)
             addGroup( "linkactions" );
@@ -662,7 +662,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         // get builtin services, like mount/unmount
         s.builtin = KDEDesktopMimeType::builtinServices( urlForServiceMenu );
         const TQString path = urlForServiceMenu.path();
-        KSimpleConfig cfg( path, true );
+        TDESimpleConfig cfg( path, true );
         cfg.setDesktopGroup();
         const TQString priority = cfg.readEntry("X-TDE-Priority");
         const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
@@ -684,7 +684,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         if (isDirectory && isSingleLocal)
         {
             TQString dotDirectoryFile = urlForServiceMenu.path(1).append(".directory");
-            KSimpleConfig cfg( dotDirectoryFile, true );
+            TDESimpleConfig cfg( dotDirectoryFile, true );
             cfg.setDesktopGroup();
 
             if (KIOSKAuthorizedAction(cfg))
@@ -704,7 +704,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         const TQStringList::ConstIterator eEnd = entries.end();
         for (; eIt != eEnd; ++eIt )
         {
-            KSimpleConfig cfg( *eIt, true );
+            TDESimpleConfig cfg( *eIt, true );
             cfg.setDesktopGroup();
 
             if (!KIOSKAuthorizedAction(cfg))
@@ -715,7 +715,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             if ( cfg.hasKey( "X-TDE-ShowIfRunning" ) )
             {
                 const TQString app = cfg.readEntry( "X-TDE-ShowIfRunning" );
-                if ( !kapp->dcopClient()->isApplicationRegistered( app.utf8() ) )
+                if ( !tdeApp->dcopClient()->isApplicationRegistered( app.utf8() ) )
                     continue;
             }
             if ( cfg.hasKey( "X-TDE-ShowIfDcopCall" ) )
@@ -723,7 +723,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 TQString dcopcall = cfg.readEntry( "X-TDE-ShowIfDcopCall" );
                 const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8();
 
-                //if( !kapp->dcopClient()->isApplicationRegistered( app ))
+                //if( !tdeApp->dcopClient()->isApplicationRegistered( app ))
                 //	continue; //app does not exist so cannot send call
 
                 TQByteArray dataToSend;
@@ -739,7 +739,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     continue; //Be safe.
                 }
 
-                if(!kapp->dcopClient()->call( app, object,
+                if(!tdeApp->dcopClient()->call( app, object,
                                               function.utf8(),
                                               dataToSend, replyType, replyData, true, 1000))
                     continue;
@@ -839,7 +839,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
         TDETrader::OfferList offers;
 
-        if (kapp->authorizeTDEAction("openwith"))
+        if (tdeApp->authorizeTDEAction("openwith"))
         {
             TQString constraint = "Type == 'Application' and DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'";
             TQString subConstraint = " and '%1' in ServiceTypes";
@@ -915,7 +915,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                         actionName = i18n( "Open with %1" ).arg( actionName );
 
                     act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
-                                       TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
+                                       this, TQ_SLOT( slotRunService() ),
                                        &m_ownActions, nam.prepend( "appservice_" ) );
                     addAction( act, menu );
 
@@ -932,12 +932,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 {
                     openWithActionName = i18n( "&Open With..." );
                 }
-                TDEAction *openWithAct = new TDEAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+                TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
                 addAction( openWithAct, menu );
             }
             else // no app offers -> Open With...
             {
-                act = new TDEAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+                act = new TDEAction( i18n( "&Open With..." ), 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
                 addAction( act );
             }
 
@@ -991,7 +991,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
     if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
     {
-        act = new TDEAction( i18n( "&Properties" ), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ),
+        act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQ_SLOT( slotPopupProperties() ),
                            &m_ownActions, "properties" );
         addAction( act );
     }
@@ -1005,7 +1005,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         if ( KFileShare::authorization() == KFileShare::Authorized )
         {
             addSeparator();
-            act = new TDEAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ),
+            act = new TDEAction( i18n("Share"), 0, this, TQ_SLOT( slotOpenShareFileDialog() ),
                                &m_ownActions, "sharefile" );
             addAction( act );
         }
@@ -1185,7 +1185,7 @@ void KonqPopupMenu::addPlugins()
         KonqPopupMenuPlugin *plugin =
             KParts::ComponentFactory::
             createInstanceFromLibrary<KonqPopupMenuPlugin>( TQFile::encodeName( (*iterator)->library() ),
-                                                            TQT_TQOBJECT(this),
+                                                            this,
                                                             (*iterator)->name().latin1() );
         if ( !plugin )
             continue;
@@ -1221,7 +1221,7 @@ void KonqPopupMenu::slotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool
   d->localURLSlotFired = true;
   d->localURLResultURL = url;
   d->localURLResultIsLocal = isLocal;
-  kapp->eventLoop()->exitLoop();
+  tdeApp->eventLoop()->exitLoop();
 }
 
 void KonqPopupMenu::slotLocalURLKIODestroyed()
@@ -1230,7 +1230,7 @@ void KonqPopupMenu::slotLocalURLKIODestroyed()
     d->localURLSlotFired = true;
     d->localURLResultURL = KURL();
     d->localURLResultIsLocal = false;
-    kapp->eventLoop()->exitLoop();
+    tdeApp->eventLoop()->exitLoop();
   }
 }
 
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index d50142c2f..d4c956029 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -79,7 +79,7 @@ public:
                  KURL viewURL,
                  TDEActionCollection & actions,
                  KNewMenu * newMenu,
-                 bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
+                 bool showPropertiesAndFileType = true ) TDE_DEPRECATED;
 
   /**
    * @deprecated uses bool instead of KonqPopupFlags enum,
@@ -91,7 +91,7 @@ public:
                  TDEActionCollection & actions,
                  KNewMenu * newMenu,
 		 TQWidget * parentWidget,
-		 bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
+		 bool showPropertiesAndFileType = true ) TDE_DEPRECATED;
 
   /**
    * Constructor
diff --git a/libkonq/konq_propsview.cpp b/libkonq/konq_propsview.cpp
index f72aee191..a5acfa1bf 100644
--- a/libkonq/konq_propsview.cpp
+++ b/libkonq/konq_propsview.cpp
@@ -21,7 +21,7 @@
 #include "konq_settings.h"
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kpixmap.h>
 #include <tqpixmapcache.h>
 #include <tqiconview.h>
@@ -29,10 +29,10 @@
 #include <tqfile.h>
 #include <iostream>
 #include <ktrader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <assert.h>
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include "konq_sort_constants.h"
 
@@ -173,7 +173,7 @@ TDEConfigBase * KonqPropsView::currentConfig()
         assert ( !isDefaultProperties() );
 
         if (!dotDirectory.isEmpty())
-            m_currentConfig = new KSimpleConfig( dotDirectory );
+            m_currentConfig = new TDESimpleConfig( dotDirectory );
         // the "else" is when we want to save locally but this is a remote URL -> no save
     }
     return m_currentConfig;
@@ -230,7 +230,7 @@ bool KonqPropsView::enterDir( const KURL & dir )
   if (dotDirExists)
   {
     //kdDebug(1203) << "Found .directory file" << endl;
-    KSimpleConfig * config = new KSimpleConfig( dotDirectory, true );
+    TDESimpleConfig * config = new TDESimpleConfig( dotDirectory, true );
     config->setGroup("URL properties");
 
     m_iIconSize = config->readNumEntry( "IconSize", m_iIconSize );
@@ -290,7 +290,7 @@ void KonqPropsView::setSaveViewPropertiesLocally( bool value )
     //kdDebug(1203) << "KonqPropsView::setSaveViewPropertiesLocally " << value << endl;
 
     if ( m_bSaveViewPropertiesLocally )
-        delete m_currentConfig; // points to a KSimpleConfig
+        delete m_currentConfig; // points to a TDESimpleConfig
 
     m_bSaveViewPropertiesLocally = value;
     m_currentConfig = 0L; // mark as dirty
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index 132c53a55..fff534978 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -36,7 +36,7 @@ class TDEConfig;
  * The class KonqPropsView holds the properties for a Konqueror View
  *
  * Separating them from the view class allows to store the default
- * values (the one read from \<kinstance\>rc) in one instance of this class
+ * values (the one read from \<tdeinstance\>rc) in one instance of this class
  * and to have another instance of this class in each view, storing the
  * current values of the view.
  *
@@ -70,7 +70,7 @@ public:
    * Called when entering a directory
    * Checks for a .directory, read it.
    * Don't do this on the default properties instance
-   * Returns TRUE if the settings for the new directories are
+   * Returns true if the settings for the new directories are
    * different from the settings in the old directory.
    */
   bool enterDir( const KURL & dir );
@@ -172,7 +172,7 @@ private:
   // save-view-properties-locally mode, otherwise to the global config
   // It is set to 0L to mark it as "needs to be constructed".
   // This is to be used for SAVING only.
-  // Can be a TDEConfig or a KSimpleConfig
+  // Can be a TDEConfig or a TDESimpleConfig
   TDEConfigBase * m_currentConfig;
 
   // If this is not a "default properties" instance (but one used by a view)
diff --git a/libkonq/konq_settings.cpp b/libkonq/konq_settings.cpp
index fe61d150a..3334a2eca 100644
--- a/libkonq/konq_settings.cpp
+++ b/libkonq/konq_settings.cpp
@@ -22,7 +22,7 @@
 #include "tdeglobalsettings.h"
 #include <tdeglobal.h>
 #include <kservicetype.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdebug.h>
 #include <assert.h>
 #include <tqfontmetrics.h>
@@ -109,7 +109,7 @@ void KonqFMSettings::init( TDEConfig * config )
       m_iconTransparency = DEFAULT_TEXTPREVIEW_ICONTRANSPARENCY;
 
   // Behaviour
-  m_alwaysNewWin = config->readBoolEntry( "AlwaysNewWin", FALSE );
+  m_alwaysNewWin = config->readBoolEntry( "AlwaysNewWin", false );
 
   m_homeURL = config->readPathEntry("HomeURL", "~");
 
diff --git a/libkonq/konq_sound.cpp b/libkonq/konq_sound.cpp
index 687e9eed2..a2357dd23 100644
--- a/libkonq/konq_sound.cpp
+++ b/libkonq/konq_sound.cpp
@@ -122,13 +122,13 @@ TQObject *KonqSoundFactory::createObject(TQObject *, const char *,
 	const char *className, const TQStringList &)
 {
 	if (qstrcmp(className, "KonqSoundPlayer") == 0)
-		return TQT_TQOBJECT(new KonqSoundPlayerImpl());
+		return new KonqSoundPlayerImpl();
 	return 0;
 }
 
 extern "C"
 {
-	KDE_EXPORT KLibFactory *init_konq_sound()
+	TDE_EXPORT KLibFactory *init_konq_sound()
 	{
 		return new KonqSoundFactory();
 	}
diff --git a/libkonq/konq_undo.cpp b/libkonq/konq_undo.cpp
index 51d85587d..4ecca65fa 100644
--- a/libkonq/konq_undo.cpp
+++ b/libkonq/konq_undo.cpp
@@ -93,14 +93,14 @@ KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List
   d->m_cmd.m_valid = true;
   d->m_cmd.m_src = src;
   d->m_cmd.m_dst = dst;
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 
   if ( op != KonqCommand::MKDIR ) {
-      connect( job, TQT_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ),
-               this, TQT_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
-      connect( job, TQT_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ),
-               this, TQT_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
+      connect( job, TQ_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ),
+               this, TQ_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) );
+      connect( job, TQ_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ),
+               this, TQ_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) );
   }
 
   KonqUndoManager::incRef();
@@ -197,8 +197,8 @@ public:
 KonqUndoManager::KonqUndoManager()
 : DCOPObject( "KonqUndoManager" )
 {
-  if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
+  if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
 
   d = new KonqUndoManagerPrivate;
   d->m_syncronized = initializeFromKDesky();
@@ -411,8 +411,8 @@ void KonqUndoManager::undoStep()
       undoRemovingDirectories();
 
   if ( d->m_currentJob )
-    connect( d->m_currentJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+    connect( d->m_currentJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void KonqUndoManager::undoMakingDirectories()
@@ -625,7 +625,7 @@ bool KonqUndoManager::initializeFromKDesky()
   // ### FIXME: post 2.1
   return false;
 
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
 
   if ( client->appId() == "kdesktop" ) // we are master :)
     return true;
diff --git a/libkonq/konq_xmlguiclient.cpp b/libkonq/konq_xmlguiclient.cpp
index a12d237c6..2352498c1 100644
--- a/libkonq/konq_xmlguiclient.cpp
+++ b/libkonq/konq_xmlguiclient.cpp
@@ -79,7 +79,7 @@ void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
 {
   static const TQString& tagAction = TDEGlobal::staticQString( "action" );
 
-  if (!kapp->authorizeTDEAction(name))
+  if (!tdeApp->authorizeTDEAction(name))
      return;
 
   handlePendingSeparator();
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index 88ff45ced..d2173cd03 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -2,7 +2,7 @@
 #define KONQBOOKMARKMANAGER_H
 
 #include <kbookmarkmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 #include <libkonq_export.h>
@@ -22,7 +22,7 @@ public:
             {
                 TDEIO::file_copy(KURL::fromPathOrURL(globalBookmarkFile),
                                  KURL::fromPathOrURL(bookmarksFile));
-                kapp->processEvents(3000);   // Allows up to 3 seconds to copy the file
+                tdeApp->processEvents(3000);   // Allows up to 3 seconds to copy the file
             }
             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
         }
diff --git a/libkonq/libkonq_export.h b/libkonq/libkonq_export.h
index 4e10a4ec0..f1fe245a7 100644
--- a/libkonq/libkonq_export.h
+++ b/libkonq/libkonq_export.h
@@ -21,18 +21,18 @@
 #ifndef LIBKONQ_EXPORT_H
 #define LIBKONQ_EXPORT_H
 
-/* needed for KDE_EXPORT macros */
-#include <kdemacros.h>
+/* needed for TDE_EXPORT macros */
+#include <tdemacros.h>
 
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
 #include <tqglobal.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 
 #else /* Q_OS_UNIX */
 
 /* export statements for unix */
-#define LIBKONQ_EXPORT KDE_EXPORT
+#define LIBKONQ_EXPORT TDE_EXPORT
 
 #endif
 
diff --git a/libkonq/tdefileivi.cpp b/libkonq/tdefileivi.cpp
index ad2d743a1..02fa748ca 100644
--- a/libkonq/tdefileivi.cpp
+++ b/libkonq/tdefileivi.cpp
@@ -33,7 +33,7 @@
 #include <krun.h>
 #include <kservice.h>
 #include <kmimetype.h> // for KDEDesktopMimeType
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #undef Bool
 
@@ -437,7 +437,7 @@ void KFileIVI::paintItem( TQPainter *p, const TQColorGroup &c )
     /*if ( ( ( KonqIconViewWidget* ) iconView() )->m_pActiveItem == this )
     {
         TQFont f( p->font() );
-        f.setUnderline( TRUE );
+        f.setUnderline( true );
         p->setFont( f );
     }*/
 
@@ -510,7 +510,7 @@ void KFileIVI::paintFontUpdate( TQPainter *p ) const
     if ( m_fileitem->isLink() )
     {
         TQFont f( p->font() );
-        f.setItalic( TRUE );
+        f.setItalic( true );
         p->setFont( f );
     }
 }
diff --git a/libkonq/tdefileivi.h b/libkonq/tdefileivi.h
index 3fb7e3734..7ddb2deb7 100644
--- a/libkonq/tdefileivi.h
+++ b/libkonq/tdefileivi.h
@@ -237,7 +237,7 @@ private:
     /** You are not supposed to call this on a KFileIVI, from the outside,
      * it bypasses the icons cache */
     virtual void setPixmap ( const TQPixmap & icon ) { TDEIconViewItem::setPixmap( icon ); }
-    virtual void setPixmap ( const TQPixmap & icon, bool recalc, bool redraw = TRUE )
+    virtual void setPixmap ( const TQPixmap & icon, bool recalc, bool redraw = true )
         { TDEIconViewItem::setPixmap( icon, recalc, redraw ); }
 
     /** Check if a thumbnail will be generated and calc the size of the icon */
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index da6c5d780..c394afa8f 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -22,7 +22,7 @@
 
 #include <tqregexp.h>
 #include <tqlayout.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 
 #include "plugin_paths.h"
 
@@ -86,7 +86,7 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam
 
 extern "C"
 {
-    KDE_EXPORT void init_nsplugin()
+    TDE_EXPORT void init_nsplugin()
     {
         TDEConfig *config = new TDEConfig("kcmnspluginrc", true /* readonly */, false /* no globals*/);
         config->setGroup("Misc");
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 4a19140b5..80634f72a 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -28,11 +28,11 @@
 
 
 #include <tdeapplication.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
 #include <dcopstub.h>
@@ -69,7 +69,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
     if (cfg.readBoolEntry("demandLoad", false)) {
         _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
         _layout->addWidget(_button, 0, 0);
-        connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin()));
+        connect(_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadPlugin()));
         show();
     } else {
         _button = 0L;
@@ -80,7 +80,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
         // and use 'resize_count' to wait for that one more resize to come (plus a timer
         // for a possible timeout). Only then flash is actually initialized ('inited' is true).
         resize_count = 1;
-        TQTimer::singleShot( 1000, this, TQT_SLOT( doLoadPlugin()));
+        TQTimer::singleShot( 1000, this, TQ_SLOT( doLoadPlugin()));
     }
 }
 
@@ -201,10 +201,10 @@ NSPluginLoader::NSPluginLoader()
   _filetype.setAutoDelete(true);
 
   // trap dcop register events
-  kapp->dcopClient()->setNotifications(true);
-  TQObject::connect(kapp->dcopClient(),
-                   TQT_SIGNAL(applicationRegistered(const TQCString&)),
-                   this, TQT_SLOT(applicationRegistered(const TQCString&)));
+  tdeApp->dcopClient()->setNotifications(true);
+  TQObject::connect(tdeApp->dcopClient(),
+                   TQ_SIGNAL(applicationRegistered(const TQCString&)),
+                   this, TQ_SLOT(applicationRegistered(const TQCString&)));
 
   // load configuration
   TDEConfig cfg("kcmnspluginrc", false);
@@ -272,7 +272,7 @@ void NSPluginLoader::scanPlugins()
           continue;
         }
 
-      TQStringList desc = TQStringList::split(':', line, TRUE);
+      TQStringList desc = TQStringList::split(':', line, true);
       TQString mime = desc[0].stripWhiteSpace();
       TQStringList suffixes = TQStringList::split(',', desc[1].stripWhiteSpace());
       if (!mime.isEmpty())
@@ -337,8 +337,8 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
    int pid = (int)getpid();
    _dcopid.sprintf("nspluginviewer-%d", pid);
 
-   connect( _process, TQT_SIGNAL(processExited(TDEProcess*)),
-            this, TQT_SLOT(processTerminated(TDEProcess*)) );
+   connect( _process, TQ_SIGNAL(processExited(TDEProcess*)),
+            this, TQ_SLOT(processTerminated(TDEProcess*)) );
 
    // find the external viewer process
    TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer");
@@ -376,9 +376,9 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
 
    // wait for the process to run
    int cnt = 0;
-   while (!kapp->dcopClient()->isApplicationRegistered(_dcopid))
+   while (!tdeApp->dcopClient()->isApplicationRegistered(_dcopid))
    {
-       //kapp->processEvents(); // would lead to recursive calls in tdehtml
+       //tdeApp->processEvents(); // would lead to recursive calls in tdehtml
 #ifdef HAVE_USLEEP
        usleep( 50*1000 );
 #else
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 93f4cac7d..500361464 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -217,7 +217,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
     // Only create this if we have no parent since the parent part is
     // responsible for "Save As" then
     if (!parent || !parent->inherits("Part")) {
-        new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument");
+        new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQ_SLOT(saveAs()), actionCollection(), "saveDocument");
         setXMLFile("nspluginpart.rc");
     }
 
@@ -232,8 +232,8 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
     _canvas->setBackgroundMode( TQWidget::NoBackground );
     setWidget(_canvas);
     _canvas->show();
-    TQObject::connect( _canvas, TQT_SIGNAL(resized(int,int)),
-                      this, TQT_SLOT(pluginResized(int,int)) );
+    TQObject::connect( _canvas, TQ_SIGNAL(resized(int,int)),
+                      this, TQ_SLOT(pluginResized(int,int)) );
 }
 
 
@@ -301,7 +301,7 @@ bool PluginPart::openURL(const KURL &url)
     emit setStatusBarText( i18n("Loading Netscape plugin for %1").arg(url.prettyURL()) );
 
     // create plugin widget
-    NSPluginInstance *inst = _loader->newInstance(_canvas, surl, smime, embed, argn, argv, kapp->dcopClient()->appId(), _callback->objId(), reload, post, _extension->urlArgs().postData);
+    NSPluginInstance *inst = _loader->newInstance(_canvas, surl, smime, embed, argn, argv, tdeApp->dcopClient()->appId(), _callback->objId(), reload, post, _extension->urlArgs().postData);
 
     if ( inst ) {
         _widget = inst;
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 8e08178be..8ea6b1ffb 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -43,11 +43,11 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
-#include <kcrash.h>
-#include <kdesktopfile.h>
+#include <tdecrash.h>
+#include <tdedesktopfile.h>
 #include <kservicetype.h>
 #include <kmimetype.h>
 #include <tdecmdlineargs.h>
@@ -112,7 +112,7 @@ TDEConfig *infoConfig = 0;
 
 bool isPluginMimeType( TQString fname )
 {
-    KDesktopFile cfg( fname, true );
+    TDEDesktopFile cfg( fname, true );
     cfg.setDesktopGroup();
     return cfg.hasKey( "X-TDE-nsplugin" );
 }
@@ -415,7 +415,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
                   }
 
                   // write into type cache
-                  TQStringList tokens = TQStringList::split(':', *type, TRUE);
+                  TQStringList tokens = TQStringList::split(':', *type, true);
                   TQStringList::Iterator token;
                   token = tokens.begin();
                   cache << (*token).lower();
@@ -653,7 +653,7 @@ int main( int argc, char **argv )
       printf("90\n"); fflush(stdout);
     }
 
-    DCOPClient *dcc = kapp->dcopClient();
+    DCOPClient *dcc = tdeApp->dcopClient();
     if ( !dcc->isAttached() )
         dcc->attach();
     // Tel kded to update sycoca database.
diff --git a/nsplugins/sdk/jni_md.h b/nsplugins/sdk/jni_md.h
index 58738bbd0..6ab327cd3 100644
--- a/nsplugins/sdk/jni_md.h
+++ b/nsplugins/sdk/jni_md.h
@@ -63,9 +63,9 @@
  * WHAT'S UP WITH THIS FILE?
  * 
  * This is where we define the mystical JNI_PUBLIC_API macro that works on all
- * platforms. If you're running with Visual C++, Symantec C, or Borland's 
+ * platforms. If you're running with Visual C++ or Symantec C
  * development environment on the PC, you're all set. Or if you're on the Mac
- * with Metrowerks, Symantec or MPW with SC you're ok too. For UNIX it shouldn't
+ * with Symantec or MPW with SC you're ok too. For UNIX it shouldn't
  * matter.
 
  * Changes by sailesh on 9/26 
@@ -132,18 +132,6 @@
 #			define JNICALL			        __export
 #                   endif /* !WINDLL */
 #		endif /* !_WIN32 */
-#	elif defined(__BORLANDC__)
-#		if defined(WIN32) || defined(_WIN32)
-#			define JNI_PUBLIC_API(ResultType)	__export ResultType
-#			define JNI_PUBLIC_VAR(VarType)		VarType
-#			define JNI_NATIVE_STUB(ResultType)	 __export ResultType
-#			define JNICALL
-#		else /* !_WIN32 */
-#			define JNI_PUBLIC_API(ResultType)	ResultType _cdecl _export _loadds 
-#			define JNI_PUBLIC_VAR(VarType)		VarType
-#			define JNI_NATIVE_STUB(ResultType)	ResultType _cdecl _loadds
-#			define JNICALL			_loadds
-#		endif
 #	else
 #		error Unsupported PC development environment.	
 #	endif
@@ -156,19 +144,7 @@
 
 /* Mac */
 #elif defined(macintosh) || defined(Macintosh) || defined(THINK_C)
-#	if defined(__MWERKS__)				/* Metrowerks */
-#		if !__option(enumsalwaysint)
-#			error You need to define 'Enums Always Int' for your project.
-#		endif
-#		if defined(TARGET_CPU_68K) && !TARGET_RT_MAC_CFM 
-#			if !__option(fourbyteints) 
-#				error You need to define 'Struct Alignment: 68k' for your project.
-#			endif
-#		endif /* !GENERATINGCFM */
-#		define JNI_PUBLIC_API(ResultType)	__declspec(export) ResultType 
-#		define JNI_PUBLIC_VAR(VarType)		JNI_PUBLIC_API(VarType)
-#		define JNI_NATIVE_STUB(ResultType)	JNI_PUBLIC_API(ResultType)
-#	elif defined(__SC__)				/* Symantec */
+#	if defined(__SC__)				/* Symantec */
 #		error What are the Symantec defines? (warren@netscape.com)
 #	elif macintosh && applec			/* MPW */
 #		error Please upgrade to the latest MPW compiler (SC).
diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h
index 8234addd4..3faf842dc 100644
--- a/nsplugins/sdk/jri_md.h
+++ b/nsplugins/sdk/jri_md.h
@@ -52,9 +52,9 @@ extern "C" {
  * WHAT'S UP WITH THIS FILE?
  * 
  * This is where we define the mystical JRI_PUBLIC_API macro that works on all
- * platforms. If you're running with Visual C++, Symantec C, or Borland's 
+ * platforms. If you're running with Visual C++ or Symantec C
  * development environment on the PC, you're all set. Or if you're on the Mac
- * with Metrowerks, Symantec or MPW with SC you're ok too. For UNIX it shouldn't
+ * with Symantec or MPW with SC you're ok too. For UNIX it shouldn't
  * matter.
  *
  * On UNIX though you probably care about a couple of other symbols though:
@@ -105,22 +105,6 @@ extern "C" {
 #			define JRI_CALLBACK			__export
 #                   endif /* !WINDLL */
 #		endif /* !_WIN32 */
-#	elif defined(__BORLANDC__)
-#		if defined(WIN32) || defined(_WIN32)
-#			define JRI_PUBLIC_API(ResultType)	__export ResultType
-#			define JRI_PUBLIC_VAR(VarType)		VarType
-#			define JRI_PUBLIC_VAR_EXP(VarType)	__export VarType
-#			define JRI_PUBLIC_VAR_IMP(VarType)	__import VarType
-#			define JRI_NATIVE_STUB(ResultType)	 __export ResultType
-#			define JRI_CALLBACK
-#		else /* !_WIN32 */
-#			define JRI_PUBLIC_API(ResultType)	ResultType _cdecl _export _loadds 
-#			define JRI_PUBLIC_VAR(VarType)		VarType
-#			define JRI_PUBLIC_VAR_EXP(VarType)	__cdecl __export VarType
-#			define JRI_PUBLIC_VAR_IMP(VarType)	__cdecl __import VarType
-#			define JRI_NATIVE_STUB(ResultType)	ResultType _cdecl _loadds
-#			define JRI_CALLBACK			_loadds
-#		endif
 #	else
 #		error Unsupported PC development environment.	
 #	endif
@@ -130,21 +114,7 @@ extern "C" {
 
 /* Mac */
 #elif defined (macintosh) || defined(Macintosh) || defined(THINK_C)
-#	if defined(__MWERKS__)				/* Metrowerks */
-#		if !__option(enumsalwaysint)
-#			error You need to define 'Enums Always Int' for your project.
-#		endif
-#		if defined(TARGET_CPU_68K) && !TARGET_RT_MAC_CFM 
-#			if !__option(fourbyteints) 
-#				error You need to define 'Struct Alignment: 68k' for your project.
-#			endif
-#		endif /* !GENERATINGCFM */
-#		define JRI_PUBLIC_API(ResultType)	__declspec(export) ResultType
-#		define JRI_PUBLIC_VAR(VarType)		JRI_PUBLIC_API(VarType)
-#		define JRI_PUBLIC_VAR_EXP(VarType)	JRI_PUBLIC_API(VarType)
-#		define JRI_PUBLIC_VAR_IMP(VarType)	JRI_PUBLIC_API(VarType)
-#		define JRI_NATIVE_STUB(ResultType)	JRI_PUBLIC_API(ResultType)
-#	elif defined(__SC__)				/* Symantec */
+#	if defined(__SC__)				/* Symantec */
 #		error What are the Symantec defines? (warren@netscape.com)
 #	elif macintosh && applec			/* MPW */
 #		error Please upgrade to the latest MPW compiler (SC).
@@ -208,16 +178,7 @@ typedef long			jint;
 
 #ifdef HAVE_LONG_LONG
 
-#ifdef OSF1
-
-/* long is default 64-bit on OSF1, -std1 does not allow long long */
-typedef long                  jlong;
-typedef unsigned long         julong;
-#define jlong_MAXINT          0x7fffffffffffffffL
-#define jlong_MININT          0x8000000000000000L
-#define jlong_ZERO            0x0L
-
-#elif (defined(WIN32) || defined(_WIN32))
+#if (defined(WIN32) || defined(_WIN32))
 
 typedef LONGLONG              jlong;
 typedef DWORDLONG             julong;
diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h
index 18992ae0d..92ccc6e60 100644
--- a/nsplugins/sdk/npapi.h
+++ b/nsplugins/sdk/npapi.h
@@ -92,21 +92,6 @@
 #	endif /* XP_WIN */
 #endif /* _WINDOWS */
 
-#ifdef __MWERKS__
-#	define _declspec __declspec
-#	ifdef macintosh
-#		ifndef XP_MAC
-#			define XP_MAC 1
-#		endif /* XP_MAC */
-#	endif /* macintosh */
-#	ifdef __INTEL__
-#		undef NULL
-#		ifndef XP_WIN
-#			define XP_WIN 1
-#		endif /* XP_WIN */
-#	endif /* __INTEL__ */
-#endif /* __MWERKS__ */
-
 #if defined(XP_MAC) || defined(XP_MACOSX)
 	#include <Quickdraw.h>
 	#include <Events.h>
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index daccd1bcf..821f17e29 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -44,9 +44,9 @@ TestNSPlugin::TestNSPlugin()
    m_layout = new TQHBoxLayout( m_client );
 
    // file menu
-   KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection());
-   KStdAction::close( this, TQT_SLOT(closeView()), actionCollection());
-   KStdAction::quit( kapp, TQT_SLOT(quit()), actionCollection());
+   KStdAction::openNew( this, TQ_SLOT(newView()), actionCollection());
+   KStdAction::close( this, TQ_SLOT(closeView()), actionCollection());
+   KStdAction::quit( tdeApp, TQ_SLOT(quit()), actionCollection());
 
    createGUI( "testnspluginui.rc" );
 }
@@ -88,8 +88,8 @@ void TestNSPlugin::newView()
    if ( win )
    {
       m_plugins.append( win );
-      connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)),
-               this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) );
+      connect( win, TQ_SIGNAL(destroyed(NSPluginInstance *)),
+               this, TQ_SLOT(viewDestroyed(NSPluginInstance *)) );
       m_layout->addWidget( win );
       win->show();
    } else
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index 08a3778d7..48a71ed80 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -31,6 +31,6 @@ tde_add_executable( nspluginviewer AUTOMOC
     ../NSPluginCallbackIface.stub NSPluginClassIface.skel
     nsplugin.cpp viewer.cpp qxteventloop.cpp
     glibevents.cpp
-  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt ${DL_LIBRARIES}
+  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt ${CMAKE_DL_LIBS}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/nsplugins/viewer/glibevents.cpp b/nsplugins/viewer/glibevents.cpp
index fe059d1ee..e8bc766a1 100644
--- a/nsplugins/viewer/glibevents.cpp
+++ b/nsplugins/viewer/glibevents.cpp
@@ -24,7 +24,7 @@
 GlibEvents::GlibEvents()
     {
     g_main_context_ref( g_main_context_default());
-    connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( process()));
+    connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( process()));
     // TODO Poll for now
     timer.start( 10 );
     }
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 5b6b9267f..5a873c45d 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -49,9 +49,9 @@
 #include <tdeio/netaccess.h>
 #include <klibloader.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeprotocolmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdetempfile.h>
 #include <kurl.h>
 
@@ -616,7 +616,7 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
    memcpy(&_pluginFuncs, pluginFuncs, sizeof(_pluginFuncs));
 
    _timer = new TQTimer( this );
-   connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+   connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
 
    kdDebug(1431) << "NSPluginInstance::NSPluginInstance" << endl;
    kdDebug(1431) << "pdata = " << _npp->pdata << endl;
@@ -809,8 +809,8 @@ void NSPluginInstance::timer()
                 if (req.post) {
                     // create stream
                     NSPluginStream *s = new NSPluginStream( this );
-                    connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                             TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+                    connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                             TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
                     _streams.append( s );
 
                     kdDebug() << "posting to " << url << endl;
@@ -828,8 +828,8 @@ void NSPluginInstance::timer()
                 } else {
                     // create stream
                     NSPluginStream *s = new NSPluginStream( this );
-                    connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                             TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+                    connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                             TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
                     _streams.append( s );
 
                     kdDebug() << "getting " << url << endl;
@@ -1026,8 +1026,8 @@ void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) {
         Request *req = i.data();
         _jsrequests.remove( i );
         NSPluginStream *s = new NSPluginStream( this );
-        connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
-                 TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+        connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+                 TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
         _streams.append( s );
 
         int len = result.length();
@@ -1233,7 +1233,7 @@ void NSPluginInstance::gotFocusOut()
 // Prevent plugins from polling the keyboard regardless of focus.
 static int (*real_xquerykeymap)( Display*, char[32] ) = NULL;
 
-extern "C" KDE_EXPORT
+extern "C" TDE_EXPORT
 int XQueryKeymap( Display* dpy, char k[32] )
 {
     if( real_xquerykeymap == NULL )
@@ -1254,9 +1254,9 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId,
 {
     _classes.setAutoDelete( true );
     connect(TDEApplication::dcopClient(),
-            TQT_SIGNAL(applicationRemoved(const TQCString&)),
+            TQ_SIGNAL(applicationRemoved(const TQCString&)),
             this,
-            TQT_SLOT(appUnregistered(const TQCString&)));
+            TQ_SLOT(appUnregistered(const TQCString&)));
 }
 
 
@@ -1323,7 +1323,7 @@ DCOPRef NSPluginViewer::newClass( TQString plugin )
        _classes.insert( plugin, cls );
    }
 
-   return DCOPRef( kapp->dcopClient()->appId(), cls->objId() );
+   return DCOPRef( tdeApp->dcopClient()->appId(), cls->objId() );
 }
 
 
@@ -1348,7 +1348,7 @@ NSPluginClass::NSPluginClass( const TQString &library,
     _NP_Shutdown = 0;
 
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+    connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
 
     // check lib handle
     if (!_handle) {
@@ -1566,7 +1566,7 @@ DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 emb
    }
 
    _instances.append( inst );
-   return DCOPRef(kapp->dcopClient()->appId(), inst->objId());
+   return DCOPRef(tdeApp->dcopClient()->appId(), inst->objId());
 }
 
 
@@ -1574,7 +1574,7 @@ void NSPluginClass::destroyInstance( NSPluginInstance* inst )
 {
     // mark for destruction
     _trash.append( inst );
-    timer(); //_timer->start( 0, TRUE );
+    timer(); //_timer->start( 0, true );
 }
 
 /****************************************************************************/
@@ -1642,7 +1642,7 @@ void NSPluginStreamBase::inform()
                 // stream into temporary file (use lower() in case the
                 // filename as an upper case X in it)
                 _tempFile = new KTempFile;
-                _tempFile->setAutoDelete( TRUE );
+                _tempFile->setAutoDelete( true );
                 _fileURL = _tempFile->name();
                 kdDebug() << "saving into " << _fileURL << endl;
             }
@@ -1832,7 +1832,7 @@ NSPluginBufStream::NSPluginBufStream( class NSPluginInstance *instance )
     : NSPluginStreamBase( instance )
 {
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) );
 }
 
 
@@ -1878,7 +1878,7 @@ NSPluginStream::NSPluginStream( NSPluginInstance *instance )
     : NSPluginStreamBase( instance ), _job(0)
 {
    _resumeTimer = new TQTimer( this );
-   connect(_resumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resume()));
+   connect(_resumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resume()));
 }
 
 
@@ -1902,15 +1902,15 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
         if (reload) {
             _job->addMetaData("cache", "reload");
         }
-        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+        connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;
@@ -1928,15 +1928,15 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
         _job->addMetaData("errorPage", "false");
         _job->addMetaData("PropagateHttpHeader", "true");
         _job->addMetaData("AllowCompressedPage", "false");
-        connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
-        connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
-        connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
-                TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
-        connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-                TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
-        connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
-                TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+        connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+        connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+        connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+                TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+        connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+                TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+        connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+                TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
     }
 
     return false;
@@ -1949,7 +1949,7 @@ void NSPluginStream::data(TDEIO::Job * job, const TQByteArray &data)
     queue( data );
     if ( !pump() ) {
         _job->suspend();
-        _resumeTimer->start( 100, TRUE );
+        _resumeTimer->start( 100, true );
     }
 }
 
@@ -1986,7 +1986,7 @@ void NSPluginStream::resume()
       _job->resume();
    } else {
        kdDebug(1431) << "restart timer" << endl;
-       _resumeTimer->start( 100, TRUE );
+       _resumeTimer->start( 100, true );
    }
 }
 
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index 1f112ba08..b8b4329b2 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -93,8 +93,8 @@ bool QXtEventLoop::redeliverEvent( XEvent *event )
 {
     // redeliver the event to Xt, NOT through Qt
     if ( static_d->dispatchers[ event->type ]( event ) )
-	return TRUE;
-    return FALSE;
+	return true;
+    return false;
 }
 
 
@@ -108,7 +108,7 @@ XEvent* QXtEventLoop::lastEvent()
 
 QXtEventLoopPrivate::QXtEventLoopPrivate()
     : appContext(NULL), ownContext(NULL),
-      activate_timers(FALSE), timerid(0)
+      activate_timers(false), timerid(0)
 {
 }
 
@@ -181,18 +181,18 @@ Boolean qmotif_event_dispatcher( XEvent *event )
 	case EnterNotify:
 	case LeaveNotify:
 	    event->xcrossing.focus = False;
-	    delivered = FALSE;
+	    delivered = false;
 	    break;
 	case XKeyPress:
 	case XKeyRelease:
-	    delivered = TRUE;
+	    delivered = true;
 	    break;
 	case XFocusIn:
 	case XFocusOut:
-	    delivered = FALSE;
+	    delivered = false;
 	    break;
 	default:
-	    delivered = FALSE;
+	    delivered = false;
 	    break;
 	}
     }
@@ -412,7 +412,7 @@ void QXtEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier )
  */
 void qmotif_timeout_handler( XtPointer, XtIntervalId * )
 {
-    static_d->activate_timers = TRUE;
+    static_d->activate_timers = true;
     static_d->timerid = 0;
 }
 
@@ -461,7 +461,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
     if ( d->activate_timers ) {
 	nevents += activateTimers();
     }
-    d->activate_timers = FALSE;
+    d->activate_timers = false;
 
     return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 );
 }
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index 6007e5b0e..488168b4d 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -152,7 +152,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
 #if defined(CHECK_RANGE)
       tqWarning( "TQSocketNotifier: Internal error" );
 #endif
-      return FALSE;
+      return false;
   }
 
   XtPointer inpMask = 0;
@@ -161,7 +161,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
   case TQSocketNotifier::Read:      inpMask = (XtPointer)XtInputReadMask; break;
   case TQSocketNotifier::Write:     inpMask = (XtPointer)XtInputWriteMask; break;
   case TQSocketNotifier::Exception: inpMask = (XtPointer)XtInputExceptMask; break;
-  default: return FALSE;
+  default: return false;
   }
 
   if (enable) {
@@ -197,13 +197,13 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
       while ( sn && !(sn->obj == obj && sn->fd == sockfd) )
           sn = _notifiers[type].next();
       if ( !sn )				// not found
-          return FALSE;
+          return false;
 
       XtRemoveInput( sn->id );
       _notifiers[type].remove();
   }
 
-  return TRUE;
+  return true;
 }
 #endif
 
diff --git a/pics/wallpapers/Trinity-lineart.svg b/pics/wallpapers/Trinity-lineart.svg
index df7793177..f167d072d 100644..100755
--- a/pics/wallpapers/Trinity-lineart.svg
+++ b/pics/wallpapers/Trinity-lineart.svg
@@ -2,303 +2,207 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="1280"
    height="800"
    id="svg1"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="71676-lineart_1610_TDE.svg"
-   inkscape:export-filename="/home/famille/pics/71676-lineart_1610_TDE.png"
+   inkscape:version="1.4.2 (unknown)"
+   sodipodi:docname="Trinity-lineart.svg"
+   inkscape:export-filename="Trinity-lineart.png"
    inkscape:export-xdpi="225"
    inkscape:export-ydpi="225"
    inkscape:output_extension="org.inkscape.output.svgz.inkscape"
-   version="1.0">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient1823">
-      <stop
+   version="1.0"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"><defs
+     id="defs3"><linearGradient
+       id="linearGradient1823"><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="0.0000000"
-         id="stop1824" />
-      <stop
+         id="stop1824" /><stop
          style="stop-color:#ffffff;stop-opacity:0.35211268;"
          offset="0.50000000"
-         id="stop1825" />
-      <stop
+         id="stop1825" /><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop1826" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1817">
-      <stop
+         id="stop1826" /></linearGradient><linearGradient
+       id="linearGradient1817"><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="0.0000000"
-         id="stop1818" />
-      <stop
+         id="stop1818" /><stop
          style="stop-color:#ffffff;stop-opacity:0.039215688;"
          offset="0.50000000"
-         id="stop1821" />
-      <stop
+         id="stop1821" /><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop1822" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1818">
-      <stop
+         id="stop1822" /></linearGradient><linearGradient
+       id="linearGradient1818"><stop
          style="stop-color:#ffffff;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop1819" />
-      <stop
+         id="stop1819" /><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop1820" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1813">
-      <stop
+         id="stop1820" /></linearGradient><linearGradient
+       id="linearGradient1813"><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="0.0000000"
-         id="stop1815" />
-      <stop
+         id="stop1815" /><stop
          style="stop-color:#ffffff;stop-opacity:0.49803922;"
          offset="0.50000000"
-         id="stop1816" />
-      <stop
+         id="stop1816" /><stop
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop1817" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1807">
-      <stop
+         id="stop1817" /></linearGradient><linearGradient
+       id="linearGradient1807"><stop
          style="stop-color:#ffffff;stop-opacity:0.68544602;"
          offset="0.0000000"
-         id="stop1808" />
-      <stop
+         id="stop1808" /><stop
          style="stop-color:#fefeff;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop1809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13017">
-      <stop
+         id="stop1809" /></linearGradient><linearGradient
+       id="linearGradient13017"><stop
          style="stop-color:#000000;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop13018" />
-      <stop
+         id="stop13018" /><stop
          style="stop-color:#ffffff;stop-opacity:1.0000000;"
          offset="1.0000000"
-         id="stop13019" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1812">
-      <stop
+         id="stop13019" /></linearGradient><linearGradient
+       id="linearGradient1812"><stop
          style="stop-color:#ffffff;stop-opacity:0.058823530;"
          offset="0.0000000"
-         id="stop1813" />
-      <stop
+         id="stop1813" /><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop1814" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4276">
-      <stop
+         id="stop1814" /></linearGradient><linearGradient
+       id="linearGradient4276"><stop
          style="stop-color:#ffffff;stop-opacity:0.11764706;"
          offset="0.0000000"
-         id="stop4277" />
-      <stop
+         id="stop4277" /><stop
          style="stop-color:#fefeff;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop4278" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3030">
-      <stop
+         id="stop4278" /></linearGradient><linearGradient
+       id="linearGradient3030"><stop
          style="stop-color:#0e3581;stop-opacity:0.0000000;"
          offset="0.0000000"
-         id="stop3031" />
-      <stop
+         id="stop3031" /><stop
          style="stop-color:#1443a0;stop-opacity:1.0000000;"
          offset="0.50000000"
-         id="stop3032" />
-      <stop
+         id="stop3032" /><stop
          style="stop-color:#0440b6;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop3033" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
+         id="stop3033" /></linearGradient><linearGradient
+       id="linearGradient2402"><stop
          style="stop-color:#01306f;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop2403" />
-      <stop
+         id="stop2403" /><stop
          style="stop-color:#03439b;stop-opacity:1.0000000;"
          offset="0.50000000"
-         id="stop2404" />
-      <stop
+         id="stop2404" /><stop
          style="stop-color:#003680;stop-opacity:1.0000000;"
          offset="1.0000000"
-         id="stop2405" />
-    </linearGradient>
-    <linearGradient
+         id="stop2405" /></linearGradient><linearGradient
        inkscape:collect="always"
-       id="linearGradient9839">
-      <stop
+       id="linearGradient9839"><stop
          style="stop-color:#000000;stop-opacity:1;"
          offset="0"
-         id="stop9840" />
-      <stop
+         id="stop9840" /><stop
          style="stop-color:#000000;stop-opacity:0;"
          offset="1"
-         id="stop9841" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4069">
-      <stop
+         id="stop9841" /></linearGradient><linearGradient
+       id="linearGradient4069"><stop
          style="stop-color:#ffbe34;stop-opacity:0.68544602;"
          offset="0.0000000"
-         id="stop4070" />
-      <stop
+         id="stop4070" /><stop
          style="stop-color:#ffdc4c;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop4071" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16912">
-      <stop
+         id="stop4071" /></linearGradient><linearGradient
+       id="linearGradient16912"><stop
          style="stop-color:#ffffff;stop-opacity:0.66666669;"
          offset="0.0000000"
-         id="stop16913" />
-      <stop
+         id="stop16913" /><stop
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop16914" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8708">
-      <stop
+         id="stop16914" /></linearGradient><linearGradient
+       id="linearGradient8708"><stop
          style="stop-color:#01306f;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop8709" />
-      <stop
+         id="stop8709" /><stop
          style="stop-color:#03439b;stop-opacity:1.0000000;"
          offset="0.50000000"
-         id="stop12476" />
-      <stop
+         id="stop12476" /><stop
          style="stop-color:#003680;stop-opacity:1.0000000;"
          offset="1.0000000"
-         id="stop8710" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3704">
-      <stop
+         id="stop8710" /></linearGradient><linearGradient
+       id="linearGradient3704"><stop
          style="stop-color:#0b1d41;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop3705" />
-      <stop
+         id="stop3705" /><stop
          style="stop-color:#000000;stop-opacity:1.0000000;"
          offset="1.0000000"
-         id="stop3706" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1810">
-      <stop
+         id="stop3706" /></linearGradient><linearGradient
+       id="linearGradient1810"><stop
          style="stop-color:#ffffff;stop-opacity:0.39215687;"
          offset="0.0000000"
-         id="stop1811" />
-      <stop
+         id="stop1811" /><stop
          style="stop-color:#fefeff;stop-opacity:0.054901961;"
          offset="1.0000000"
-         id="stop1812" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12401">
-      <stop
+         id="stop1812" /></linearGradient><linearGradient
+       id="linearGradient12401"><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="0.0000000"
-         id="stop12402" />
-      <stop
+         id="stop12402" /><stop
          style="stop-color:#ffffff;stop-opacity:0.039215688;"
          offset="0.50000000"
-         id="stop9333" />
-      <stop
+         id="stop9333" /><stop
          style="stop-color:#ffffff;stop-opacity:0.0000000;"
          offset="1.0000000"
-         id="stop12403" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11763">
-      <stop
+         id="stop12403" /></linearGradient><linearGradient
+       id="linearGradient11763"><stop
          style="stop-color:#000000;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop11764" />
-      <stop
+         id="stop11764" /><stop
          style="stop-color:#000000;stop-opacity:0.63380283;"
          offset="1.0000000"
-         id="stop11765" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9855">
-      <stop
+         id="stop11765" /></linearGradient><linearGradient
+       id="linearGradient9855"><stop
          style="stop-color:#0058ff;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop9856" />
-      <stop
+         id="stop9856" /><stop
          style="stop-color:#fdfdfd;stop-opacity:0;"
          offset="1"
-         id="stop9857" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9230">
-      <stop
+         id="stop9857" /></linearGradient><linearGradient
+       id="linearGradient9230"><stop
          style="stop-color:#0058ff;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop9231" />
-      <stop
+         id="stop9231" /><stop
          style="stop-color:#fdfdfd;stop-opacity:0;"
          offset="1"
-         id="stop9232" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7972">
-      <stop
+         id="stop9232" /></linearGradient><linearGradient
+       id="linearGradient7972"><stop
          style="stop-color:#fdfdfd;stop-opacity:0.29411766;"
          offset="0.0000000"
-         id="stop7973" />
-      <stop
+         id="stop7973" /><stop
          style="stop-color:#fdfdfd;stop-opacity:0.35294119;"
          offset="0.50000000"
-         id="stop8597" />
-      <stop
+         id="stop8597" /><stop
          style="stop-color:#fdfdfd;stop-opacity:0.098039217;"
          offset="1.0000000"
-         id="stop7974" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2353">
-      <stop
+         id="stop7974" /></linearGradient><linearGradient
+       id="linearGradient2353"><stop
          style="stop-color:#b3cfff;stop-opacity:1.0000000;"
          offset="0.0000000"
-         id="stop2354" />
-      <stop
+         id="stop2354" /><stop
          style="stop-color:#0050dd;stop-opacity:1.0000000;"
          offset="1.0000000"
-         id="stop2355" />
-    </linearGradient>
-    <style
+         id="stop2355" /></linearGradient><style
        type="text/css"
        id="style2415">
    
@@ -306,8 +210,7 @@
     .fil2 {fill:#FFFFFF}
     .fil1 {fill:#1F1A17}
    
-  </style>
-    <style
+  </style><style
        type="text/css"
        id="style2017">
    
@@ -315,8 +218,7 @@
     .fil2 {fill:#FFFFFF}
     .fil1 {fill:#1F1A17}
    
-  </style>
-    <linearGradient
+  </style><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient7972"
        id="linearGradient11136"
@@ -325,8 +227,7 @@
        x1="585.87195"
        y1="411.427"
        x2="607.1839"
-       y2="640.82019" />
-    <linearGradient
+       y2="640.82019" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient11763"
        id="linearGradient11762"
@@ -335,8 +236,7 @@
        y1="1078.1119"
        x2="593.87524"
        y2="751.44543"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient1823"
        id="linearGradient12404"
@@ -345,8 +245,7 @@
        y1="19776.625"
        x2="3.1722441"
        y2="19776.625"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
+       gradientUnits="userSpaceOnUse" /><radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient1810"
        id="radialGradient9346"
@@ -356,8 +255,7 @@
        cy="375.39572"
        fx="905.61401"
        fy="375.39572"
-       r="201.9917" />
-    <linearGradient
+       r="201.9917" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient16912"
        id="linearGradient16915"
@@ -366,8 +264,7 @@
        y1="507.98886"
        x2="123.76366"
        y2="612.88391"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient9839"
        id="linearGradient9842"
@@ -376,8 +273,7 @@
        y1="150.29443"
        x2="424.56198"
        y2="722.41736"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient1810"
        id="linearGradient1357"
@@ -387,14 +283,12 @@
        y1="-62.640854"
        x2="350.99991"
        y2="820.59406"
-       spreadMethod="pad" />
-    <pattern
+       spreadMethod="pad" /><pattern
        patternUnits="userSpaceOnUse"
        width="176.62337"
        height="177.46243"
        patternTransform="translate(876.9406,614.1349)"
-       id="pattern1981">
-      <rect
+       id="pattern1981"><rect
          style="opacity:0.45248869;fill:url(#radialGradient9346);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2500000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
          id="rect1982"
          width="176.62337"
@@ -403,9 +297,7 @@
          y="614.13489"
          rx="49.708714"
          ry="49.705379"
-         transform="translate(-876.9406,-614.1349)" />
-    </pattern>
-    <linearGradient
+         transform="translate(-876.9406,-614.1349)" /></pattern><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3030"
        id="linearGradient1158"
@@ -414,8 +306,7 @@
        x1="548.97797"
        y1="762.54321"
        x2="1061.0055"
-       y2="924.93665" />
-    <linearGradient
+       y2="924.93665" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient1812"
        id="linearGradient1811"
@@ -424,8 +315,7 @@
        y1="626.07275"
        x2="618.57043"
        y2="422.78098"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4276"
        id="linearGradient3061"
@@ -434,8 +324,7 @@
        y1="128.08214"
        x2="2398.271"
        y2="264.82779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient12401"
        id="linearGradient11144"
@@ -444,8 +333,7 @@
        x1="929.92407"
        y1="365.15329"
        x2="1407.9355"
-       y2="550.30981" />
-    <linearGradient
+       y2="550.30981" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient12401"
        id="linearGradient11147"
@@ -454,8 +342,7 @@
        x1="929.92407"
        y1="365.15329"
        x2="1407.9355"
-       y2="550.30981" />
-    <linearGradient
+       y2="550.30981" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient13017"
        id="linearGradient13020"
@@ -464,8 +351,7 @@
        y1="740.08929"
        x2="927.9621"
        y2="671.04675"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
+       gradientUnits="userSpaceOnUse" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient7972"
        id="linearGradient13885"
@@ -474,58 +360,962 @@
        x1="585.87195"
        y1="411.427"
        x2="607.1839"
-       y2="640.82019" />
-    <linearGradient
+       y2="640.82019" /><linearGradient
        id="linearGradient10239"
        y2="943.17999"
        gradientUnits="userSpaceOnUse"
        y1="782.28998"
        gradientTransform="matrix(-1.4212,0,0,0.69594,257.68573,-578.294)"
        x2="110.43"
-       x1="150.39">
-      <stop
+       x1="150.39"><stop
          id="stop2247-9"
          style="stop-color:#fff"
-         offset="0" />
-      <stop
+         offset="0" /><stop
          id="stop2248-4"
          style="stop-color:#fff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
+         offset="1" /></linearGradient><linearGradient
+       x1="112.50049"
+       y1="211.02246"
+       x2="112.50048"
+       y2="12.813960"
+       id="linearGradient32"
+       gradientUnits="userSpaceOnUse">
+					
+
+
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					<stop
+   style="stop-color:#63b5e8;stop-opacity:1;"
+   offset="0"
+   id="stop31" />
+
+
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					<stop
+   style="stop-color:#003399;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop32" />
+
+
+
+					<midPointStop
+   offset="0"
+   style="stop-color:#0099FF"
+   id="midPointStop151" />
+
+
+
+					<midPointStop
+   offset="0.25"
+   style="stop-color:#0099FF"
+   id="midPointStop153" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#B0D9FF"
+   id="midPointStop155" />
+
+
+
+					<midPointStop
+   offset="0.75"
+   style="stop-color:#B0D9FF"
+   id="midPointStop157" />
+
+
+
+					<midPointStop
+   offset="1"
+   style="stop-color:#003399"
+   id="midPointStop159" />
+
+
+
+				</linearGradient><linearGradient
+       x1="126.8584"
+       y1="102.09082"
+       x2="51.48325"
+       y2="177.46597"
+       id="linearGradient28"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad">
+						<stop
+   style="stop-color:#63b5e8;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop27" /><stop
+   style="stop-color:#3168b1;stop-opacity:1;"
+   offset="0.5"
+   id="stop29" />
+
+
+
+						<stop
+   style="stop-color:#001b7b;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop28" />
+
+
+
+						<midPointStop
+   offset="0"
+   style="stop-color:#57ADFF"
+   id="midPointStop264" />
+
+
+
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#57ADFF"
+   id="midPointStop266" />
+
+
+
+						<midPointStop
+   offset="1"
+   style="stop-color:#003399"
+   id="midPointStop268" />
+
+
+
+					</linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 111.91846 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="225 : 111.91846 : 1"
+       inkscape:persp3d-origin="112.5 : 74.612305 : 1"
+       id="perspective86" /><linearGradient
+       x1="217.86621"
+       y1="217.28516"
+       x2="7.1352701"
+       y2="6.5542202"
+       id="path1065_2_"
+       gradientUnits="userSpaceOnUse">
+					<stop
+   style="stop-color:#3c5c82;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop85" />
+
+
+
+					<stop
+   style="stop-color:#001b7b;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop87" />
+
+
+
+					<midPointStop
+   offset="0"
+   style="stop-color:#0053BD"
+   id="midPointStop89" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#0053BD"
+   id="midPointStop91" />
+
+
+
+					<midPointStop
+   offset="1"
+   style="stop-color:#00008D"
+   id="midPointStop93" />
+
+
+
+				</linearGradient><linearGradient
+       x1="214.27441"
+       y1="213.71484"
+       x2="10.727790"
+       y2="10.168220"
+       id="XMLID_1_"
+       gradientUnits="userSpaceOnUse">
+					<stop
+   style="stop-color:#0068c6;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop100" />
+
+
+
+					<stop
+   style="stop-color:#3c5cb2;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop102" />
+
+
+
+					<midPointStop
+   offset="0"
+   style="stop-color:#0066CC"
+   id="midPointStop104" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#0066CC"
+   id="midPointStop106" />
+
+
+
+					<midPointStop
+   offset="1"
+   style="stop-color:#0053BD"
+   id="midPointStop108" />
+
+
+
+				</linearGradient><linearGradient
+       x1="112.50049"
+       y1="211.02246"
+       x2="112.50048"
+       y2="12.813960"
+       id="path1067_2_"
+       gradientUnits="userSpaceOnUse">
+					<stop
+   style="stop-color:#418ade;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop117" />
+
+
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					<stop
+   style="stop-color:#a4cdec;stop-opacity:1.0000000;"
+   offset="0.50000000"
+   id="stop133" />
+
+
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					
+
+					<stop
+   style="stop-color:#003399;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop149" />
+
+
+
+					<midPointStop
+   offset="0"
+   style="stop-color:#0099FF"
+   id="midPointStop151" />
+
+
+
+					<midPointStop
+   offset="0.25"
+   style="stop-color:#0099FF"
+   id="midPointStop153" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#B0D9FF"
+   id="midPointStop155" />
+
+
+
+					<midPointStop
+   offset="0.75"
+   style="stop-color:#B0D9FF"
+   id="midPointStop157" />
+
+
+
+					<midPointStop
+   offset="1"
+   style="stop-color:#003399"
+   id="midPointStop159" />
+
+
+
+				</linearGradient><radialGradient
+       cx="-1.3662100"
+       cy="223.93457"
+       r="299.15564"
+       fx="-1.3662100"
+       fy="223.93457"
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse">
+					<stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop166" />
+
+
+
+					<stop
+   style="stop-color:#418ade;stop-opacity:1.0000000;"
+   offset="0.44999999"
+   id="stop168" />
+
+
+
+					<stop
+   style="stop-color:#3c5cb2;stop-opacity:1.0000000;"
+   offset="0.75000000"
+   id="stop170" />
+
+
+
+					<stop
+   style="stop-color:#0068c6;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop172" />
+
+
+
+					<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop174" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop176" />
+
+
+
+					<midPointStop
+   offset="0.45"
+   style="stop-color:#0083D7"
+   id="midPointStop178" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#0083D7"
+   id="midPointStop180" />
+
+
+
+					<midPointStop
+   offset="0.75"
+   style="stop-color:#0053BD"
+   id="midPointStop182" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#0053BD"
+   id="midPointStop184" />
+
+
+
+					<midPointStop
+   offset="1"
+   style="stop-color:#0066CC"
+   id="midPointStop186" />
+
+
+
+				</radialGradient><linearGradient
+       x1="112.49854"
+       y1="6.1372099"
+       x2="112.49853"
+       y2="129.34680"
+       id="path1082_2_"
+       gradientUnits="userSpaceOnUse">
+					<stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop193" />
+
+
+
+					<stop
+   style="stop-color:#0093dd;stop-opacity:0.0000000;"
+   offset="1.0000000"
+   id="stop195" />
+
+
+
+					<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop197" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop199" />
+
+
+
+					<midPointStop
+   offset="1"
+   style="stop-color:#000000"
+   id="midPointStop201" />
+
+
+
+				</linearGradient><linearGradient
+       x1="87.310547"
+       y1="141.65430"
+       x2="193.38390"
+       y2="35.580940"
+       id="XMLID_3_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-26.444625,1.9659955)">
+						<stop
+   style="stop-color:#001b7b;stop-opacity:1.0000000;"
+   offset="0.0056200000"
+   id="stop210" />
+
+
+
+						
+
+						
+
+						
+
+						
+
+						
+
+						
+
+						<stop
+   style="stop-color:#0093dd;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop224" />
+
+
+
+						<midPointStop
+   offset="0.00562"
+   style="stop-color:#003399"
+   id="midPointStop226" />
+
+
+
+						<midPointStop
+   offset="0.25"
+   style="stop-color:#003399"
+   id="midPointStop228" />
+
+
+
+						<midPointStop
+   offset="1"
+   style="stop-color:#57ADFF"
+   id="midPointStop230" />
+
+
+
+					</linearGradient><linearGradient
+       x1="94.524902"
+       y1="133.65625"
+       x2="184.72461"
+       y2="43.456532"
+       id="XMLID_4_"
+       gradientUnits="userSpaceOnUse">
+						<stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop239" />
+
+
+
+						<stop
+   style="stop-color:#fcfeff;stop-opacity:1.0000000;"
+   offset="0.31658000"
+   id="stop241" />
+
+
+
+						<stop
+   style="stop-color:#f2faff;stop-opacity:1.0000000;"
+   offset="0.57076001"
+   id="stop243" />
+
+
+
+						<stop
+   style="stop-color:#e1f3ff;stop-opacity:1.0000000;"
+   offset="0.80255997"
+   id="stop245" />
+
+
+
+						<stop
+   style="stop-color:#ccebff;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop247" />
+
+
+
+						<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop249" />
+
+
+
+						<midPointStop
+   offset="0.75"
+   style="stop-color:#FFFFFF"
+   id="midPointStop251" />
+
+
+
+						<midPointStop
+   offset="1"
+   style="stop-color:#CCEBFF"
+   id="midPointStop253" />
+
+
+
+					</linearGradient><linearGradient
+       x1="126.85840"
+       y1="102.09082"
+       x2="51.483250"
+       y2="177.46597"
+       id="XMLID_5_"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient28">
+						<stop
+   style="stop-color:#63b5e8;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop260" />
+
+
+
+						<stop
+   style="stop-color:#001b7b;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop262" />
+
+
+
+						<midPointStop
+   offset="0"
+   style="stop-color:#57ADFF"
+   id="midPointStop264" />
+
+
+
+						<midPointStop
+   offset="0.5"
+   style="stop-color:#57ADFF"
+   id="midPointStop266" />
+
+
+
+						<midPointStop
+   offset="1"
+   style="stop-color:#003399"
+   id="midPointStop268" />
+
+
+
+					</linearGradient><linearGradient
+       x1="116.01855"
+       y1="112.93164"
+       x2="56.763809"
+       y2="172.18639"
+       id="XMLID_6_"
+       gradientUnits="userSpaceOnUse">
+						<stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="0.44999999"
+   id="stop277" />
+
+
+
+						
+
+						
+
+						
+
+						<stop
+   style="stop-color:#a4cdec;stop-opacity:0.27586207;"
+   offset="1"
+   id="stop285" />
+
+
+
+						<midPointStop
+   offset="0.45"
+   style="stop-color:#FFFFFF"
+   id="midPointStop287" />
+
+
+
+						<midPointStop
+   offset="0.75"
+   style="stop-color:#FFFFFF"
+   id="midPointStop289" />
+
+
+
+						<midPointStop
+   offset="1"
+   style="stop-color:#D4EEFF"
+   id="midPointStop291" />
+
+
+
+					</linearGradient><linearGradient
+       x1="92.049637"
+       y1="109.93223"
+       x2="-35.710068"
+       y2="216.77003"
+       id="linearGradient3301"
+       xlink:href="#XMLID_6_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,293.4532,19.002283)" /><linearGradient
+       x1="103.71875"
+       y1="107.75011"
+       x2="223.05583"
+       y2="-5.3456044"
+       id="linearGradient3302"
+       xlink:href="#XMLID_6_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(243.89543,-8.9577621)" /><linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient10239"
-       id="linearGradient3240"
+       xlink:href="#XMLID_5_"
+       id="linearGradient2895"
+       gradientUnits="userSpaceOnUse"
+       x1="126.85840"
+       y1="102.09082"
+       x2="51.483250"
+       y2="177.46597"
+       gradientTransform="matrix(-0.01358762,-0.99990768,0.99990768,-0.01358762,-9.7372904,230.63939)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_5_"
+       id="linearGradient2901"
+       gradientUnits="userSpaceOnUse"
+       x1="126.85840"
+       y1="102.09082"
+       x2="51.483250"
+       y2="177.46597"
+       gradientTransform="matrix(-1,0,0,1,217.21833,0)" /><linearGradient
+       x1="92.049637"
+       y1="109.93223"
+       x2="-35.710068"
+       y2="216.77003"
+       id="linearGradient3301-4"
+       xlink:href="#XMLID_6_-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.56630077,0,0,0.27730887,1293.1289,-201.34942)"
-       x1="150.39"
+       gradientTransform="translate(-3.548828,-5.61719)" /><linearGradient
+       x1="116.01855"
+       y1="112.93164"
+       x2="56.763809"
+       y2="172.18639"
+       id="XMLID_6_-3"
+       gradientUnits="userSpaceOnUse">
+						<stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="0.44999999"
+   id="stop277-1" />
+
+
+
+						
+
+						
+
+						
+
+						<stop
+   style="stop-color:#a4cdec;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop285-4" />
+
+
+
+						<midPointStop
+   offset="0.45"
+   style="stop-color:#FFFFFF"
+   id="midPointStop287" />
+
+
+
+						<midPointStop
+   offset="0.75"
+   style="stop-color:#FFFFFF"
+   id="midPointStop289" />
+
+
+
+						<midPointStop
+   offset="1"
+   style="stop-color:#D4EEFF"
+   id="midPointStop291" />
+
+
+
+					</linearGradient><filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Blur"
+       id="filter1"
+       x="-0.007070975"
+       y="-0.10242359"
+       width="1.0141419"
+       height="1.2048472"><feGaussianBlur
+         stdDeviation="0.64 0.61"
+         result="blur"
+         id="feGaussianBlur1" /></filter><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 111.91846 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="225 : 111.91846 : 1"
+       inkscape:persp3d-origin="112.5 : 74.612305 : 1"
+       id="perspective86-3" /><radialGradient
+       cx="-1.3662100"
+       cy="223.93457"
+       r="299.15564"
+       fx="-1.3662100"
+       fy="223.93457"
+       id="XMLID_2_-7"
+       gradientUnits="userSpaceOnUse">
+					<stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop166-9" />
+
+
+
+					<stop
+   style="stop-color:#418ade;stop-opacity:1.0000000;"
+   offset="0.44999999"
+   id="stop168-2" />
+
+
+
+					<stop
+   style="stop-color:#3c5cb2;stop-opacity:1.0000000;"
+   offset="0.75000000"
+   id="stop170-0" />
+
+
+
+					<stop
+   style="stop-color:#0068c6;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop172-2" />
+
+
+
+					<midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop174" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop176" />
+
+
+
+					<midPointStop
+   offset="0.45"
+   style="stop-color:#0083D7"
+   id="midPointStop178" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#0083D7"
+   id="midPointStop180" />
+
+
+
+					<midPointStop
+   offset="0.75"
+   style="stop-color:#0053BD"
+   id="midPointStop182" />
+
+
+
+					<midPointStop
+   offset="0.5"
+   style="stop-color:#0053BD"
+   id="midPointStop184" />
+
+
+
+					<midPointStop
+   offset="1"
+   style="stop-color:#0066CC"
+   id="midPointStop186" />
+
+
+
+				</radialGradient><filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Blur"
+       id="filter7"
+       x="-0.036537075"
+       y="-0.036726902"
+       width="1.0730742"
+       height="1.0734538"><feGaussianBlur
+         stdDeviation="0.94 0.94"
+         result="blur"
+         id="feGaussianBlur7" /></filter><linearGradient
+       id="XMLID_1_-3"
+       gradientUnits="userSpaceOnUse"
+       x1="90.397"
+       y1="123.7812"
+       x2="90.397"
+       y2="21.4445">
+                        <stop
+   offset="0.0000000"
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   id="stop1071" />
+
+
+
+
+
+
+                        <stop
+   offset="1.0000000"
+   style="stop-color:#ffffff;stop-opacity:0.0000000;"
+   id="stop1073" />
+
+
+
+
+
+
+                        <a:midPointStop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="midPointStop1075" />
+
+
+
+
+
+
+                        <a:midPointStop
+   offset="0.5"
+   style="stop-color:#FFFFFF"
+   id="midPointStop1077" />
+
+
+
+
+
+
+                        <a:midPointStop
+   offset="1"
+   style="stop-color:#000000"
+   id="midPointStop1079" />
+
+
+
+
+
+
+                </linearGradient><linearGradient
+       y2="943.17517"
+       x2="110.43429"
        y1="782.28998"
-       x2="110.43"
-       y2="943.17999" />
-  </defs>
-  <sodipodi:namedview
+       x1="150.38568"
+       gradientTransform="matrix(-0.57006231,0,0,0.28057746,1293.7681,-203.70123)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10239-3"
+       xlink:href="#linearGradient1818"
+       inkscape:collect="always" /></defs><sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.79462554"
-     inkscape:cx="703.47465"
-     inkscape:cy="433.20165"
-     inkscape:current-layer="svg1"
+     inkscape:zoom="4.4950808"
+     inkscape:cx="1172.3927"
+     inkscape:cy="100.44313"
+     inkscape:current-layer="g2"
      gridtolerance="2.0000000px"
      showgrid="false"
      guidetolerance="2.0000000px"
-     inkscape:window-width="1600"
-     inkscape:window-height="839"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1908"
+     inkscape:window-height="1124"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
      inkscape:grid-bbox="false"
      height="800px"
      width="1280px"
-     inkscape:window-maximized="1">
-    <inkscape:grid
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"><inkscape:grid
        id="GridFromPre046Settings"
        type="xygrid"
        originx="0.0000000pt"
@@ -538,257 +1328,117 @@
        empopacity="0.38"
        empspacing="2"
        units="pt"
-       visible="true"
+       visible="false"
        enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jan-Victor Krille</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title />
-          </cc:Agent>
-        </dc:rights>
-        <dc:source>http://www.kde.org</dc:source>
-        <dc:description>a svg wallpaper for kde 3.4</dc:description>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="opacity:1;fill:#01306f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26412666;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.53846154"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:creator><cc:Agent><dc:title>Jan-Victor Krille</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title /></cc:Agent></dc:rights><dc:source>http://www.kde.org</dc:source><dc:description>a svg wallpaper for kde 3.4</dc:description><cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><rect
+     style="opacity:1;fill:#01306f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26413;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.538462"
      id="rect1107"
      width="1280.1382"
      height="800.22717"
      x="-0.073321879"
-     y="-0.051684864" />
-  <path
+     y="-0.051684864"
+     sodipodi:insensitive="true" /><path
      style="opacity:1;fill:url(#linearGradient11144);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 1164.7328,-0.69951341 C 1264.2196,258.61376 928.11914,531.4294 910.39831,800.29111 L 1174.2649,800.29111 C 1061.8695,614.77634 1049.9813,404.74614 1280.0864,164.46313 L 1280.0864,-0.69951341 L 1164.7328,-0.69951341 z "
-     id="path4304" />
-  <path
+     d="M 1164.7328,-0.69951341 C 1264.2196,258.61376 928.11914,531.4294 910.39831,800.29111 H 1174.2649 C 1061.8695,614.77634 1049.9813,404.74614 1280.0864,164.46313 V -0.69951341 Z"
+     id="path4304"
+     sodipodi:insensitive="true" /><path
      style="opacity:1;fill:url(#linearGradient11147);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 829.67261,-0.49113936 C 1031.4355,464.22183 845.40864,673.83345 580.61988,800.49948 L 825.76602,800.49948 C 904.35813,516.06374 1060.7127,269.57227 1073.3186,-0.49113936 L 829.67261,-0.49113936 z "
-     id="path4930" />
-  <rect
-     style="fill:url(#linearGradient1158);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26412666;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.53846154"
+     d="M 829.67261,-0.49113936 C 1031.4355,464.22183 845.40864,673.83345 580.61988,800.49948 H 825.76602 C 904.35813,516.06374 1060.7127,269.57227 1073.3186,-0.49113936 Z"
+     id="path4930"
+     sodipodi:insensitive="true" /><rect
+     style="fill:url(#linearGradient1158);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26413;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.538462"
      id="rect1157"
      width="1280.1105"
      height="800.1571"
      x="-0.055212095"
-     y="-0.07439056" />
-  <path
+     y="-0.07439056"
+     sodipodi:insensitive="true" /><path
      style="opacity:1;fill:url(#linearGradient1811);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 998.67409,0.026826928 C 1178.6349,288.72368 979.67532,511.56754 763.7601,800.25926 L 227.09108,800.07824 C 651.81895,466.19802 1097.6907,427.22589 1135.4818,-0.19987259 L 998.67409,0.026826928 z "
+     d="M 998.67409,0.02682693 C 1178.6349,288.72368 979.67532,511.56754 763.7601,800.25926 L 227.09108,800.07824 C 651.81895,466.19802 1097.6907,427.22589 1135.4818,-0.19987259 Z"
      id="path1186"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="opacity:1;fill:url(#linearGradient3061);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 1191.6798,-0.11972768 L 1279.5609,-0.05203189 C 1202.4208,283.55831 1121.0568,502.76116 1279.7309,799.79924 L 1062.2697,800.15043 C 884.55474,602.8032 1118.9338,215.53806 1191.6798,-0.11972768 z "
+     sodipodi:nodetypes="ccccc"
+     sodipodi:insensitive="true" /><path
+     style="display:inline;opacity:1;fill:url(#linearGradient3061);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1191.6798,-0.11972768 87.8811,0.06769579 C 1202.4208,283.55831 1121.0568,502.76116 1279.7309,799.79924 l -217.4612,0.35119 C 884.55474,602.8032 1118.9338,215.53806 1191.6798,-0.11972768 Z"
      id="path2436"
-     sodipodi:nodetypes="ccccc" />
-  <g
+     sodipodi:nodetypes="ccccc"
+     sodipodi:insensitive="true" /><g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1" />
-  <rect
-     style="opacity:1;fill:none;fill-opacity:0.35159816;fill-rule:nonzero;stroke:none;stroke-linejoin:round;stroke-opacity:1"
+     id="layer1"
+     style="display:inline"
+     sodipodi:insensitive="true" /><rect
+     style="display:inline;opacity:1;fill:none;fill-opacity:0.351598;fill-rule:nonzero;stroke:none;stroke-linejoin:round;stroke-opacity:1"
      width="176.63861"
      height="147.9144"
      x="876.961"
      y="511.80521"
-     id="rect1983" />
-  <g
-     id="flowRoot4299"
-     style="fill:#ffffff"
-     transform="translate(32.702687,-649.49318)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path4308"
-       style="fill:#ffffff"
-       d="m 960.31,700.38 -0.39063,1.5625 h -2.7344 v 10.156 h -1.9531 v -10.156 h -2.7344 l -0.39063,-1.5625 h 8.2031" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4310"
-       style="fill:#ffffff"
-       d="m 963.45,712.09 h -1.9531 v -7.8125 h 1.9531 v 1.1719 c 0.3125,-0.93749 0.88281,-1.4036 1.7109,-1.3984 0.82812,0.005 1.4922,0.17969 1.9922,0.52343 l -0.65,1.46 c -0.23438,-0.20832 -0.72917,-0.33853 -1.4844,-0.39062 -1.0417,0 -1.5625,0.58594 -1.5625,1.7578 v 4.6875" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4312"
-       style="fill:#ffffff"
-       d="m 967.75,712.09 v -7.8125 h 1.9531 V 712.09 H 967.75 m 0,-9.7656 v -1.9531 h 1.9531 v 1.9531 H 967.75" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4314"
-       style="fill:#ffffff"
-       d="m 975.77,704.09 c 1.6927,10e-6 2.539,1.1068 2.5391,3.3203 v 4.6875 h -1.9531 v -4.6875 c 0,-1.1719 -0.52083,-1.7578 -1.5625,-1.7578 -1.04167,0 -1.5625,0.58594 -1.5625,1.7578 v 4.6875 h -1.9531 v -7.8125 h 1.9531 v 1.1719 c 0,-0.91145 0.84636,-1.3672 2.5391,-1.3672" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4316"
-       style="fill:#ffffff"
-       d="m 979.88,712.09 v -7.8125 h 1.9531 V 712.09 H 979.88 m 0,-9.7656 v -1.9531 h 1.9531 v 1.9531 H 979.88" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4318"
-       style="fill:#ffffff"
-       d="m 986.53,705.84 v 3.9062 c 0,0.67709 0.55468,0.92188 1.6641,0.73437 l 0.28906,1.5391 -1.48,0.27 c -1.6146,0.26042 -2.4219,-0.45573 -2.4219,-2.1484 v -4.2969 h -1.1719 l -0.39063,-1.5625 h 1.5625 v -2.9297 l 1.9531,-0.39062 v 3.3203 h 1.9531 l -0.39062,1.5625 h -1.5625" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4320"
-       style="fill:#ffffff"
-       d="m 996.71,704.92 -4.8516,10.375 -1.7734,-0.78125 1.8516,-3.875 -2.7344,-5.75 1.7812,-0.80468 2.0078,4.1875 1.9609,-4.1875 1.7578,0.83593" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4322"
-       style="fill:#ffffff"
-       d="m 1000.8,712.09 v -11.719 h 3.9063 c 2.6042,10e-6 3.9062,1.9531 3.9062,5.8594 0,3.9063 -1.302,5.8594 -3.9062,5.8594 H 1000.8 m 5.8594,-5.8594 c 0,-2.8646 -0.651,-4.2969 -1.9531,-4.2969 h -1.9531 v 8.5938 h 1.9531 c 1.3021,0 1.9531,-1.4323 1.9531,-4.2969" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4324"
-       style="fill:#ffffff"
-       d="m 1013.7,712.29 c -2.6042,0 -3.9063,-1.3672 -3.9063,-4.1016 0,-2.7344 1.224,-4.1016 3.6719,-4.1016 2.4479,10e-6 3.6719,1.3672 3.6719,4.1016 v 0.78125 h -5.3516 c 0.3125,1.224 0.9505,1.8099 1.9141,1.7578 0.8854,0.0261 1.6276,-0.36458 2.2265,-1.1719 l 1.1719,1.1719 c -0.8333,1.0417 -1.9661,1.5625 -3.3984,1.5625 m 1.4843,-4.8828 c 0,-1.1719 -0.5156,-1.7578 -1.5468,-1.7578 -1.0261,0 -1.6433,0.58594 -1.8516,1.7578 h 3.3984" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4326"
-       style="fill:#ffffff"
-       d="m 1021.6,712.29 c -1.7188,0 -2.8776,-0.59896 -3.4766,-1.7969 l 1.5625,-0.97657 c 0.2865,0.75522 0.9245,1.1589 1.9141,1.2109 1.0156,0 1.5234,-0.28645 1.5234,-0.85937 0,-0.57292 -0.664,-0.91667 -1.9922,-1.0312 -1.7447,-0.30208 -2.6171,-1.0391 -2.6171,-2.2109 0,-1.6927 1.0286,-2.539 3.0859,-2.5391 1.6667,10e-6 2.6953,0.625 3.0859,1.875 l -1.5625,0.89843 c -0.2343,-0.80728 -0.7422,-1.2109 -1.5234,-1.2109 -0.7552,0 -1.1328,0.26042 -1.1328,0.78125 0,0.52084 0.4427,0.83854 1.3281,0.95312 2.1875,0.17188 3.2813,0.96094 3.2813,2.3672 0,1.6927 -1.1589,2.5391 -3.4766,2.5391" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4328"
-       style="fill:#ffffff"
-       d="m 1026.3,712.09 v -11.914 h 1.9532 v 7.25 l 3.3671,-3.375 1.1094,1.1016 -2.6406,2.6406 3.0937,3.7031 -1.5468,1.2969 -3.3828,-4.0391 V 712.09 H 1026.3" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4330"
-       style="fill:#ffffff"
-       d="m 1037.4,705.84 v 3.9062 c 0,0.67709 0.5547,0.92188 1.6641,0.73437 l 0.289,1.5391 -1.4843,0.26562 c -1.6146,0.26042 -2.4219,-0.45573 -2.4219,-2.1484 v -4.2969 h -1.1719 l -0.3906,-1.5625 h 1.5625 v -2.9297 l 1.9531,-0.39062 v 3.3203 h 1.9531 l -0.3906,1.5625 H 1037.4" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4332"
-       style="fill:#ffffff"
-       d="m 1044,712.29 c -2.6041,0 -3.9062,-1.3672 -3.9062,-4.1016 0,-2.7344 1.3021,-4.1016 3.9062,-4.1016 2.6042,10e-6 3.9063,1.3672 3.9063,4.1016 0,2.7344 -1.3021,4.1016 -3.9063,4.1016 m 1.9532,-4.1016 c -10e-5,-1.6927 -0.6511,-2.5391 -1.9532,-2.5391 -1.3021,0 -1.9531,0.84636 -1.9531,2.5391 0,1.69274 0.651,2.5391 1.9531,2.5391 1.3021,0 1.9531,-0.84635 1.9532,-2.5391" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4334"
-       style="fill:#ffffff"
-       d="m 1052.7,710.63 c 0.9635,-0.0677 1.4453,-0.91406 1.4453,-2.5391 0,-1.6302 -0.5209,-2.4453 -1.5625,-2.4453 -1.0417,0 -1.5625,0.58594 -1.5625,1.7578 v 2.5391 c 0.1562,0.52084 0.7161,0.75 1.6797,0.6875 m -3.6328,4.5859 v -10.938 h 1.9531 v 1.1719 c 0,-0.91145 0.8463,-1.3672 2.539,-1.3672 1.6927,1e-5 2.5391,1.3021 2.5391,3.9062 -0.062,1.7604 -0.3932,2.9088 -0.9922,3.4453 -0.599,0.53125 -1.2708,0.81771 -2.0156,0.85937 -0.7448,0.0469 -1.4349,-0.0859 -2.0703,-0.39843 v 3.3203 h -1.9531" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4336"
-       style="fill:#ffffff"
-       d="m 1060.8,712.09 v -11.719 h 7.0313 l -0.3907,1.5625 h -4.6875 v 3.5156 h 3.5157 v 1.5625 h -3.5157 v 3.5156 h 4.6875 l 0.3907,1.5625 H 1060.8" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4338"
-       style="fill:#ffffff"
-       d="m 1073.9,704.09 c 1.6927,10e-6 2.5391,1.1068 2.5391,3.3203 v 4.6875 h -1.9531 v -4.6875 c 0,-1.1719 -0.5209,-1.7578 -1.5625,-1.7578 -1.0417,0 -1.5625,0.58594 -1.5625,1.7578 v 4.6875 h -1.9531 v -7.8125 h 1.9531 v 1.1719 c 0,-0.91145 0.8463,-1.3672 2.539,-1.3672" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4340"
-       style="fill:#ffffff"
-       d="m 1084.9,704.92 -3.3516,7.1719 h -0.789 l -3.3672,-7.2031 1.7812,-0.80468 2.0079,4.1875 1.9609,-4.1875 1.7578,0.83593" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4342"
-       style="fill:#ffffff"
-       d="m 1085.9,712.09 v -7.8125 h 1.9531 V 712.09 H 1085.9 m 0,-9.7656 v -1.9531 h 1.9531 v 1.9531 H 1085.9" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4344"
-       style="fill:#ffffff"
-       d="m 1091.4,712.09 h -1.9531 v -7.8125 h 1.9531 v 1.1719 c 0.3125,-0.93749 0.8828,-1.4036 1.711,-1.3984 0.8281,0.005 1.4921,0.17969 1.9922,0.52343 l -0.6563,1.4609 c -0.2344,-0.20832 -0.7292,-0.33853 -1.4844,-0.39062 -1.0416,0 -1.5625,0.58594 -1.5625,1.7578 v 4.6875" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4346"
-       style="fill:#ffffff"
-       d="m 1099.2,712.29 c -2.6041,0 -3.9062,-1.3672 -3.9062,-4.1016 0,-2.7344 1.3021,-4.1016 3.9062,-4.1016 2.6042,10e-6 3.9063,1.3672 3.9063,4.1016 0,2.7344 -1.3021,4.1016 -3.9063,4.1016 m 1.9532,-4.1016 c -10e-5,-1.6927 -0.6511,-2.5391 -1.9532,-2.5391 -1.3021,0 -1.9531,0.84636 -1.9531,2.5391 0,1.69274 0.651,2.5391 1.9531,2.5391 1.3021,0 1.9531,-0.84635 1.9532,-2.5391" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4348"
-       style="fill:#ffffff"
-       d="m 1108.8,704.09 c 1.6927,10e-6 2.5391,1.1068 2.5391,3.3203 v 4.6875 h -1.9531 v -4.6875 c 0,-1.1719 -0.5209,-1.7578 -1.5625,-1.7578 -1.0417,0 -1.5625,0.58594 -1.5625,1.7578 v 4.6875 h -1.9531 v -7.8125 h 1.9531 v 1.1719 c 0,-0.91145 0.8463,-1.3672 2.539,-1.3672" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4350"
-       style="fill:#ffffff"
-       d="m 1117.4,704.09 c 1.1979,0.026 1.9791,0.5599 2.3437,1.6016 0.1302,-1.0677 1.0417,-1.6016 2.7344,-1.6016 1.6927,10e-6 2.5391,1.1068 2.5391,3.3203 v 4.6875 h -1.9531 v -4.6875 c -10e-5,-1.1719 -0.5209,-1.7578 -1.5625,-1.7578 -1.0417,0 -1.5626,0.58594 -1.5625,1.7578 v 4.6875 h -1.9532 v -4.6875 c 0,-1.1719 -0.5208,-1.7578 -1.5625,-1.7578 -1.0416,0 -1.5625,0.58594 -1.5625,1.7578 v 4.6875 h -1.9531 v -7.8125 h 1.9531 v 1.1719 c 0,-0.91145 0.8464,-1.3672 2.5391,-1.3672" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4352"
-       style="fill:#ffffff"
-       d="m 1130.1,712.29 c -2.6041,0 -3.9062,-1.3672 -3.9062,-4.1016 0,-2.7344 1.2239,-4.1016 3.6719,-4.1016 2.4479,10e-6 3.6718,1.3672 3.6718,4.1016 v 0.78125 h -5.3515 c 0.3125,1.224 0.9505,1.8099 1.914,1.7578 0.8854,0.0261 1.6276,-0.36458 2.2266,-1.1719 l 1.1719,1.1719 c -0.8334,1.0417 -1.9662,1.5625 -3.3985,1.5625 m 1.4844,-4.8828 c 0,-1.1719 -0.5156,-1.7578 -1.5469,-1.7578 -1.026,0 -1.6432,0.58594 -1.8515,1.7578 h 3.3984" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4354"
-       style="fill:#ffffff"
-       d="m 1139.2,704.09 c 1.6927,10e-6 2.539,1.1068 2.5391,3.3203 v 4.6875 h -1.9532 v -4.6875 c 0,-1.1719 -0.5208,-1.7578 -1.5625,-1.7578 -1.0416,0 -1.5625,0.58594 -1.5625,1.7578 v 4.6875 h -1.9531 v -7.8125 h 1.9531 v 1.1719 c 0,-0.91145 0.8464,-1.3672 2.5391,-1.3672" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4356"
-       style="fill:#ffffff"
-       d="m 1146.4,705.84 v 3.9062 c -1e-4,0.67709 0.5546,0.92188 1.664,0.73437 l 0.2891,1.5391 -1.4844,0.26562 c -1.6146,0.26042 -2.4219,-0.45573 -2.4219,-2.1484 v -4.2969 h -1.1718 l -0.3907,-1.5625 h 1.5625 v -2.9297 l 1.9532,-0.39062 v 3.3203 h 1.9531 l -0.3906,1.5625 H 1146.4" />
-  </g>
-  <path
-     inkscape:connector-curvature="0"
-     id="path1065_1_"
-     style="fill:#0044aa"
-     d="m 1196.9152,29.08144 h 48.844 c 3.5084,0 6.3787,2.87035 6.3787,6.37865 v 48.52527 c 0,3.50842 -2.8703,6.37865 -6.3787,6.37865 h -48.844 c -3.5086,0 -6.3791,-2.87023 -6.3791,-6.37865 V 35.46009 c 0,-3.50818 2.8704,-6.37865 6.3791,-6.37865 z" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path1067_1_"
-     style="fill:#ffffff"
-     d="m 1197.5527,32.58794 h 47.5689 c 1.9131,0 3.4834,1.57028 3.4834,3.5083 v 47.27408 c 0,1.91332 -1.57,3.48332 -3.4834,3.48332 h -47.5689 c -1.9134,0 -3.4832,-1.57 -3.4832,-3.48332 V 36.09624 c 0,-1.93802 1.5698,-3.5083 3.4832,-3.5083 z" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path189"
-     style="fill:#0044aa;fill-opacity:1"
-     d="m 1197.5527,33.26932 c -1.545,0 -2.8018,1.268 -2.8018,2.82664 v 47.27408 c 0,1.54462 1.2568,2.80206 2.8018,2.80206 h 47.5689 c 1.5449,0 2.8021,-1.25744 2.8021,-2.80206 V 36.09596 c 0,-1.55864 -1.2572,-2.82664 -2.8021,-2.82664 h -47.5689 z" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path273"
-     style="fill:#ffffff"
-     d="m 1235.3871,72.0202 -0.6762,0.2147 c -0.099,0.0305 -0.2053,-0.006 -0.2642,-0.0922 0,0 -1.3336,-1.95181 -3.0555,-4.47239 -2.0592,4.02969 -6.2487,6.78987 -11.0857,6.78987 -6.8732,0 -12.4457,-5.57216 -12.4457,-12.44531 0,-5.05574 3.0161,-9.40421 7.3453,-11.35271 v -3.21033 c -0.7879,0.2758 -1.5491,0.60786 -2.2726,1.00199 -10e-4,-8e-4 -0,-0.002 -0,-0.003 l -5.8623,-3.84481 c -0.1577,-0.1032 -0.366,-0.0818 -0.4992,0.0516 l -3.0713,3.07115 c -0.1291,0.12953 -0.1533,0.33073 -0.059,0.48756 l 3.596,5.92241 c -0.6379,1.07243 -1.1486,2.22866 -1.5133,3.44829 l -6.6026,1.37319 c -0.1837,0.038 -0.3161,0.20067 -0.3161,0.3889 v 4.34328 c 0,0.18369 0.1251,0.34277 0.3029,0.38609 l 6.4069,1.56597 c 0.3423,1.41201 0.8711,2.75149 1.571,3.9822 l -3.7085,5.65583 c -0.1035,0.15776 -0.082,0.36604 0.052,0.4992 l 3.0706,3.0713 c 0.1296,0.12915 0.3314,0.15374 0.4878,0.0586 l 5.8133,-3.52902 c 1.1406,0.65854 2.3725,1.17723 3.6733,1.52856 l 1.3564,6.51971 c 0.038,0.18421 0.201,0.31683 0.389,0.31683 h 4.3433 c 0.1824,0 0.3423,-0.12513 0.3856,-0.30346 l 1.597,-6.53486 c 1.3417,-0.36175 2.6101,-0.90077 3.7801,-1.58952 l 5.7271,3.75599 c 0.1581,0.10294 0.3655,0.0818 0.4995,-0.0513 l 3.071,-3.07131 c 0.13,-0.12967 0.1537,-0.33046 0.059,-0.48688 l -2.0916,-3.44642 z" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path2891"
-     d="m 1216.962,44.09566 c 0,0 0.1962,25.41858 0.1962,25.41858 l 6.7022,0.0502 -0.3209,-25.52976 13.1925,-0.0434 0,-5.61081 -33.1995,-0.11258 -0.087,5.71122 13.5132,0.11632 z"
-     style="fill:#ffffff" />
-  <path
-     inkscape:connector-curvature="0"
-     id="path2895"
-     d="m 1205.2112,72.0202 0.6762,0.2147 c 0.099,0.0305 0.2054,-0.006 0.2642,-0.0922 0,0 1.3336,-1.95181 3.0555,-4.47239 2.0593,4.02969 6.2488,6.78987 11.0858,6.78987 6.8731,0 12.4457,-5.57216 12.4457,-12.44531 0,-5.05574 -3.0161,-9.40421 -7.3454,-11.35271 v -3.21033 c 0.788,0.2758 1.5492,0.60786 2.2727,1.00199 10e-4,-8e-4 0,-0.002 0,-0.003 l 5.8622,-3.84485 c 0.1578,-0.1032 0.366,-0.0818 0.4992,0.0516 l 3.0713,3.07114 c 0.1292,0.12954 0.1534,0.33073 0.059,0.48756 l -3.596,5.92241 c 0.638,1.07244 1.1486,2.22867 1.5133,3.44829 l 6.6026,1.3732 c 0.1837,0.038 0.3162,0.20066 0.3162,0.38889 v 4.34329 c 0,0.18368 -0.1252,0.34277 -0.303,0.38608 l -6.4069,1.56598 c -0.3422,1.41196 -0.8711,2.75149 -1.5709,3.98223 l 3.7084,5.65584 c 0.1035,0.15775 0.082,0.36603 -0.052,0.4992 l -3.0706,3.0713 c -0.1296,0.12914 -0.3314,0.15374 -0.4878,0.0585 l -5.8133,-3.52902 c -1.1406,0.65855 -2.3725,1.17723 -3.6734,1.52856 l -1.3563,6.51971 c -0.038,0.18422 -0.201,0.31683 -0.3891,0.31683 h -4.3432 c -0.1824,0 -0.3423,-0.12512 -0.3856,-0.30346 l -1.597,-6.53485 c -1.3417,-0.36176 -2.6101,-0.90078 -3.7801,-1.58953 l -5.7272,3.75603 c -0.158,0.10294 -0.3655,0.0818 -0.4994,-0.0513 l -3.071,-3.0713 c -0.13,-0.12967 -0.1538,-0.33047 -0.059,-0.48689 l 2.0916,-3.44642 z"
-     style="fill:#ffffff" />
-  <path
+     id="rect1983"
+     sodipodi:insensitive="true" /><path
+     d="m 978.77787,58.382694 h -2.67903 v 8.147766 l -2.76041,0.240885 v -8.388651 h -2.89388 l 0.7194,-2.584629 h 7.61392 z m 4.21223,4.7884 v 3.385408 l -2.65299,0.253905 V 58.6366 l 2.48046,-0.305989 v 1.347653 q 0.30599,-0.602212 0.92122,-0.947263 0.59896,-0.348307 1.29232,-0.348307 0.21158,0 0.38736,0.01302 0.17253,0.0293 0.23763,0.04232 l -0.81054,2.545566 q -0.0293,-0.01302 -0.13346,-0.03906 -0.10743,-0.01302 -0.27995,-0.01302 -0.24089,0 -0.54687,0.07813 -0.54688,0.159504 -0.72266,0.585936 -0.17252,0.442707 -0.19857,1.162106 0.0261,0.133463 0.0261,0.413411 z m 5.89516,-5.133451 -1.74804,-1.347653 1.5332,-1.585282 1.85546,1.318356 z m -1.33463,0.572915 2.51952,-0.305989 v 8.173808 l -2.51952,0.185546 z m 8.98761,8.134745 v -4.749337 q 0,-1.503902 -0.96029,-1.503902 -0.94726,0 -0.94726,1.503902 v 4.560536 l -2.51952,0.214843 v -8.160787 l 2.34699,-0.279947 v 0.904946 q 0,-0.02604 0.22787,-0.263672 0.21159,-0.227864 0.63802,-0.439452 0.42643,-0.214843 1.10677,-0.253905 0.0684,0 0.13346,0 1.01237,0 1.722,0.719399 0.74544,0.771482 0.74544,1.904292 v 5.628241 z m 6.11986,-8.70766 -1.7481,-1.347653 1.5332,-1.585282 1.8555,1.318356 z m -1.3347,0.572915 2.5196,-0.305989 v 8.173808 l -2.5196,0.185546 z m 8.5873,2.291661 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.2395,1.933589 1.989,-4.746082 2.4934,0.602212 -4.9218,10.624973 -2.679,-0.361327 1.774,-3.385408 -3.1998,-6.878238 2.5455,-0.546873 z m 12.4805,-4.63866 v 5.826808 q 1.9075,0 2.7213,-0.8138 0.8138,-0.8138 0.8138,-2.119135 v -0.08138 q -0.042,-1.598304 -0.9472,-2.200516 -0.9213,-0.585936 -2.5879,-0.611977 z m 0.2278,8.333312 h -3.0924 V 55.798065 h 3.2519 q 1.7741,0 3.1185,0.598957 1.3477,0.598957 2.0801,1.787105 0.7226,1.201169 0.7357,2.932935 0,1.227211 -0.4818,2.252599 -0.4785,1.028643 -1.3053,1.722001 -0.8269,0.693357 -1.9597,1.067705 -1.1328,0.371093 -2.347,0.371093 z m 15.6771,-5.706366 -5.1335,3.225904 q 0.1075,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1726,0 0.4264,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3092,-0.211588 0.3092,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6152,0.40039 -0.4395,0.266926 -1.1719,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.1979,0 -2.2005,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.599,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3704,-1.559241 0.8822,-0.611977 1.9759,-0.73242 0.28,-0.02604 0.5469,-0.02604 0.7324,0 1.3867,0.237629 0.8659,0.348307 1.3867,0.839842 0.5176,0.507811 0.7585,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8659,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.332,-0.159505 -0.2539,-0.0944 -0.6283,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 13.5742,-2.958977 -1.5592,1.399736 q 0,-0.02604 -0.094,-0.133463 -0.1074,-0.0944 -0.2278,-0.185546 -0.1205,-0.0944 -0.3451,-0.188802 -0.2409,-0.09114 -0.5338,-0.09114 -0.3744,0 -0.6543,0.146484 -0.293,0.159504 -0.306,0.452472 0,0 0,0.02604 0,0.172526 0.2669,0.305989 0.267,0.133463 0.6934,0.214843 0.4264,0.07813 0.8789,0.159505 0.7617,0.146484 1.442,0.719399 0.6511,0.572915 0.6511,1.826167 0,0.02604 0,0.05534 -0.013,0.758461 -0.4916,1.386715 -0.4947,0.624998 -1.2792,0.973305 -0.7487,0.319009 -1.6146,0.319009 -0.068,0 -0.1335,0 -1.1198,-0.03906 -2.054,-0.520832 -0.9343,-0.465493 -1.1459,-0.680336 l 1.2924,-1.692704 q 0.2148,0.227864 0.7194,0.546873 0.4948,0.31901 1.136,0.31901 0,0 0.052,0 0.4525,0 0.7878,-0.185547 0.2799,-0.159504 0.2799,-0.426431 0,-0.02604 0,-0.06836 -0.042,-0.292968 -0.2669,-0.384114 -0.2279,-0.08138 -0.9343,-0.227864 -0.7194,-0.133463 -1.2272,-0.345051 -1.5071,-0.667316 -1.5071,-2.268874 0,-0.758462 0.4264,-1.373695 0.4134,-0.611977 1.1068,-0.960284 0.6803,-0.345051 1.4681,-0.371093 0.1074,0 0.2116,0 1.0416,0 1.9075,0.478515 0.9473,0.546873 1.0547,0.774737 z m 7.1321,7.304669 -2.8808,-3.971344 v 3.613272 l -2.5326,0.240885 V 55.798065 l 2.5326,-0.305989 v 6.425765 l 2.7344,-3.694652 2.4934,0.787759 -2.679,3.346345 3.0241,3.841137 z m 7.627,-5.960271 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.5358,-2.731113 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7063,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5338,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 12.1875,2.213536 q 0,0 0,-0.16276 0,-0.452472 -0.1758,-0.865883 -0.2246,-0.478514 -0.638,-0.784503 -0.4264,-0.296223 -0.9603,-0.348306 -0.1335,-0.01302 -0.2539,-0.01302 -0.4134,0 -0.8008,0.172525 -0.4915,0.227864 -0.7975,0.641275 -0.3223,0.426431 -0.3874,0.973305 -0.013,0.107421 -0.013,0.198567 0,0.735675 0.5339,1.334632 0.5859,0.693358 1.4388,0.706378 0.8138,0 1.4127,-0.546873 0.599,-0.546874 0.6413,-1.305336 z m -1.722,-4.453113 q 0.029,0 0.055,0 1.0645,0 2.0117,0.546873 0.9733,0.559895 1.5756,1.516924 0.5989,0.973304 0.6119,2.148432 0,1.132809 -0.5729,2.148432 -0.5729,1.012367 -1.5722,1.611324 -1.0026,0.611977 -2.1615,0.611977 h -0.026 q -0.6804,-0.01302 -1.2272,-0.305988 -0.5599,-0.279948 -0.7748,-0.465494 v 3.066399 l -2.5716,0.240884 V 58.529178 l 2.3861,-0.224609 v 0.960284 q 0.9603,-0.960284 2.2656,-0.986325 z m 9.5084,8.251932 V 55.798065 h 6.3998 l 0.5468,2.373041 h -4.1862 v 1.692704 h 3.0111 v 2.373041 h -3.0371 v 1.920568 h 4.5052 l -0.7064,2.373041 z m 13.0013,0.214843 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5196,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2279,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4264,-0.214843 1.1068,-0.253905 0.068,0 0.1334,0 1.0124,0 1.722,0.719399 0.7455,0.771482 0.7455,1.904292 v 5.628241 z m 7.3861,0.598957 -4.1081,-8.548155 2.5195,-0.465494 1.6146,3.746735 1.5885,-3.746735 2.4512,0.465494 z m 7.4283,-9.306617 -1.748,-1.347653 1.5332,-1.585282 1.8554,1.318356 z m -1.3346,0.572915 2.5195,-0.305989 v 8.173808 l -2.5195,0.185546 z m 7.4935,4.560536 v 3.385408 l -2.653,0.253905 V 58.6366 l 2.4804,-0.305989 v 1.347653 q 0.306,-0.602212 0.9213,-0.947263 0.5989,-0.348307 1.2923,-0.348307 0.2116,0 0.3873,0.01302 0.1726,0.0293 0.2377,0.04232 l -0.8106,2.545566 q -0.029,-0.01302 -0.1334,-0.03906 -0.1075,-0.01302 -0.28,-0.01302 -0.2409,0 -0.5469,0.07813 -0.5468,0.159504 -0.7226,0.585936 -0.1725,0.442707 -0.1986,1.162106 0.026,0.133463 0.026,0.413411 z m 7.9492,-4.999988 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7064,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5339,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 10.1335,6.227198 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.6381,-0.439452 0.4264,-0.214843 1.1067,-0.253905 0.068,0 0.1335,0 1.0124,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 v 5.628241 z m 14.6777,-0.214843 -2.4382,0.159505 v -4.892566 q 0,-0.585936 -0.1595,-0.973305 -0.1335,-0.319009 -0.5599,-0.319009 -0.081,0 -0.1758,0.01302 -0.5175,0.05208 -0.6771,0.413411 -0.1757,0.358072 -0.2018,0.960284 0.026,0.159505 0.026,0.397134 v 4.241526 l -2.4805,0.185546 v -4.853503 q 0,-1.370439 -0.7064,-1.370439 -0.078,0 -0.1725,0.02604 -0.5339,0.09115 -0.6673,0.439452 -0.1465,0.345052 -0.1465,1.201169 v 4.371735 l -2.5456,0.185546 v -8.131489 l 2.3731,-0.279948 v 0.80078 q 0,-0.04232 0.1855,-0.240885 0.1758,-0.201823 0.5339,-0.387369 0.3613,-0.185546 0.9603,-0.227864 0.1074,-0.01302 0.2148,-0.01302 0.3451,0 0.638,0.107422 0.3744,0.133463 0.586,0.305989 0.2018,0.188801 0.3483,0.374348 0.1464,0.198567 0.1464,0.240884 0.4525,-0.533852 0.9473,-0.774737 0.4915,-0.227864 1.2142,-0.240885 0,0 0.052,0 0.7324,0 1.3476,0.309244 0.6381,0.31901 0.9994,0.917966 0.3581,0.615233 0.3581,1.373695 z m 9.5344,-5.706366 -5.1334,3.225904 q 0.1074,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1725,0 0.4265,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3093,-0.211588 0.3093,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6153,0.40039 -0.4394,0.266926 -1.1718,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.198,0 -2.2006,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.5989,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3705,-1.559241 0.8821,-0.611977 1.9759,-0.73242 0.2799,-0.02604 0.5468,-0.02604 0.7325,0 1.3867,0.237629 0.8659,0.348307 1.3868,0.839842 0.5175,0.507811 0.7584,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8658,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.3321,-0.159505 -0.2539,-0.0944 -0.6282,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 11.5201,4.228505 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4265,-0.214843 1.1068,-0.253905 0.068,0 0.1335,0 1.0123,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 v 5.628241 z m 7.8255,-5.843084 v 2.268875 q 0,0.546873 0.1205,0.74544 0.1074,0.214844 0.4264,0.374348 0.1855,0.07813 0.6803,0.133464 0.2279,-0.01302 0.5469,-0.06836 0.306,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2018,0 -0.1465,0.01302 -0.3451,0.01302 -1.2532,0 -2.054,-0.49479 -1.4127,-0.810545 -1.4127,-2.545567 v -2.867831 h -1.3477 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4674,-1.012368 v 2.571608 h 1.6276 v 2.239578 z"
+     id="path1"
+     style="font-size:13.3333px;font-family:Kabel;-inkscape-font-specification:Kabel;text-align:center;text-anchor:middle;opacity:0.321;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:0"
+     aria-label="Trinity Desktop Environment" /><path
+     d="m 977.33184,57.159134 h -2.67903 V 65.3069 l -2.76041,0.240885 v -8.388651 h -2.89388 l 0.7194,-2.584629 h 7.61392 z m 4.21223,4.7884 v 3.385408 l -2.65299,0.253905 V 57.41304 l 2.48046,-0.305989 v 1.347653 q 0.30599,-0.602212 0.92122,-0.947263 0.59896,-0.348307 1.29232,-0.348307 0.21158,0 0.38736,0.01302 0.17253,0.0293 0.23763,0.04232 l -0.81054,2.545566 q -0.0293,-0.01302 -0.13346,-0.03906 -0.10743,-0.01302 -0.27995,-0.01302 -0.24089,0 -0.54687,0.07813 -0.54688,0.159504 -0.72266,0.585936 -0.17252,0.442707 -0.19857,1.162106 0.0261,0.133463 0.0261,0.413411 z m 5.89516,-5.133451 -1.74804,-1.347653 1.5332,-1.585282 1.85546,1.318356 z m -1.33463,0.572915 2.51952,-0.305989 v 8.173808 l -2.51952,0.185546 z m 8.98761,8.134745 v -4.749337 q 0,-1.503902 -0.96029,-1.503902 -0.94726,0 -0.94726,1.503902 v 4.560536 l -2.51952,0.214843 v -8.160787 l 2.34699,-0.279947 v 0.904946 q 0,-0.02604 0.22787,-0.263672 0.21159,-0.227864 0.63802,-0.439452 0.42643,-0.214843 1.10677,-0.253905 0.0684,0 0.13346,0 1.01237,0 1.722,0.719399 0.74544,0.771482 0.74544,1.904292 V 65.3069 Z m 6.11979,-8.70766 -1.74806,-1.347653 1.53316,-1.585282 1.8555,1.318356 z m -1.33465,0.572915 2.51955,-0.305989 v 8.173808 l -2.51955,0.185546 z m 8.58725,2.291661 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.2395,1.933589 1.989,-4.746082 2.4934,0.602212 -4.9218,10.624973 -2.679,-0.361327 1.774,-3.385408 -3.1998,-6.878238 2.5455,-0.546873 z m 12.4805,-4.63866 v 5.826808 q 1.9075,0 2.7213,-0.8138 0.8138,-0.8138 0.8138,-2.119135 v -0.08138 q -0.042,-1.598304 -0.9472,-2.200516 -0.9213,-0.585936 -2.5879,-0.611977 z m 0.2278,8.333312 H 1025.32 V 54.574505 h 3.2519 q 1.7741,0 3.1185,0.598957 1.3477,0.598957 2.0801,1.787105 0.7226,1.201169 0.7357,2.932935 0,1.227211 -0.4818,2.252599 -0.4785,1.028643 -1.3053,1.722001 -0.8269,0.693357 -1.9597,1.067705 -1.1328,0.371093 -2.347,0.371093 z m 15.6771,-5.706366 -5.1335,3.225904 q 0.1075,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1726,0 0.4264,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3092,-0.211588 0.3092,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6152,0.40039 -0.4395,0.266926 -1.1719,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.1979,0 -2.2005,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.599,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3704,-1.559241 0.8822,-0.611977 1.9759,-0.73242 0.28,-0.02604 0.5469,-0.02604 0.7324,0 1.3867,0.237629 0.8659,0.348307 1.3867,0.839842 0.5176,0.507811 0.7585,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8659,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.332,-0.159505 -0.2539,-0.0944 -0.6283,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 13.5742,-2.958977 -1.5592,1.399736 q 0,-0.02604 -0.094,-0.133463 -0.1074,-0.0944 -0.2278,-0.185546 -0.1205,-0.0944 -0.3451,-0.188802 -0.2409,-0.09114 -0.5338,-0.09114 -0.3744,0 -0.6543,0.146484 -0.293,0.159504 -0.306,0.452472 0,0 0,0.02604 0,0.172526 0.2669,0.305989 0.267,0.133463 0.6934,0.214843 0.4264,0.07813 0.8789,0.159505 0.7617,0.146484 1.442,0.719399 0.6511,0.572915 0.6511,1.826167 0,0.02604 0,0.05534 -0.013,0.758461 -0.4916,1.386715 -0.4947,0.624998 -1.2792,0.973305 -0.7487,0.319009 -1.6146,0.319009 -0.068,0 -0.1335,0 -1.1198,-0.03906 -2.054,-0.520832 -0.9343,-0.465493 -1.1459,-0.680336 l 1.2924,-1.692704 q 0.2148,0.227864 0.7194,0.546873 0.4948,0.31901 1.136,0.31901 0,0 0.052,0 0.4525,0 0.7878,-0.185547 0.2799,-0.159504 0.2799,-0.426431 0,-0.02604 0,-0.06836 -0.042,-0.292968 -0.2669,-0.384114 -0.2279,-0.08138 -0.9343,-0.227864 -0.7194,-0.133463 -1.2272,-0.345051 -1.5071,-0.667316 -1.5071,-2.268874 0,-0.758462 0.4264,-1.373695 0.4134,-0.611977 1.1068,-0.960284 0.6803,-0.345051 1.4681,-0.371093 0.1074,0 0.2116,0 1.0416,0 1.9075,0.478515 0.9473,0.546873 1.0547,0.774737 z m 7.1321,7.304669 -2.8808,-3.971344 v 3.613272 l -2.5326,0.240885 V 54.574505 l 2.5326,-0.305989 v 6.425765 l 2.7344,-3.694652 2.4934,0.787759 -2.679,3.346345 3.0241,3.841137 z m 7.627,-5.960271 v 2.268875 q 0,0.546873 0.1204,0.74544 0.1074,0.214844 0.4264,0.374348 0.1856,0.07813 0.6804,0.133464 0.2278,-0.01302 0.5469,-0.06836 0.3059,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2019,0 -0.1464,0.01302 -0.345,0.01302 -1.2533,0 -2.054,-0.49479 -1.4128,-0.810545 -1.4128,-2.545567 v -2.867831 h -1.3476 l 0.6412,-2.239578 h 0.7845 v -1.55924 l 2.4675,-1.012368 v 2.571608 h 1.6276 v 2.239578 z m 7.5358,-2.731113 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7063,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5338,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 12.1875,2.213536 q 0,0 0,-0.16276 0,-0.452472 -0.1758,-0.865883 -0.2246,-0.478514 -0.638,-0.784503 -0.4264,-0.296223 -0.9603,-0.348306 -0.1335,-0.01302 -0.2539,-0.01302 -0.4134,0 -0.8008,0.172525 -0.4915,0.227864 -0.7975,0.641275 -0.3223,0.426431 -0.3874,0.973305 -0.013,0.107421 -0.013,0.198567 0,0.735675 0.5339,1.334632 0.5859,0.693358 1.4388,0.706378 0.8138,0 1.4127,-0.546873 0.599,-0.546874 0.6413,-1.305336 z m -1.722,-4.453113 q 0.029,0 0.055,0 1.0645,0 2.0117,0.546873 0.9733,0.559895 1.5756,1.516924 0.5989,0.973304 0.6119,2.148432 0,1.132809 -0.5729,2.148432 -0.5729,1.012367 -1.5722,1.611324 -1.0026,0.611977 -2.1615,0.611977 h -0.026 q -0.6804,-0.01302 -1.2272,-0.305988 -0.5599,-0.279948 -0.7748,-0.465494 v 3.066399 l -2.5716,0.240884 V 57.305618 l 2.3861,-0.224609 v 0.960284 q 0.9603,-0.960284 2.2656,-0.986325 z m 9.5084,8.251932 V 54.574505 h 6.3998 l 0.5468,2.373041 h -4.1862 v 1.692704 h 3.0111 v 2.373041 h -3.0371 v 1.920568 h 4.5052 l -0.7064,2.373041 z m 13.0013,0.214843 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5196,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2279,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4264,-0.214843 1.1068,-0.253905 0.068,0 0.1334,0 1.0124,0 1.722,0.719399 0.7455,0.771482 0.7455,1.904292 V 65.3069 Z m 7.3861,0.598957 -4.1081,-8.548155 2.5195,-0.465494 1.6146,3.746735 1.5885,-3.746735 2.4512,0.465494 z m 7.4283,-9.306617 -1.748,-1.347653 1.5332,-1.585282 1.8554,1.318356 z m -1.3346,0.572915 2.5195,-0.305989 v 8.173808 l -2.5195,0.185546 z m 7.4935,4.560536 v 3.385408 l -2.653,0.253905 V 57.41304 l 2.4804,-0.305989 v 1.347653 q 0.306,-0.602212 0.9213,-0.947263 0.5989,-0.348307 1.2923,-0.348307 0.2116,0 0.3873,0.01302 0.1726,0.0293 0.2377,0.04232 l -0.8106,2.545566 q -0.029,-0.01302 -0.1334,-0.03906 -0.1075,-0.01302 -0.28,-0.01302 -0.2409,0 -0.5469,0.07813 -0.5468,0.159504 -0.7226,0.585936 -0.1725,0.442707 -0.1986,1.162106 0.026,0.133463 0.026,0.413411 z m 7.9492,-4.999988 q 0,0 0.1041,0 1.2533,0 2.2396,0.533853 1.0286,0.559894 1.6146,1.54622 0.5729,0.986326 0.5729,2.213536 v 0.02604 q -0.013,1.132809 -0.5599,2.080073 -0.5469,0.947263 -1.4941,1.533199 -0.944,0.585936 -2.0378,0.667316 -0.1465,0.01302 -0.293,0.01302 -1.0286,0 -1.9759,-0.468749 -1.1067,-0.530598 -1.7578,-1.490882 -0.6673,-0.960284 -0.7064,-2.174474 0,-0.08138 0,-0.159504 0,-1.067706 0.5339,-2.02799 0.5729,-1.012367 1.5853,-1.637366 0.9993,-0.615232 2.1745,-0.654295 z m 0.1041,2.346999 q -0.5306,0.02604 -0.9603,0.279948 -0.4264,0.266926 -0.664,0.719399 -0.2539,0.452473 -0.2539,0.947263 0,0.784503 0.5729,1.344398 0.5729,0.559894 1.3607,0.559894 0.8138,-0.02604 1.3737,-0.585936 0.5468,-0.546873 0.5468,-1.344398 0,-0.82682 -0.5761,-1.386715 -0.573,-0.533853 -1.3705,-0.533853 -0.016,0 -0.029,0 z m 10.1335,6.227198 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9473,0 -0.9473,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.6381,-0.439452 0.4264,-0.214843 1.1067,-0.253905 0.068,0 0.1335,0 1.0124,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 V 65.3069 Z m 14.6777,-0.214843 -2.4382,0.159505 v -4.892566 q 0,-0.585936 -0.1595,-0.973305 -0.1335,-0.319009 -0.5599,-0.319009 -0.081,0 -0.1758,0.01302 -0.5175,0.05208 -0.6771,0.413411 -0.1757,0.358072 -0.2018,0.960284 0.026,0.159505 0.026,0.397134 V 65.3069 l -2.4805,0.185546 v -4.853503 q 0,-1.370439 -0.7064,-1.370439 -0.078,0 -0.1725,0.02604 -0.5339,0.09115 -0.6673,0.439452 -0.1465,0.345052 -0.1465,1.201169 V 65.3069 l -2.5456,0.185546 v -8.131489 l 2.3731,-0.279948 v 0.80078 q 0,-0.04232 0.1855,-0.240885 0.1758,-0.201823 0.5339,-0.387369 0.3613,-0.185546 0.9603,-0.227864 0.1074,-0.01302 0.2148,-0.01302 0.3451,0 0.638,0.107422 0.3744,0.133463 0.586,0.305989 0.2018,0.188801 0.3483,0.374348 0.1464,0.198567 0.1464,0.240884 0.4525,-0.533852 0.9473,-0.774737 0.4915,-0.227864 1.2142,-0.240885 0,0 0.052,0 0.7324,0 1.3476,0.309244 0.6381,0.31901 0.9994,0.917966 0.3581,0.615233 0.3581,1.373695 z m 9.5344,-5.706366 -5.1334,3.225904 q 0.1074,0.133463 0.4948,0.319009 0.319,0.16276 0.9212,0.16276 0.078,0 0.1725,0 0.4265,-0.04232 0.8659,-0.227864 0.4264,-0.185546 0.7324,-0.400389 0.3093,-0.211588 0.3093,-0.240885 l 1.2793,1.95963 q -0.1758,0.133463 -0.6153,0.40039 -0.4394,0.266926 -1.1718,0.546873 -0.7487,0.279948 -1.5723,0.292968 -0.029,0 -0.055,0 -1.198,0 -2.2006,-0.546873 -1.0384,-0.543619 -1.6406,-1.516923 -0.5989,-0.973305 -0.612,-2.174474 0,-0.02604 0,-0.05534 0,-1.038408 0.4818,-1.972651 0.4915,-0.947263 1.3705,-1.559241 0.8821,-0.611977 1.9759,-0.73242 0.2799,-0.02604 0.5468,-0.02604 0.7325,0 1.3867,0.237629 0.8659,0.348307 1.3868,0.839842 0.5175,0.507811 0.7584,0.89518 0.2409,0.387369 0.319,0.572915 z m -5.8658,1.692704 2.9199,-1.826167 q -0.094,-0.06836 -0.3321,-0.159505 -0.2539,-0.0944 -0.6282,-0.0944 -0.8268,0 -1.3867,0.628254 -0.5729,0.638019 -0.5729,1.451818 z m 11.5201,4.228505 v -4.749337 q 0,-1.503902 -0.9603,-1.503902 -0.9472,0 -0.9472,1.503902 v 4.560536 l -2.5195,0.214843 v -8.160787 l 2.347,-0.279947 v 0.904946 q 0,-0.02604 0.2278,-0.263672 0.2116,-0.227864 0.638,-0.439452 0.4265,-0.214843 1.1068,-0.253905 0.068,0 0.1335,0 1.0123,0 1.722,0.719399 0.7454,0.771482 0.7454,1.904292 V 65.3069 Z m 7.8255,-5.843084 v 2.268875 q 0,0.546873 0.1205,0.74544 0.1074,0.214844 0.4264,0.374348 0.1855,0.07813 0.6803,0.133464 0.2279,-0.01302 0.5469,-0.06836 0.306,-0.03906 0.4264,-0.0651 l -0.7324,2.506504 q -0.055,0 -0.2018,0 -0.1465,0.01302 -0.3451,0.01302 -1.2532,0 -2.054,-0.49479 -1.4127,-0.810545 -1.4127,-2.545567 v -2.867831 h -1.3477 l 0.6413,-2.239578 h 0.7845 v -1.55924 l 2.4674,-1.012368 v 2.571608 h 1.6276 v 2.239578 z"
+     id="text1"
+     style="font-size:13.3333px;font-family:Kabel;-inkscape-font-specification:Kabel;text-align:center;text-anchor:middle;fill:#ffffff;fill-rule:evenodd;stroke-width:0"
+     aria-label="Trinity Desktop Environment"
+     sodipodi:insensitive="true" /><g
+     style="display:inline;overflow:visible"
+     id="g2"
+     transform="matrix(0.34306949,0,0,0.34306949,1190.3687,29.408192)"><path
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       fill="#0068C6"
+       d="M 24.621676,13.180258 H 164.80568 c 7.057,0 12.816,5.76 12.816,12.816 V 165.24427 c 0,7.057 -5.76,12.889 -12.816,12.889 H 24.621676 c -7.057,0 -12.816,-5.832 -12.816,-12.889 V 25.996258 c -10e-4,-7.056 5.759,-12.816 12.816,-12.816 z m -1.584,-7.4879995 H 166.38968 c 10.297,0 18.721,8.4239995 18.721,18.7199995 V 166.82827 c 0,10.297 -8.424,18.721 -18.721,18.721 H 23.037676 c -10.297,-0.001 -18.721,-8.424 -18.721,-18.721 V 24.412258 c 0,-10.296 8.424,-18.7199995 18.721,-18.7199995 z"
+       id="path2"
+       style="display:inline;overflow:visible;opacity:0.321;fill:#000000;fill-opacity:1;fill-rule:evenodd"
+       sodipodi:insensitive="true" /><path
+       style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd"
+       d="m 20.305,7.488 h 140.184 c 7.057,0 12.816,5.76 12.816,12.816 v 139.248 c 0,7.057 -5.76,12.889 -12.816,12.889 H 20.305 c -7.057,0 -12.816,-5.832 -12.816,-12.889 V 20.304 C 7.488,13.248 13.248,7.488 20.305,7.488 Z"
+       id="path1575"
+       sodipodi:insensitive="true" /><path
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       fill="#0068C6"
+       d="m 20.305,7.488 h 140.184 c 7.057,0 12.816,5.76 12.816,12.816 v 139.248 c 0,7.057 -5.76,12.889 -12.816,12.889 H 20.305 c -7.057,0 -12.816,-5.832 -12.816,-12.889 V 20.304 C 7.488,13.248 13.248,7.488 20.305,7.488 Z M 18.721,0 h 143.352 c 10.297,0 18.721,8.424 18.721,18.72 v 142.416 c 0,10.297 -8.424,18.721 -18.721,18.721 H 18.721 C 8.424,179.856 0,171.433 0,161.136 V 18.72 C 0,8.424 8.424,0 18.721,0 Z"
+       id="path1065"
+       style="display:inline;fill:#0068c6;fill-opacity:1;fill-rule:evenodd" /><path
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       fill="#0068C6"
+       d="m 20.592,10.296 h 139.609 c 5.615,0 10.223,4.608 10.223,10.296 v 138.745 c 0,5.615 -4.607,10.223 -10.223,10.223 H 20.592 c -5.615,0 -10.223,-4.607 -10.223,-10.223 V 20.592 c 0,-5.688 4.608,-10.296 10.223,-10.296 z"
+       id="path1067"
+       style="display:inline;fill:#0068c6;fill-opacity:1;fill-rule:evenodd" /><g
+       id="g1-7"
+       transform="matrix(0.96738749,0,0,0.96738749,3.8200679,2.9272463)"
+       style="display:inline"
+       sodipodi:insensitive="true"><path
+         id="path1088"
+         style="display:inline;fill:#ffffff;fill-rule:evenodd;stroke-width:0.992406"
+         d="m 71.292716,65.489408 c -9.948182,7.792163 -16.677482,17.154819 -16.677482,30.751146 0,23.369376 20.219055,35.177586 32.695313,35.320636 0.713897,0.008 1.420572,-0.007 2.123047,-0.0365 0.523668,0.0203 1.04823,0.0365 1.578125,0.0365 10.308751,0 32.695311,-10.6605 32.695311,-35.320636 0,-13.596327 -6.4888,-22.358388 -16.45028,-30.921551 v 4.461903 c 9.13883,7.485805 13.47675,14.366141 13.32528,26.834744 -0.0773,19.37996 -15.6746,33.13478 -32.453124,32.83538 C 77.025588,129.40002 57.828128,118.64394 57.740234,96.61565 57.588762,84.147047 64.230343,75.023399 71.292716,69.951311 Z"
+         sodipodi:nodetypes="csscssccccccc" /><path
+         d="m 125.80993,39.867975 h -23.94949 v 72.837845 l -24.676977,2.15342 V 39.867975 H 51.31337 l 6.431148,-23.105573 h 68.065412 z"
+         id="text1-7"
+         style="font-size:141.733px;font-family:Kabel;-inkscape-font-specification:Kabel;text-align:center;text-anchor:middle;display:inline;fill:#ffffff;stroke-width:0.735031"
+         aria-label="T" /><path
+         id="Gear_foreground"
+         style="display:inline;opacity:1;fill:#ffffff;stroke-width:0.840979"
+         d="m 47.828985,42.330183 c -0.271635,0.02802 -0.534651,0.148237 -0.739144,0.353146 l -9.433093,9.433092 c -0.396673,0.397901 -0.471817,1.014682 -0.180679,1.496351 l 11.046069,18.191102 c -1.959549,3.294099 -3.528177,6.846513 -4.648386,10.592725 l -20.280407,4.218033 c -0.564214,0.116618 -0.97074,0.615958 -0.97074,1.194123 v 13.342335 c 0,0.56422 0.383528,1.05287 0.929676,1.18591 l 19.680881,4.80936 c 1.051223,4.33712 2.676112,8.45167 4.825772,12.23197 l -4.875048,7.43412 v 0 l -4.198325,6.40257 -2.317621,3.53639 c -0.119026,0.18147 0.01323,-0.20472 0,0 -0.276009,0.47693 -0.01494,1.38935 0.377732,1.78119 l 9.065218,9.34082 c 0.411458,0.40899 0.975764,0.50873 1.461134,0.19255 l 9.049456,-5.54925 8.979758,-5.45158 c 3.494024,2.01588 7.261939,3.61016 11.246455,4.68452 l 0.317008,1.29431 3.897742,18.73642 c 0.116619,0.56585 0.61637,0.97403 1.194131,0.97403 h 0.680007 12.662321 0.680014 c 0.577754,0 1.077505,-0.40818 1.194124,-0.97403 l 3.89774,-18.73642 0.31701,-1.29431 c 3.98451,-1.07436 7.75242,-2.66864 11.24645,-4.68452 l 8.97976,5.45158 8.97646,5.88686 c 0.48537,0.31618 1.12267,0.2513 1.53413,-0.15769 l 9.43472,-9.4331 c 0.39269,-0.39185 0.46491,-0.99479 0.1889,-1.4717 -0.0133,-0.20474 -0.0599,-0.40821 -0.17904,-0.58968 l -2.3324,-3.5561 -4.18353,-6.38286 v 0 l -4.87506,-7.43412 c 2.14967,-3.7803 3.77292,-7.89485 4.82413,-12.23197 L 154.9832,102.337 c 0.54615,-0.13304 0.92967,-0.62169 0.92967,-1.18591 V 87.808755 c 0,-0.578165 -0.40653,-1.077505 -0.97074,-1.194123 l -20.2804,-4.218033 c -1.12022,-3.746212 -2.68884,-7.298626 -4.64839,-10.592725 L 141.0594,53.612772 c 0.29115,-0.481669 0.216,-1.091879 -0.18066,-1.489781 l -9.4331,-9.433092 c -0.40899,-0.409817 -1.0496,-0.476332 -1.53414,-0.159326 l -18.00548,11.809843 c -0.004,0.0025 -0.008,0.0058 -0.0116,0.0082 -2.10478,-1.137474 -2.51451,-1.311336 -4.65028,-2.21553 l -2e-5,10.194722 c 12.35673,7.439871 19.80338,18.353227 20.23141,33.66898 0.36722,13.140182 -6.63663,24.739182 -16.74075,31.618842 -0.0807,0.055 -0.1618,0.10989 -0.24309,0.16425 -1.41439,0.94725 -2.89718,1.79924 -4.43649,2.55415 -0.12206,0.0597 -0.24352,0.12054 -0.36629,0.17903 -0.46509,0.22194 -0.9357,0.43549 -1.41094,0.63895 -0.2055,0.0878 -0.41355,0.17031 -0.62089,0.2546 -0.77276,0.31483 -1.55837,0.60251 -2.3554,0.86725 -0.27511,0.0912 -0.54834,0.18601 -0.8262,0.27103 -0.39661,0.12169 -0.798678,0.2326 -1.200682,0.34164 -0.375971,0.10163 -0.754516,0.19713 -1.134992,0.28745 -0.350555,0.0836 -0.70028,0.16926 -1.05451,0.24308 -0.686928,0.14251 -1.379526,0.26944 -2.079455,0.37451 -0.300742,0.0455 -0.60532,0.0767 -0.908324,0.11498 -0.510215,0.0642 -1.022758,0.12207 -1.539053,0.16589 -0.298109,0.0255 -0.596799,0.0487 -0.896827,0.0674 -0.752323,0.0462 -1.508111,0.0785 -2.271629,0.0805 -0.0407,1.5e-4 -0.08082,0.003 -0.121545,0.003 -0.04129,-1e-5 -0.08191,-0.003 -0.123196,-0.003 -0.763515,-0.002 -1.519304,-0.0343 -2.271627,-0.0805 -0.30002,-0.0187 -0.598719,-0.0417 -0.89682,-0.0674 -0.516295,-0.0438 -1.028845,-0.10175 -1.53906,-0.16589 -0.303004,-0.0384 -0.607582,-0.0695 -0.908323,-0.11498 -0.699932,-0.10507 -1.392519,-0.23201 -2.079457,-0.37451 -0.354228,-0.0739 -0.70395,-0.15951 -1.054511,-0.24308 -0.380476,-0.0903 -0.759018,-0.18582 -1.134987,-0.28745 -0.401995,-0.10903 -0.804078,-0.21995 -1.200703,-0.34164 -0.277853,-0.085 -0.551077,-0.17989 -0.826196,-0.27103 -0.797028,-0.26474 -1.58263,-0.55242 -2.355397,-0.86725 -0.207334,-0.0843 -0.415384,-0.16678 -0.620877,-0.2546 -0.475239,-0.20346 -0.945851,-0.41701 -1.410945,-0.63895 -0.122775,-0.0585 -0.244229,-0.11927 -0.366281,-0.17903 -1.53932,-0.75491 -3.022117,-1.6069 -4.4365,-2.55414 -0.08125,-0.0544 -0.162243,-0.10927 -0.243094,-0.16425 C 57.696437,120.73601 50.702679,109.13731 51.059817,95.99683 51.483544,80.406533 59.388252,69.242831 71.2626,62.3083 L 71.22349,52.14915 c -2.025548,0.880108 -2.600677,1.103419 -4.580896,2.192909 -0.0043,-0.0025 -0.0075,-0.0057 -0.01152,-0.0082 L 48.623972,42.524003 c -0.242279,-0.158505 -0.523358,-0.221846 -0.794987,-0.19382 z"
+         sodipodi:nodetypes="sccccccssccccccccccccccccsccsccccccccccccccccsscccccccccccsscccccccccccccccsccccccccccccccscscccccs" /></g></g><path
      inkscape:connector-curvature="0"
+     d="m 1246.0222,29.455445 c 3.5415,0 6.4252,2.893739 6.4252,6.447707 l -0.074,7.020695 c -1.4071,0.414292 -10.1296,0.704463 -13.0796,1.197106 -3.4551,1.414602 -5.7873,2.732338 -7.8069,3.13768 -2.8836,0.578745 -6.2799,1.783527 -8.1468,3.656986 -2.6656,2.674876 -4.7881,2.511128 -7.2523,4.983988 -2.4433,2.451826 -5.475,3.153048 -9.4422,3.949295 -4.7573,0.954806 -10.997,1.753522 -15.4064,0.86854 -0.3198,-0.06418 -0.5361,-0.105653 -0.8359,-0.162754 V 35.903152 c 0,-3.553968 2.8992,-6.447699 6.4251,-6.447707 z"
+     style="display:inline;overflow:visible;fill:url(#linearGradient10239-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.402143"
      id="path2042-9"
-     style="fill:url(#linearGradient3240);fill-rule:evenodd"
-     d="m 1245.6994,29.09339 c 3.5181,0 6.3827,2.86003 6.3827,6.37268 l -0.073,6.9389 c -1.3977,0.40946 -10.0625,0.69628 -12.9928,1.18316 -3.4323,1.39814 -5.7491,2.70053 -7.7554,3.10115 -2.8645,0.572 -6.2384,1.76277 -8.0929,3.61441 -2.6478,2.64375 -4.7564,2.48189 -7.2042,4.92584 -2.4271,2.42328 -5.4387,3.11633 -9.3795,3.9033 -4.7258,0.94369 -10.924,1.73309 -15.3043,0.85842 -0.3177,-0.0634 -0.5326,-0.10442 -0.8304,-0.16086 V 35.46575 c 0,-3.5126 2.88,-6.37268 6.3826,-6.37268 h 48.868 z" />
-</svg>
+     sodipodi:nodetypes="ccccccccccccc" /></svg>
diff --git a/pics/wallpapers/Trinity4.png b/pics/wallpapers/Trinity4.png
index 00b1397cf..28d4b070d 100644..100755
--- a/pics/wallpapers/Trinity4.png
+++ b/pics/wallpapers/Trinity4.png
diff --git a/pics/wallpapers/andes-venezolanos.png b/pics/wallpapers/andes-venezolanos.png
index 19a626502..a31bbee4a 100644
--- a/pics/wallpapers/andes-venezolanos.png
+++ b/pics/wallpapers/andes-venezolanos.png
diff --git a/pics/wallpapers/andes-venezolanos.svgz b/pics/wallpapers/andes-venezolanos.svgz
index 606709785..6eb039010 100644
--- a/pics/wallpapers/andes-venezolanos.svgz
+++ b/pics/wallpapers/andes-venezolanos.svgz
diff --git a/pics/wallpapers/aurora.png b/pics/wallpapers/aurora.png
index c245f41e9..a5eff6be6 100644
--- a/pics/wallpapers/aurora.png
+++ b/pics/wallpapers/aurora.png
diff --git a/pics/wallpapers/aurora.svgz b/pics/wallpapers/aurora.svgz
index 63182be89..61fe467d5 100644
--- a/pics/wallpapers/aurora.svgz
+++ b/pics/wallpapers/aurora.svgz
diff --git a/pics/wallpapers/default_gears.jpg b/pics/wallpapers/default_gears.jpg
index cb54eff5d..84fb716b5 100644
--- a/pics/wallpapers/default_gears.jpg
+++ b/pics/wallpapers/default_gears.jpg
diff --git a/pics/wallpapers/konqui.png b/pics/wallpapers/konqui.png
index 68bc01cc7..919f8a5c3 100644
--- a/pics/wallpapers/konqui.png
+++ b/pics/wallpapers/konqui.png
diff --git a/pics/wallpapers/konqui.svgz b/pics/wallpapers/konqui.svgz
index 2e006bd27..60e176b3e 100644..100755
--- a/pics/wallpapers/konqui.svgz
+++ b/pics/wallpapers/konqui.svgz
diff --git a/pics/wallpapers/lineart.png b/pics/wallpapers/lineart.png
new file mode 100644
index 000000000..048c3c287
--- /dev/null
+++ b/pics/wallpapers/lineart.png
diff --git a/pics/wallpapers/lineart.svgz b/pics/wallpapers/lineart.svgz
index f3fa630d2..405cfa621 100644
--- a/pics/wallpapers/lineart.svgz
+++ b/pics/wallpapers/lineart.svgz
diff --git a/pics/wallpapers/moon.svgz b/pics/wallpapers/moon.svgz
index ab7759644..220379071 100644
--- a/pics/wallpapers/moon.svgz
+++ b/pics/wallpapers/moon.svgz
diff --git a/starttde b/starttde
index 66360e228..0c745a548 100755
--- a/starttde
+++ b/starttde
@@ -279,6 +279,8 @@ if [ "$XDG_CONFIG_DIRS" != "" ]; then
   export XDG_CONFIG_DIRS
 fi
 
+echo "[starttde] XDG_CONFIG_DIRS: $XDG_CONFIG_DIRS" 1>&2
+
 # Explicitly set $XDG_DATA_DIRS only when Trinity is not installed in /usr.
 # Explicitly declaring $XDG_DATA_DIRS will override the default search path of /usr/share.
 # Explicitly declaring $XDG_DATA_DIRS will override $TDEDIRS, which must then be
diff --git a/tdedebugdialog/kabstractdebugdialog.cpp b/tdedebugdialog/kabstractdebugdialog.cpp
index 10c0c2a00..c1e579939 100644
--- a/tdedebugdialog/kabstractdebugdialog.cpp
+++ b/tdedebugdialog/kabstractdebugdialog.cpp
@@ -64,16 +64,16 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
   pApplyButton->setFixedWidth( w4 );
   pCancelButton->setFixedWidth( w4 );
 
-  connect( pHelpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowHelp() ) );
-  connect( pOKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
-  connect( pApplyButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotApply() ) );
-  connect( pCancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
+  connect( pHelpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotShowHelp() ) );
+  connect( pOKButton, TQ_SIGNAL( clicked() ), TQ_SLOT( accept() ) );
+  connect( pApplyButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotApply() ) );
+  connect( pCancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
 }
 
 void KAbstractDebugDialog::slotShowHelp()
 {
-  if (kapp)
-    kapp->invokeHelp();
+  if (tdeApp)
+    tdeApp->invokeHelp();
 }
 
 void KAbstractDebugDialog::slotApply()
diff --git a/tdedebugdialog/main.cpp b/tdedebugdialog/main.cpp
index f1c463dce..07f5c3c73 100644
--- a/tdedebugdialog/main.cpp
+++ b/tdedebugdialog/main.cpp
@@ -21,11 +21,11 @@
 #include "tdelistdebugdialog.h"
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqtextstream.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdeconfig.h>
 
 #include <tqfile.h>
@@ -84,8 +84,8 @@ int main(int argc, char ** argv)
   data.addAuthor("David Faure", I18N_NOOP("Original maintainer/developer"), "faure@kde.org");
   TDECmdLineArgs::init( argc, argv, &data );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KUniqueApplication::addCmdLineOptions();
-  KUniqueApplication app;
+  TDEUniqueApplication::addCmdLineOptions();
+  TDEUniqueApplication app;
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   TQStringList areaList ( readAreaList() );
diff --git a/tdedebugdialog/tdedebugdialog.cpp b/tdedebugdialog/tdedebugdialog.cpp
index b5ced18a0..1f1df1239 100644
--- a/tdedebugdialog/tdedebugdialog.cpp
+++ b/tdedebugdialog/tdedebugdialog.cpp
@@ -79,8 +79,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pInfoLabel1 = new TQLabel( i18n("Output to:"), pInfoGroup );
   vbox->addWidget( pInfoLabel1 );
   pInfoCombo = new TQComboBox( false, pInfoGroup );
-  connect(pInfoCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pInfoCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pInfoCombo );
   pInfoCombo->insertStringList( destList );
   pInfoLabel2 = new TQLabel( i18n("Filename:"), pInfoGroup );
@@ -104,8 +104,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pWarnLabel1 = new TQLabel( i18n("Output to:"), pWarnGroup );
   vbox->addWidget( pWarnLabel1 );
   pWarnCombo = new TQComboBox( false, pWarnGroup );
-  connect(pWarnCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pWarnCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pWarnCombo );
   pWarnCombo->insertStringList( destList );
   pWarnLabel2 = new TQLabel( i18n("Filename:"), pWarnGroup );
@@ -129,8 +129,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pErrorLabel1 = new TQLabel( i18n("Output to:"), pErrorGroup );
   vbox->addWidget( pErrorLabel1 );
   pErrorCombo = new TQComboBox( false, pErrorGroup );
-  connect(pErrorCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pErrorCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pErrorCombo );
   pErrorCombo->insertStringList( destList );
   pErrorLabel2 = new TQLabel( i18n("Filename:"), pErrorGroup );
@@ -154,8 +154,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
   pFatalLabel1 = new TQLabel( i18n("Output to:"), pFatalGroup );
   vbox->addWidget( pFatalLabel1 );
   pFatalCombo = new TQComboBox( false, pFatalGroup );
-  connect(pFatalCombo, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotDestinationChanged(int)));
+  connect(pFatalCombo, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotDestinationChanged(int)));
   vbox->addWidget( pFatalCombo );
   pFatalCombo->insertStringList( destList );
   pFatalLabel2 = new TQLabel( i18n("Filename:"), pFatalGroup );
@@ -179,8 +179,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
 
   buildButtons( topLayout );
 
-  connect( pDebugAreas, TQT_SIGNAL( activated( const TQString &) ),
-           TQT_SLOT( slotDebugAreaChanged( const TQString & ) ) );
+  connect( pDebugAreas, TQ_SIGNAL( activated( const TQString &) ),
+           TQ_SLOT( slotDebugAreaChanged( const TQString & ) ) );
 
   // Get initial values ("initial" is understood by the slot)
   slotDebugAreaChanged( "0 initial" );
@@ -244,7 +244,7 @@ void TDEDebugDialog::save()
   pConfig->writeEntry( "AbortFatal", pAbortFatal->isChecked() );
 
   TQByteArray data;
-  if (!kapp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
+  if (!tdeApp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
   {
     kdError() << "Unable to send DCOP message" << endl;
   }
diff --git a/tdedebugdialog/tdelistdebugdialog.cpp b/tdedebugdialog/tdelistdebugdialog.cpp
index d447b3747..c25cb18f6 100644
--- a/tdedebugdialog/tdelistdebugdialog.cpp
+++ b/tdedebugdialog/tdelistdebugdialog.cpp
@@ -40,8 +40,8 @@ TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent,
 
   m_incrSearch = new KLineEdit( this );
   lay->addWidget( m_incrSearch );
-  connect( m_incrSearch, TQT_SIGNAL( textChanged( const TQString& ) ),
-           TQT_SLOT( generateCheckBoxes( const TQString& ) ) );
+  connect( m_incrSearch, TQ_SIGNAL( textChanged( const TQString& ) ),
+           TQ_SLOT( generateCheckBoxes( const TQString& ) ) );
 
   TQScrollView * scrollView = new TQScrollView( this );
   scrollView->setResizePolicy( TQScrollView::AutoOneFit );
@@ -58,8 +58,8 @@ TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent,
   selectButs->addWidget( all );
   selectButs->addWidget( none );
 
-  connect( all, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAll() ) );
-  connect( none, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deSelectAll() ) );
+  connect( all, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectAll() ) );
+  connect( none, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deSelectAll() ) );
 
   buildButtons( lay );
   resize( 350, 400 );
@@ -168,7 +168,7 @@ void TDEListDebugDialog::save()
 
   // send DCOP message to all clients
   TQByteArray data;
-  if (!kapp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
+  if (!tdeApp->dcopClient()->send("*", "KDebug", "notifyKDebugConfigChanged()", data))
   {
     kdError() << "Unable to send DCOP message" << endl;
   }
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp
index db0ae5b9b..119bb1f66 100644
--- a/tdeinit/displayconfig.cpp
+++ b/tdeinit/displayconfig.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index 0a421d8af..9e8397223 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/tdeioslave/CMakeLists.txt b/tdeioslave/CMakeLists.txt
index 56b05c852..5b0f0c155 100644
--- a/tdeioslave/CMakeLists.txt
+++ b/tdeioslave/CMakeLists.txt
@@ -23,7 +23,6 @@ add_subdirectory( nfs )
 add_subdirectory( nntp )
 add_subdirectory( pop3 )
 add_subdirectory( smtp )
-add_subdirectory( sftp )
 add_subdirectory( tar )
 add_subdirectory( finger )
 add_subdirectory( thumbnail )
@@ -35,3 +34,4 @@ add_subdirectory( home )
 add_subdirectory( system )
 tde_conditional_add_subdirectory( WITH_LDAP ldap )
 tde_conditional_add_subdirectory( WITH_SAMBA smb )
+tde_conditional_add_subdirectory( WITH_SFTP sftp )
diff --git a/tdeioslave/about/tdeio_about.cpp b/tdeioslave/about/tdeio_about.cpp
index f8ac109f3..6c93a094b 100644
--- a/tdeioslave/about/tdeio_about.cpp
+++ b/tdeioslave/about/tdeio_about.cpp
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 #include <tqstring.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kurl.h>
 
 using namespace TDEIO;
@@ -57,7 +57,7 @@ void AboutProtocol::mimetype( const KURL& )
 
 extern "C"
 {
-    int KDE_EXPORT kdemain( int argc, char **argv ) {
+    int TDE_EXPORT kdemain( int argc, char **argv ) {
 
         TDEInstance instance("tdeio_about");
 
diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp
index 4f54d6668..c1e4ced35 100644
--- a/tdeioslave/cgi/cgi.cpp
+++ b/tdeioslave/cgi/cgi.cpp
@@ -23,9 +23,9 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
 
@@ -250,7 +250,7 @@ void CgiProtocol::get( const KURL& url )
   kdDebug(7124) << "CgiProtocol::get - done" << endl;
 }
 
-extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
+extern "C" { int TDE_EXPORT kdemain( int argc, char **argv ); }
 
 /*! The kdemain function generates an instance of the ioslave and starts its
  * dispatch loop. */
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
index 1b36daaae..95da88415 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * )
+  TDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * )
   {
     TDEGlobal::locale()->insertCatalogue("kcmcgi");
     return new KCMCgi( parent, "kcmcgi" );
@@ -57,11 +57,11 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
   buttonBox->setSpacing( KDialog::spacingHint() );
 
   mAddButton = new TQPushButton( i18n("Add..."), buttonBox );
-  connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addPath() ) );
+  connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addPath() ) );
 
   mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removePath() ) );
-  connect( mListBox, TQT_SIGNAL( clicked ( TQListBoxItem * )),this, TQT_SLOT( slotItemSelected( TQListBoxItem *)));
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removePath() ) );
+  connect( mListBox, TQ_SIGNAL( clicked ( TQListBoxItem * )),this, TQ_SLOT( slotItemSelected( TQListBoxItem *)));
 
   mConfig = new TDEConfig("kcmcgirc");
 
diff --git a/tdeioslave/filter/filter.cpp b/tdeioslave/filter/filter.cpp
index a429103e1..ff0d4ece7 100644
--- a/tdeioslave/filter/filter.cpp
+++ b/tdeioslave/filter/filter.cpp
@@ -25,14 +25,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <kmimemagic.h>
 #include <kfilterbase.h>
 
 #include "filter.h"
 
-extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
+extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char ** argv)
 {
diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp
index 643a699f0..dd44030cf 100644
--- a/tdeioslave/finger/tdeio_finger.cpp
+++ b/tdeioslave/finger/tdeio_finger.cpp
@@ -28,9 +28,9 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurl.h>
 
@@ -43,7 +43,7 @@ static const TQString defaultRefreshRate = "60";
 
 extern "C"
 {
-  KDE_EXPORT int kdemain( int argc, char **argv )
+  TDE_EXPORT int kdemain( int argc, char **argv )
   {
     TDEInstance instance( "tdeio_finger" );
 
@@ -126,10 +126,10 @@ void FingerProtocol::get(const KURL& url )
 	      << *myFingerPath << *myFingerCSSFile
 	      << refreshRate << myURL->host() << myURL->user() ;
 
-  connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-	  this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
-  //connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-  //	  this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+  connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+	  this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+  //connect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+  //	  this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
   myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
diff --git a/tdeioslave/finger/tdeio_finger.h b/tdeioslave/finger/tdeio_finger.h
index 079c82305..dc0245aa2 100644
--- a/tdeioslave/finger/tdeio_finger.h
+++ b/tdeioslave/finger/tdeio_finger.h
@@ -24,7 +24,7 @@
 #include <tqcstring.h>
 
 #include <kurl.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeio/global.h>
 #include <tdeio/slavebase.h>
 
diff --git a/tdeioslave/fish/CMakeLists.txt b/tdeioslave/fish/CMakeLists.txt
index d7a30416b..c228c27ca 100644
--- a/tdeioslave/fish/CMakeLists.txt
+++ b/tdeioslave/fish/CMakeLists.txt
@@ -35,8 +35,14 @@ tde_create_translated_desktop(
 ##### tdeio_fish (module) #########################
 
 add_custom_command( OUTPUT fishcode.h
-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/genfishcode.pl ${CMAKE_CURRENT_SOURCE_DIR}/fish.pl > fishcode.h
-  DEPENDS fish.pl )
+  COMMAND ${CMAKE_COMMAND}
+    -DMASTER_CURRENT_SOURCE_DIR:FILEPATH="${CMAKE_CURRENT_SOURCE_DIR}"
+    -DFISH_CODE_SOURCE:FILEPATH="fish.pl"
+    -DFISH_CODE_OUTPUT:FILEPATH="fishcode.h"
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/genfishcode.cmake"
+  COMMENT "Generate fishcode.h"
+  DEPENDS fish.pl
+)
 
 set_property( SOURCE fish.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fishcode.h )
 
diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
index 6f6cd93c6..70e42758b 100644
--- a/tdeioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -63,9 +63,9 @@
 
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kremoteencoding.h>
 #include <kurl.h>
@@ -124,7 +124,7 @@ static void ripper(int)
     }
 }
 
-int KDE_EXPORT kdemain( int argc, char **argv )
+int TDE_EXPORT kdemain( int argc, char **argv )
 {
     TDELocale::setMainCatalogue("tdeio_fish");
     TDEInstance instance("fish");
diff --git a/tdeioslave/fish/fish.h b/tdeioslave/fish/fish.h
index 43dd5477d..0fd2b7bf4 100644
--- a/tdeioslave/fish/fish.h
+++ b/tdeioslave/fish/fish.h
@@ -23,7 +23,7 @@
 #include <kurl.h>
 #include <tdeio/global.h>
 #include <tdeio/slavebase.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeio/authinfo.h>
 #include <time.h>
 
diff --git a/tdeioslave/fish/fish.pl b/tdeioslave/fish/fish.pl
index ace813bb9..ace813bb9 100755..100644
--- a/tdeioslave/fish/fish.pl
+++ b/tdeioslave/fish/fish.pl
diff --git a/tdeioslave/fish/genfishcode.cmake b/tdeioslave/fish/genfishcode.cmake
index 9b35a51ec..e66df099b 100644
--- a/tdeioslave/fish/genfishcode.cmake
+++ b/tdeioslave/fish/genfishcode.cmake
@@ -1,8 +1,64 @@
-#!/bin/sh
+#################################################
+#
+#  (C) 2024 Slávek Banko
+#  slavek (DOT) banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
 
-SUM=$( @MD5SUM@ @CMAKE_CURRENT_SOURCE_DIR@/fish.pl | cut -d ' ' @MD5SUM_CUT@ )
+# check and set variables
+if( NOT "${MASTER_CURRENT_SOURCE_DIR}" STREQUAL "" )
+  set( CMAKE_CURRENT_SOURCE_DIR "${MASTER_CURRENT_SOURCE_DIR}" )
+endif()
+if( "${FISH_CODE_SOURCE}" STREQUAL "" )
+  set( FISH_CODE_SOURCE "fish.pl" )
+endif()
+if( "${FISH_CODE_OUTPUT}" STREQUAL "" )
+  set( FISH_CODE_OUTPUT "fishcode.h" )
+endif()
+if( NOT IS_ABSOLUTE ${FISH_CODE_SOURCE} )
+  set( FISH_CODE_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${FISH_CODE_SOURCE}" )
+endif()
+if( NOT IS_ABSOLUTE ${FISH_CODE_OUTPUT} )
+  set( FISH_CODE_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FISH_CODE_OUTPUT}" )
+endif()
+if( NOT EXISTS ${FISH_CODE_SOURCE} )
+  message( FATAL_ERROR "Source file ${FISH_CODE_SOURCE} not exists!" )
+endif()
 
-#echo "#define CHECKSUM "\"$SUM\"" > fishcode.h
-#echo 'static const char *fishCode(' >> fishcode.h
-#sed -e 's/\\/\\\\/g;s/"/\\"/g;s/^[ 	]*/"/;/^"# /d;s/[ 	]*$$/\\n"/;/^"\\n"$$/d;s/{CHECKSUM}/'$$SUM'/;' @CMAKE_CURRENT_SOURCE_DIR@/fish.pl >> fishcode.h
-#echo ');' >> fishcode.h
+# load fish code source
+file( READ ${FISH_CODE_SOURCE} _fish_code )
+string( REGEX REPLACE "[^\n]" "" _fish_len ${_fish_code} )
+string( LENGTH "+${_fish_len}" _fish_len )
+string( MD5 _fish_md5 "${_fish_code}" )
+
+# prepare for C code
+set( _fish_pos 0 )
+set( _fish_output "\
+#define CHECKSUM \"${_fish_md5}\"
+static const char *fishCode(
+")
+string( REGEX REPLACE "\\\\" "\\\\\\\\" _fish_code "${_fish_code}" )
+string( REGEX REPLACE "\"" "\\\\\"" _fish_code "${_fish_code}" )
+while( _fish_pos LESS ${_fish_len} )
+  # pick line
+  string( REGEX REPLACE "^([^\n]*)\n(.*)" "\\1" _fish_line "${_fish_code}" )
+  string( REGEX REPLACE "^([^\n]*)\n(.*)" "\\2" _fish_code "${_fish_code}" )
+  math( EXPR _fish_pos "${_fish_pos}+1" )
+
+  # skip comments and empty lines
+  string( REGEX REPLACE "^[ \t]+" "" _fish_line "${_fish_line}" )
+  if( "${_fish_line}" STREQUAL "" OR "${_fish_line}" MATCHES "^# " )
+    continue()
+  endif()
+
+  # add line to output
+  set( _fish_output "${_fish_output}\"${_fish_line}\\n\"\n" )
+endwhile()
+set( _fish_output "${_fish_output});\n" )
+
+# write code to output file
+file( WRITE ${FISH_CODE_OUTPUT} "${_fish_output}" )
diff --git a/tdeioslave/fish/genfishcode.pl b/tdeioslave/fish/genfishcode.pl
deleted file mode 100755
index 60dfff8de..000000000
--- a/tdeioslave/fish/genfishcode.pl
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-use Digest::MD5;
-
-sub md5sum {
-    my $filename = shift;
-    my $digest;
-    eval {
-        open( my $FILE, '<', $filename )
-            or die "Can't find file $filename\n";
-        my $ctx = Digest::MD5->new;
-        $ctx->addfile($FILE);
-        $digest = $ctx->hexdigest;
-        close($FILE);
-    };
-    if ($@) {
-        warn $@;
-    }
-    return $digest;
-}
-
-my $file = $ARGV[0] or die "Missing filename argument";
-
-my $fish_md5 = md5sum($file)
-    or die "Couldn't compute MD5 for some reason\n";
-print qq{#define CHECKSUM "$fish_md5"\n};
-print qq{static const char *fishCode(\n};
-
-open( my $FISH, "<", "$file" ) or die "Can't open $file\n";
-while (<$FISH>) {
-    chomp;
-    s|\\|\\\\|g;
-    s|"|\\"|g;
-    s/^\s*/"/;
-    next if /^"# /;
-    s/\s*$/\\n"/;
-    next if /^"\\n"$/;
-    print "$_\n";
-}
-close($FISH);
-print qq{);\n};
diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp
index 50303f1b7..4f9227b1e 100644
--- a/tdeioslave/floppy/tdeio_floppy.cpp
+++ b/tdeioslave/floppy/tdeio_floppy.cpp
@@ -42,14 +42,14 @@
 
 #include "tdeio_floppy.h"
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <tdeio/global.h>
 #include <tdelocale.h>
 
 using namespace TDEIO;
 
-extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
+extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
diff --git a/tdeioslave/home/homeimpl.cpp b/tdeioslave/home/homeimpl.cpp
index ea3dad520..8967e5ea4 100644
--- a/tdeioslave/home/homeimpl.cpp
+++ b/tdeioslave/home/homeimpl.cpp
@@ -193,8 +193,8 @@ TDEIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url)
 	m_entryBuffer.clear();
 
 	TDEIO::StatJob *job = TDEIO::stat(url, false);
-	connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-	         this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) );
+	connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+	         this, TQ_SLOT( slotStatResult(TDEIO::Job *) ) );
 	tqApp->eventLoop()->enterLoop();
 
 	TDEIO::UDSEntry::iterator it = m_entryBuffer.begin();
diff --git a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
index ac4e79f66..cc2dea334 100644
--- a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
+++ b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp
@@ -28,7 +28,7 @@ HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj)
 }
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj)
+	TDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj)
 	{
 		TDEGlobal::locale()->insertCatalogue("tdeio_home");
 		return new HomeDirNotifyModule(obj);
diff --git a/tdeioslave/home/tdeio_home.cpp b/tdeioslave/home/tdeio_home.cpp
index c4db91128..352fadc8e 100644
--- a/tdeioslave/home/tdeio_home.cpp
+++ b/tdeioslave/home/tdeio_home.cpp
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
 };
 
 extern "C" {
-	int KDE_EXPORT kdemain( int argc, char **argv )
+	int TDE_EXPORT kdemain( int argc, char **argv )
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
diff --git a/tdeioslave/info/info.cpp b/tdeioslave/info/info.cpp
index 83b41dae8..f436ffeee 100644
--- a/tdeioslave/info/info.cpp
+++ b/tdeioslave/info/info.cpp
@@ -8,10 +8,10 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 
 #include "info.h"
@@ -240,7 +240,7 @@ void InfoProtocol::stat( const KURL & )
 	finished();
 }
 
-extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); }
+extern "C" { int TDE_EXPORT kdemain( int argc, char **argv ); }
 
 int kdemain( int argc, char **argv )
 {
diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp
index b61c2af74..61afd6b62 100644
--- a/tdeioslave/ldap/tdeio_ldap.cpp
+++ b/tdeioslave/ldap/tdeio_ldap.cpp
@@ -10,7 +10,7 @@
 #include <netinet/in.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 
 #ifdef HAVE_SASL_SASL_H //prefer libsasl2
@@ -27,7 +27,7 @@
 using namespace TDEIO;
 using namespace TDEABC;
 
-extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
+extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); }
 
 /**
  * The main program.
diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp
index caef50784..fb6bed31e 100644
--- a/tdeioslave/mac/tdeio_mac.cpp
+++ b/tdeioslave/mac/tdeio_mac.cpp
@@ -18,7 +18,7 @@
 
 #define PARTITION "/dev/hda11"
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
@@ -35,7 +35,7 @@
 using namespace TDEIO;
 
 extern "C" {
-    int KDE_EXPORT kdemain(int, char **argv) {
+    int TDE_EXPORT kdemain(int, char **argv) {
         TDEInstance instance("tdeio_mac");
         MacProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
@@ -105,8 +105,8 @@ void MacProtocol::get(const KURL& url) {
     *myTDEProcess << "hpcopy" << mode << path << "-";
 
     //data is now sent directly from the slot
-    connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-            this, TQT_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int)));
+    connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+            this, TQ_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int)));
 
     myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -134,8 +134,8 @@ void MacProtocol::listDir(const KURL& url) {
         *myTDEProcess << "hpls" << "-la" << filename;
 
         standardOutputStream = TQString::null;
-        connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -146,8 +146,8 @@ void MacProtocol::listDir(const KURL& url) {
 
         //clean up
         delete myTDEProcess; myTDEProcess = 0;
-        disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         UDSEntry entry;
         if (!standardOutputStream.isEmpty()) {
@@ -191,8 +191,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
         *myTDEProcess << "hpls" << "-ld" << filename;
 
         standardOutputStream = TQString::null;
-        connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -203,8 +203,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
 
         //clean up
         delete myTDEProcess; myTDEProcess = 0;
-        disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+        disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
         if (standardOutputStream.isEmpty()) {
             filename.replace("\\ ", " "); //get rid of escapes
@@ -257,8 +257,8 @@ TQString MacProtocol::prepareHP(const KURL& url) {
     myTDEProcess = new TDEProcess();
     *myTDEProcess << "hpmount";
     standardOutputStream = TQString::null;
-    connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+    connect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
     myTDEProcess->start(TDEProcess::Block, TDEProcess::All);
 
@@ -269,8 +269,8 @@ TQString MacProtocol::prepareHP(const KURL& url) {
     }
 
     delete myTDEProcess; myTDEProcess = 0;
-    disconnect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+    disconnect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 
     //now mount the drive
     myTDEProcess = new TDEProcess();
diff --git a/tdeioslave/mac/tdeio_mac.h b/tdeioslave/mac/tdeio_mac.h
index ca4f8b95a..0a71778aa 100644
--- a/tdeioslave/mac/tdeio_mac.h
+++ b/tdeioslave/mac/tdeio_mac.h
@@ -19,7 +19,7 @@
 #include <tdeio/slavebase.h>
 #include <tdeio/global.h>
 #include <kurl.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include <tqstring.h>
 #include <tqcstring.h>
diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
index 556b287e4..ea0dda8ec 100644
--- a/tdeioslave/man/kmanpart.cpp
+++ b/tdeioslave/man/kmanpart.cpp
@@ -20,17 +20,17 @@
 #include "kmanpart.h"
 #include <tqstring.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 #include <tdeversion.h>
 
 extern "C"
 {
-   KDE_EXPORT void* init_libkmanpart()
+   TDE_EXPORT void* init_libkmanpart()
    {
       return new KManPartFactory;
    }
@@ -95,8 +95,8 @@ bool KManPart::openFile()
    url.setPath( m_file );
 
    m_job = TDEIO::get( url, true, false );
-   connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) );
-   connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) );
+   connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) );
+   connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) );
    return true;
 }
 
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index 3f27feb68..cf3d8dc6a 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -774,13 +774,13 @@ static void add_links(char *c)
             if (g!=NULL && f>c && (g-f)<12 && (isalnum(f[-1]) || f[-1]=='>' || ( f[-1] == ';' ) ) &&
 		isdigit(f[1]) && f[1]!='0' && ((g-f)<=2 || isalpha(f[2])))
 	    {
-		ok = TRUE;
+		ok = true;
 		h = f+2;
 		while (h<g)
 		{
 		    if (!isalnum(*h++))
 		    {
-			ok = FALSE;
+			ok = false;
 			break;
 		    }
 		}
@@ -1075,7 +1075,7 @@ static TQCString set_font( const TQCString& name )
 /// \deprecated
 static TQCString set_font( const char ch )
 #ifndef SIMPLE_MAN2HTML
-        KDE_DEPRECATED;
+        TDE_DEPRECATED;
 
 static TQCString set_font( const char ch )
 #endif
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 13fc3b4d5..9a67b8f5c 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -32,10 +32,10 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <kmimetype.h>
 
@@ -204,8 +204,8 @@ TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString &section)
                 TDEProcess proc;
                 proc << "whatis" << "-M" << (*it_dir) << "-w" << "*";
                 myStdStream = TQString::null;
-                connect( &proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
-                         TQT_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
+                connect( &proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+                         TQ_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
                 proc.start( TDEProcess::Block, TDEProcess::Stdout );
                 TQTextStream t( &myStdStream, IO_ReadOnly );
                 parseWhatIs( i, t, mark );
@@ -555,8 +555,8 @@ char *MANProtocol::readManPage(const char *_filename)
 	getProgramPath();
 	proc << mySgml2RoffPath << filename;
 
-	TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
-			      this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+	TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+			      this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
 	proc.start(TDEProcess::Block, TDEProcess::All);
 
         const TQCString cstr=myStdStream.latin1();
@@ -589,8 +589,8 @@ char *MANProtocol::readManPage(const char *_filename)
 
             proc << "man" << "--recode" << "UTF-8" << filename;
 
-            TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
-                                   this, TQT_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
+            TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+                                   this, TQ_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
             proc.start(TDEProcess::Block, TDEProcess::All);
 
             const TQCString cstr=myStdStream.utf8();
@@ -738,7 +738,7 @@ void MANProtocol::stat( const KURL& url)
 extern "C"
 {
 
-    int KDE_EXPORT kdemain( int argc, char **argv ) {
+    int TDE_EXPORT kdemain( int argc, char **argv ) {
 
         TDEInstance instance("tdeio_man");
 
@@ -1317,7 +1317,7 @@ void MANProtocol::showIndex(const TQString& section)
 #else /* !_USE_QSORT */
 
     QManIndexList manpages;
-    manpages.setAutoDelete(TRUE);
+    manpages.setAutoDelete(true);
 
 #endif /* _USE_QSORT */
 
diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
index c0b11043c..0888a8f40 100644
--- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -22,8 +22,8 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kstddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 #include <tdelocale.h>
 
 NotifierServiceAction::NotifierServiceAction()
@@ -150,7 +150,7 @@ bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const
 void NotifierServiceAction::save() const
 {
 	TQFile::remove( m_filePath );
-	KDesktopFile desktopFile(m_filePath);
+	TDEDesktopFile desktopFile(m_filePath);
 
 	desktopFile.setGroup(TQString("Desktop Action ") + m_service.m_strName);
 	desktopFile.writeEntry(TQString("Icon"), m_service.m_strIcon);
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index aaa90fefc..86e118acc 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -20,8 +20,8 @@
 #include "notifiersettings.h"
 
 #include <tdeglobal.h>
-#include <kdesktopfile.h>
-#include <kstandarddirs.h>
+#include <tdedesktopfile.h>
+#include <tdestandarddirs.h>
 #include <tqdir.h>
 #include <tqfile.h>
 
@@ -279,7 +279,7 @@ void NotifierSettings::save()
 		delete a;
 	}
 	
-	KSimpleConfig config( "medianotifierrc" );
+	TDESimpleConfig config( "medianotifierrc" );
 	config.setGroup( "Auto Actions" );
 	
 	TQMap<TQString,NotifierAction*>::iterator auto_it = m_autoMimetypesMap.begin();
@@ -298,7 +298,7 @@ void NotifierSettings::save()
 	}
 }
 
-TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile &desktop ) const
+TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( TDEDesktopFile &desktop ) const
 {
 	desktop.setDesktopGroup();
 
@@ -328,7 +328,7 @@ TQValueList<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile
 }
 
 
-bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const
+bool NotifierSettings::shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const
 {
 	desktop.setDesktopGroup();
 
@@ -386,7 +386,7 @@ TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQStri
 		{
 			TQString filename = *dir_it + *entry_it;
 			
-			KDesktopFile desktop( filename, true );
+			TDEDesktopFile desktop( filename, true );
 			
 			if ( shouldLoadActions(desktop, mimetype) )
 			{
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.h b/tdeioslave/media/libmediacommon/notifiersettings.h
index dee5c440b..0bb033945 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.h
+++ b/tdeioslave/media/libmediacommon/notifiersettings.h
@@ -51,8 +51,8 @@ public:
 	
 private:
 	TQValueList<NotifierServiceAction*> listServices( const TQString &mimetype = TQString() ) const;
-	bool shouldLoadActions( KDesktopFile &desktop, const TQString &mimetype ) const;
-	TQValueList<NotifierServiceAction*> loadActions( KDesktopFile &desktop ) const;
+	bool shouldLoadActions( TDEDesktopFile &desktop, const TQString &mimetype ) const;
+	TQValueList<NotifierServiceAction*> loadActions( TDEDesktopFile &desktop ) const;
 
 	TQStringList m_supportedMimetypes;
 	TQValueList<NotifierAction*> m_actions;
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index aacbcc5e2..efa26e884 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -242,12 +242,12 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
 		                           medium.deviceNode(),
 		                           medium.mountPoint());
 		job->setAutoWarningHandlingEnabled(false);
-		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-		         this, TQT_SLOT( slotMountResult( TDEIO::Job * ) ) );
-		connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
-		         this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
+		connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+		         this, TQ_SLOT( slotMountResult( TDEIO::Job * ) ) );
+		connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
+		         this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
 		*/
-		kapp->dcopClient()
+		tdeApp->dcopClient()
 		->connectDCOPSignal("kded", "mediamanager",
 		                    "mediumChanged(TQString, bool)",
 		                    "mediaimpl",
@@ -272,7 +272,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
 
 		mp_mounting = 0L;
 		
-		kapp->dcopClient()
+		tdeApp->dcopClient()
 		->disconnectDCOPSignal("kded", "mediamanager",
 		                       "mediumChanged(TQString, bool)",
 		                       "mediaimpl",
@@ -365,10 +365,10 @@ TDEIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
 
 	TDEIO::StatJob *job = TDEIO::stat(url, false);
 	job->setAutoWarningHandlingEnabled( false );
-	connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-	         this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) );
-	connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
-	         this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
+	connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+	         this, TQ_SLOT( slotStatResult(TDEIO::Job *) ) );
+	connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ),
+	         this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) );
 	tqApp->eventLoop()->enterLoop();
 
 	TDEIO::UDSEntry::iterator it = m_entryBuffer.begin();
diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp
index b2e9ff5f5..ddfd041a0 100644
--- a/tdeioslave/media/mediamanager/dialog.cpp
+++ b/tdeioslave/media/mediamanager/dialog.cpp
@@ -37,7 +37,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
 	TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
 	unlockDialog->encryptedIcon->setPixmap( pixmap );
 
-	connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+	connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
 
 	setMainWidget(unlockDialog);
 }
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 6549723fe..2f60dfcbf 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -43,7 +43,7 @@
 #include <kdirwatch.h>
 #include <kurl.h>
 #include <kmountpoint.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #ifdef _OS_SOLARIS_
 #define FSTAB "/etc/vfstab"
@@ -61,8 +61,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
 	KDirWatch::self()->addFile(MTAB);
 	KDirWatch::self()->addFile(FSTAB);
 
-	connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
-	         this, TQT_SLOT( slotDirty(const TQString&) ) );
+	connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ),
+	         this, TQ_SLOT( slotDirty(const TQString&) ) );
 
 	handleFstabChange(false);
 	handleMtabChange(false);
@@ -70,8 +70,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
 	KDirWatch::self()->startScan();
 
 #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-	connect( &m_mtabTimer, TQT_SIGNAL( timeout() ),
-	         this, TQT_SLOT( handleMtabChange() ) );
+	connect( &m_mtabTimer, TQ_SIGNAL( timeout() ),
+	         this, TQ_SLOT( handleMtabChange() ) );
 	m_mtabTimer.start(250);
 #endif
 }
diff --git a/tdeioslave/media/mediamanager/linuxcdpolling.cpp b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
index 9a5a0a223..66074f40e 100644
--- a/tdeioslave/media/mediamanager/linuxcdpolling.cpp
+++ b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
@@ -176,19 +176,19 @@ private:
 LinuxCDPolling::LinuxCDPolling(MediaList &list)
 	: TQObject(), BackendBase(list)
 {
-	connect(&m_mediaList, TQT_SIGNAL(mediumAdded(const TQString &,
+	connect(&m_mediaList, TQ_SIGNAL(mediumAdded(const TQString &,
 	                                        const TQString &, bool)),
-	        this, TQT_SLOT(slotMediumAdded(const TQString &)) );
+	        this, TQ_SLOT(slotMediumAdded(const TQString &)) );
 
-	connect(&m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString &,
+	connect(&m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString &,
 	                                          const TQString &, bool)),
-	        this, TQT_SLOT(slotMediumRemoved(const TQString &)) );
+	        this, TQ_SLOT(slotMediumRemoved(const TQString &)) );
 
-	connect(&m_mediaList, TQT_SIGNAL(mediumStateChanged(const TQString &,
+	connect(&m_mediaList, TQ_SIGNAL(mediumStateChanged(const TQString &,
 	                                               const TQString &, bool, bool)),
-	        this, TQT_SLOT(slotMediumStateChanged(const TQString &)) );
+	        this, TQ_SLOT(slotMediumStateChanged(const TQString &)) );
 
-	connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+	connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 }
 
 LinuxCDPolling::~LinuxCDPolling()
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index f8c2a574b..dc1671b22 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -26,7 +26,7 @@
 #include <tdelocale.h>
 
 #include <kdirnotify_stub.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "mediamanagersettings.h"
 
@@ -43,15 +43,15 @@
 MediaManager::MediaManager(const TQCString &obj)
     : KDEDModule(obj), m_dirNotify(m_mediaList)
 {
-    connect( &m_mediaList, TQT_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)),
-             TQT_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) );
-    connect( &m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)),
-             TQT_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) );
+    connect( &m_mediaList, TQ_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)),
+             TQ_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) );
+    connect( &m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)),
+             TQ_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) );
     connect( &m_mediaList,
-             TQT_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)),
-             TQT_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) );
+             TQ_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)),
+             TQ_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) );
 
-    TQTimer::singleShot( 10, this, TQT_SLOT( loadBackends() ) );
+    TQTimer::singleShot( 10, this, TQ_SLOT( loadBackends() ) );
 }
 
 MediaManager::~MediaManager()
@@ -483,7 +483,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam
 
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
+    TDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
     {
         TDEGlobal::locale()->insertCatalogue("tdeio_media");
         return new MediaManager(obj);
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index dacb9b704..9e8b447f4 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -22,7 +22,7 @@
 #include <kdirwatch.h>
 #include <kurl.h>
 #include <kmountpoint.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #ifdef _OS_SOLARIS_
 #define MTAB "/etc/mnttab"
@@ -37,8 +37,8 @@ RemovableBackend::RemovableBackend(MediaList &list)
 {
 	KDirWatch::self()->addFile(MTAB);
 
-	connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ),
-	         this, TQT_SLOT( slotDirty(const TQString&) ) );
+	connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ),
+	         this, TQ_SLOT( slotDirty(const TQString&) ) );
 	KDirWatch::self()->startScan();
 }
 
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index b12aa6ea9..d26188927 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -27,13 +27,13 @@
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "dialog.h"
 
@@ -55,9 +55,9 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 
 	// Connect device monitoring signals/slots
-	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(AddDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
 
 	// List devices at startup
 	ListDevices();
@@ -771,9 +771,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			diskLabel = i18n("%1 Fixed Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 
-		if (sdevice->isDiskOfType(TDEDiskDeviceType::USB)
-		    || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)
-		    || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
+		if (sdevice->isDiskOfType(TDEDiskDeviceType::USB) ||
+		    sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) {
 			mimeType = "media/removable" + MOUNT_MEDIA_SUFFIX;
 			if (useDefaultLabel) {
 				diskLabel = i18n("%1 Removable Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
@@ -910,7 +909,7 @@ void TDEBackend::setCameraProperties(Medium* medium)
 
 	TQString device = "camera:/";
 
-	TQStringList devNodeList = TQStringList::split("/", sdevice->deviceNode(), TRUE);
+	TQStringList devNodeList = TQStringList::split("/", sdevice->deviceNode(), true);
 	TQString devNode0 = devNodeList[devNodeList.count()-2];
 	TQString devNode1 = devNodeList[devNodeList.count()-1];
 
@@ -1035,7 +1034,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
 
 	bool removable = false;
 	if (!drive_udi.isNull()) {
-		removable = ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) || (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)));
+		removable = sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable);
 	}
 
 	TQString tmp;
@@ -1235,12 +1234,12 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 		data.medium = medium;
 
 		TDEIO::Job *job = TDEIO::mount(false, 0, medium->deviceNode(), mountPoint);
-		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
 		mount_jobs[job] = &data;
 		// The caller expects the device to be mounted when the function
 		// completes. Thus block until the job completes.
 		while (!data.completed) {
-			kapp->eventLoop()->enterLoop();
+			tdeApp->eventLoop()->enterLoop();
 		}
 		if (!data.error) {
 			result["result"] = true;
@@ -1269,7 +1268,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 	}
 	if (diskLabel.isEmpty()) {
 		// Try to use a pretty mount point if possible
-		TQStringList pieces = TQStringList::split("/", sdevice->deviceNode(), FALSE);
+		TQStringList pieces = TQStringList::split("/", sdevice->deviceNode(), false);
 		TQString node = pieces[pieces.count()-1];
 		diskLabel = medium->label() + " (" + node + ")";
 		diskLabel.replace("/", "_");
@@ -1346,12 +1345,12 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 		data.medium = medium;
 
 		TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
-		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
 		mount_jobs[job] = &data;
 		// The caller expects the device to be unmounted when the function
 		// completes. Thus block until the job completes.
 		while (!data.completed) {
-			kapp->eventLoop()->enterLoop();
+			tdeApp->eventLoop()->enterLoop();
 		}
 		if (!data.error) {
 			result["result"] = true;
@@ -1683,7 +1682,7 @@ void TDEBackend::slotResult(TDEIO::Job *job)
 	/* Job completed. Notify the caller */
 	data->error = job->error();
 	data->completed = true;
-	kapp->eventLoop()->exitLoop();
+	tdeApp->eventLoop()->exitLoop();
 }
 
 TQString TDEBackend::isInFstab(const Medium *medium)
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 1e75b2501..d47ee0129 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -43,11 +43,11 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <krun.h>
 #include <tdemessagebox.h>
 #include <kstdguiitem.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "notificationdialog.h"
 #include "notifiersettings.h"
@@ -67,9 +67,9 @@ MediaNotifier::MediaNotifier(const TQCString &name) : KDEDModule(name)
 	connectDCOPSignal( "kded", "mediamanager", "mediumRemoved(TQString, bool)",
 	                   "onMediumRemove(TQString, bool)", true );
 
-	m_notificationDialogList.setAutoDelete(FALSE);
+	m_notificationDialogList.setAutoDelete(false);
 	m_freeTimer = new TQTimer( this );
-	connect( m_freeTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkFreeDiskSpace() ) );
+	connect( m_freeTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkFreeDiskSpace() ) );
 	m_freeTimer->start( 1000*6*2 /* 20 minutes */ );
 	m_freeDialog = 0;
 }
@@ -114,7 +114,7 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification
 	// in the background due to focus stealing prevention. Entering a new media can
 	// be seen as a kind of user activity after all. It'd be better to update the timestamp
 	// as soon as the media is entered, but it apparently takes some time to get here.
-	kapp->updateUserTimestamp();
+	tdeApp->updateUserTimestamp();
 
 	KURL url(  "system:/media/"+name );
 
@@ -123,8 +123,8 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification
 
 	m_allowNotificationMap[job] = allowNotification;
 	
-	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-	         this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
+	connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+	         this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) );
 }
 
 void MediaNotifier::slotStatResult( TDEIO::Job *job )
@@ -347,7 +347,7 @@ void MediaNotifier::notify( KFileItem &medium )
 		if ( actions.size()>1 )
 		{
 			NotificationDialog*  notifier = new NotificationDialog( medium, settings );
-			connect(notifier, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(notificationDialogDestroyed(TQObject*)));
+			connect(notifier, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(notificationDialogDestroyed(TQObject*)));
 			m_notificationDialogList.append(notifier);
 			notifier->show();
 		}
@@ -367,7 +367,7 @@ void MediaNotifier::notificationDialogDestroyed(TQObject* object)
 
 extern "C"
 {
-	KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name)
+	TDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name)
 	{
 		TDEGlobal::locale()->insertCatalogue("kay");
 		return new MediaNotifier(name);
@@ -407,8 +407,8 @@ void MediaNotifier::checkFreeDiskSpace()
                                            i18n("Do not ask again"),
                                            &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
             m_freeDialog->show();
-            connect( m_freeDialog, TQT_SIGNAL( yesClicked() ), TQT_SLOT( slotFreeContinue() ) );
-            connect( m_freeDialog, TQT_SIGNAL( noClicked() ), TQT_SLOT( slotFreeCancel() ) );
+            connect( m_freeDialog, TQ_SIGNAL( yesClicked() ), TQ_SLOT( slotFreeContinue() ) );
+            connect( m_freeDialog, TQ_SIGNAL( noClicked() ), TQ_SLOT( slotFreeCancel() ) );
         }
     }
 }
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index fc6d87647..0859e2e5e 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -26,7 +26,7 @@
 
 #include <krun.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/global.h>
 #include <tdelistbox.h>
 #include <tqlabel.h>
@@ -71,17 +71,17 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
 
 	setButtonText( User1, i18n("Configure...") );
 
-	connect( m_actionWatcher, TQT_SIGNAL( dirty( const TQString & ) ),
-	         this, TQT_SLOT( slotActionsChanged( const TQString & ) ) );
-	connect( this , TQT_SIGNAL( okClicked() ),
-	         this, TQT_SLOT( slotOk() ) );
-	connect( this, TQT_SIGNAL( user1Clicked() ),
-	         this, TQT_SLOT( slotConfigure() ) );
-	connect( m_view->actionsList, TQT_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ),
-	         this, TQT_SLOT( slotOk() ) );
-
-	connect( this, TQT_SIGNAL( finished() ),
-	         this, TQT_SLOT( delayedDestruct() ) );
+	connect( m_actionWatcher, TQ_SIGNAL( dirty( const TQString & ) ),
+	         this, TQ_SLOT( slotActionsChanged( const TQString & ) ) );
+	connect( this , TQ_SIGNAL( okClicked() ),
+	         this, TQ_SLOT( slotOk() ) );
+	connect( this, TQ_SIGNAL( user1Clicked() ),
+	         this, TQ_SLOT( slotConfigure() ) );
+	connect( m_view->actionsList, TQ_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ),
+	         this, TQ_SLOT( slotOk() ) );
+
+	connect( this, TQ_SIGNAL( finished() ),
+	         this, TQ_SLOT( delayedDestruct() ) );
 
 	m_actionWatcher->startScan();
 	TQPushButton * btn = actionButton( Ok );
diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp
index d16c6d974..a257ca6d8 100644
--- a/tdeioslave/media/mounthelper/dialog.cpp
+++ b/tdeioslave/media/mounthelper/dialog.cpp
@@ -36,7 +36,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
 	TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
 	unlockDialog->encryptedIcon->setPixmap( pixmap );
 
-	connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
+	connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
 
 	setMainWidget(unlockDialog);
 }
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 9094b8e56..a68759d3b 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdestartupinfo.h>
 #include <kmimetype.h>
 #ifdef WITH_TDEHWLIB
@@ -50,7 +50,7 @@ const Medium MountHelper::findMedium(const TQString &device)
 	DCOPReply reply = mediamanager.call("properties", device);
 	if (!reply.isValid())
 	{
-		m_errorStr = i18n("The TDE mediamanager is not running.\n");
+		m_errorStr = i18n("The TDE mediamanager is not running.");
 		return Medium(TQString::null, TQString::null, TQString::null);
 	}
 	const Medium &medium = Medium::create(reply);
@@ -102,8 +102,8 @@ void MountHelper::unlock(const Medium &medium)
 	}
 	m_mediumId = medium.id();
 	m_dialog = new Dialog(device, iconName);
-	connect(m_dialog, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSendPassword()));
-	connect(m_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel()));
+	connect(m_dialog, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotSendPassword()));
+	connect(m_dialog, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancel()));
 	m_dialog->show();
 }
 
@@ -143,10 +143,10 @@ void MountHelper::eject(const Medium &medium)
 #endif
 
 	// Otherwise fall back to tdeeject
-	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
+	TDEProcess *proc = new TDEProcess(this);
 	*proc << "tdeeject";
 	*proc << medium.deviceNode();
-	connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),	this, TQT_SLOT(ejectFinished(TDEProcess*)));
+	connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),	this, TQ_SLOT(ejectFinished(TDEProcess*)));
 	proc->start();
 }
 
diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
index 5b54c8c5a..57fff8573 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
@@ -64,43 +64,43 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
       option_ro->hide();
     else
       option_ro->setChecked(options["ro"] == "true");
-    connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_ro, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("quiet"))
       option_quiet->hide();
     else
       option_quiet->setChecked(options["quiet"] == "true");
-    connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_quiet, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("sync"))
       option_sync->hide();
     else
       option_sync->setChecked(options["sync"] == "true");
-    connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_sync, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("atime"))
       option_atime->hide();
     else
       option_atime->setChecked(options["atime"] == "true");
-    connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_atime, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("flush"))
       option_flush->hide();
     else
       option_flush->setChecked(options["flush"] == "true");
-    connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_flush, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("utf8"))
       option_utf8->hide();
     else
       option_utf8->setChecked(options["utf8"] == "true");
-    connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_utf8, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("uid"))
       option_uid->hide();
     else
       option_uid->setChecked(options["uid"] == "true");
-    connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_uid, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     if (!options.contains("shortname"))
       {
@@ -115,7 +115,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 	      option_shortname->setCurrentItem(index);
 	      break;
 	    }
-	connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
+	connect( option_shortname, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) );
       }
 
     if (!options.contains("journaling"))
@@ -131,14 +131,14 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 	      option_journaling->setCurrentItem(index);
 	      break;
 	    }
-	connect( option_journaling, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) );
+	connect( option_journaling, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) );
       }
 
     label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"]));
     option_mountpoint->setText(options["mountpoint"]);
-    connect( option_mountpoint, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SIGNAL( changed() ) );
+    connect( option_mountpoint, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SIGNAL( changed() ) );
     option_automount->setChecked(options["automount"] == "true");
-    connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
+    connect( option_automount, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );
 
     bool has_groupbox_specific = true;
     if (!options.contains("journaling") &&
@@ -152,11 +152,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id)
 
     // The order is important - we want groupboxes to hide automatically depending on use_defaults
     // but don't want to emit changed() until user actually changes something.
-    connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) );
+    connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_generic, TQ_SLOT( setHidden(bool) ) );
     if (has_groupbox_specific)
-      connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) );
+      connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_specific, TQ_SLOT( setHidden(bool) ) );
     option_defaults->setChecked(options["use_defaults"] == "true");
-    connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );    
+    connect( option_defaults, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) );    
 
   } else {
 
diff --git a/tdeioslave/media/propsdlgplugin/propertiespagegui.ui b/tdeioslave/media/propsdlgplugin/propertiespagegui.ui
index 2a6ff899e..5d461b406 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespagegui.ui
+++ b/tdeioslave/media/propsdlgplugin/propertiespagegui.ui
@@ -372,12 +372,12 @@ Display the short name as is; store a long name when the short name is not all u
 <variables>
     <variable>bool m_hasChanged;</variable>
 </variables>
-<Q_SIGNALS>
+<signals>
     <signal>changed()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="protected">changedSlot()</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function returnType="bool">hasChanged()</function>
 </functions>
diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index ea830d2e1..f89e8a20a 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -28,8 +28,8 @@
 #include <kpushbutton.h>
 #include <tdefileshare.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
-#include <kstandarddirs.h>
+#include <tdeprocess.h>
+#include <tdestandarddirs.h>
 #include <kdialog.h>
 #include <tdeglobal.h>
 #include <dcopref.h>
@@ -70,10 +70,10 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
   d = new Private();
 
   d->page = new PropertiesPage(vbox, Medium::create(reply).id());
-  connect(d->page, TQT_SIGNAL(changed()),
-	  TQT_SLOT(slotChanged()));
+  connect(d->page, TQ_SIGNAL(changed()),
+	  TQ_SLOT(slotChanged()));
 
-  //  TQTimer::singleShot(100, this, TQT_SLOT(slotChanged()));
+  //  TQTimer::singleShot(100, this, TQ_SLOT(slotChanged()));
 
 }
 
diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp
index e2d367e7d..dabac39aa 100644
--- a/tdeioslave/media/tdecmodule/main.cpp
+++ b/tdeioslave/media/tdecmodule/main.cpp
@@ -49,13 +49,13 @@ MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList
 	
 	m_notifierModule = new NotifierModule( this, "notifier" );
 	tab->addTab( m_notifierModule, i18n( "&Notifications" ) );
-	connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ),
-	         this, TQT_SLOT( moduleChanged( bool ) ) );
+	connect( m_notifierModule, TQ_SIGNAL( changed( bool ) ),
+	         this, TQ_SLOT( moduleChanged( bool ) ) );
 
 	m_managerModule = new ManagerModule( this, "manager" );
 	tab->addTab( m_managerModule, i18n( "&Advanced" ) );
-	connect( m_managerModule, TQT_SIGNAL( changed( bool ) ),
-	         this, TQT_SLOT( moduleChanged( bool ) ) );
+	connect( m_managerModule, TQ_SIGNAL( changed( bool ) ),
+	         this, TQ_SLOT( moduleChanged( bool ) ) );
 
 
 
diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 9a443e551..03a5ea500 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -51,16 +51,16 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name )
 #endif
 	view->kcfg_CdPollingEnabled->setEnabled( false );
 
-	connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );
-	connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );	
+	connect( view->option_automount, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_ro, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_quiet, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_flush, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_uid, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_utf8, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_sync, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_atime, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_shortname, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) );
+	connect( view->option_journaling, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) );	
 
 	load();
 }	
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp
index 4364d93ad..edce1789d 100644
--- a/tdeioslave/media/tdecmodule/notifiermodule.cpp
+++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp
@@ -57,18 +57,18 @@ NotifierModule::NotifierModule(TQWidget *parent, const char *name)
 	
 	updateListBox();
 
-	connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ),
-	         this, TQT_SLOT( slotMimeTypeChanged(int) ) );
-	connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ),
-	         this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) );
-	connect( m_view->addButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotAdd() ) );
-	connect( m_view->editButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotEdit() ) );
-	connect( m_view->deleteButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotDelete() ) );
-	connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotToggleAuto() ) );
+	connect( m_view->mimetypesCombo, TQ_SIGNAL( activated(int) ),
+	         this, TQ_SLOT( slotMimeTypeChanged(int) ) );
+	connect( m_view->actionsList, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ),
+	         this, TQ_SLOT( slotActionSelected(TQListBoxItem*) ) );
+	connect( m_view->addButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotAdd() ) );
+	connect( m_view->editButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotEdit() ) );
+	connect( m_view->deleteButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotDelete() ) );
+	connect( m_view->toggleAutoButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotToggleAuto() ) );
 }
 
 NotifierModule::~NotifierModule()
@@ -129,7 +129,7 @@ void NotifierModule::slotActionSelected(TQListBoxItem *item)
 	bool isWritable = action!=0L && action->isWritable();
 	m_view->deleteButton->setEnabled( isWritable );
 	m_view->editButton->setEnabled( isWritable );
-	m_view->addButton->setEnabled( TRUE );
+	m_view->addButton->setEnabled( true );
 	m_view->toggleAutoButton->setEnabled( action!=0L && !m_mimetype.isEmpty() );
 }
 
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
index 4147e437c..bcf533b9d 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
@@ -78,10 +78,10 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action,
 	setMainWidget(m_view);
 	setCaption( m_action->label() );
 
-	connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ),
-	         this, TQT_SLOT( slotIconChanged() ) );
-	connect( m_view->commandButton, TQT_SIGNAL( clicked() ),
-	         this, TQT_SLOT( slotCommand() ) );
+	connect( m_view->iconButton, TQ_SIGNAL( iconChanged(TQString) ),
+	         this, TQ_SLOT( slotIconChanged() ) );
+	connect( m_view->commandButton, TQ_SIGNAL( clicked() ),
+	         this, TQ_SLOT( slotCommand() ) );
 }
 
 bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 )
diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp
index 9124568c1..33bc4a05b 100644
--- a/tdeioslave/media/tdeio_media.cpp
+++ b/tdeioslave/media/tdeio_media.cpp
@@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] =
 };
 
 extern "C" {
-	int KDE_EXPORT kdemain( int argc, char **argv )
+	int TDE_EXPORT kdemain( int argc, char **argv )
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
@@ -62,8 +62,8 @@ MediaProtocol::MediaProtocol(const TQCString &protocol,
                              const TQCString &pool, const TQCString &app)
 	: ForwardingSlaveBase(protocol, pool, app)
 {
-	connect( &m_impl, TQT_SIGNAL( warning( const TQString & ) ),
-	         this, TQT_SLOT( slotWarning( const TQString & ) ) );
+	connect( &m_impl, TQ_SIGNAL( warning( const TQString & ) ),
+	         this, TQ_SLOT( slotWarning( const TQString & ) ) );
 }
 
 MediaProtocol::~MediaProtocol()
diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp
index e2908f815..b29c66681 100644
--- a/tdeioslave/nfs/tdeio_nfs.cpp
+++ b/tdeioslave/nfs/tdeio_nfs.cpp
@@ -49,7 +49,7 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 
 #include <tdeio/global.h>
@@ -109,7 +109,7 @@ int x_getdomainname(char *name, size_t len)
 //#endif
 
 
-extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
+extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
@@ -135,9 +135,9 @@ static bool isRoot(const TQString& path)
 static bool isAbsoluteLink(const TQString& path)
 {
    //hmm, don't know
-   if (path.isEmpty()) return TRUE;
-   if (path[0]=='/') return TRUE;
-   return FALSE;
+   if (path.isEmpty()) return true;
+   if (path[0]=='/') return true;
+   return false;
 }
 
 static void createVirtualDirEntry(UDSEntry & entry)
@@ -190,14 +190,14 @@ static TQString removeFirstPart(const TQString& path)
 }
 
 NFSFileHandle::NFSFileHandle()
-:m_isInvalid(FALSE)
+:m_isInvalid(false)
 {
    memset(m_handle,'\0',NFS_FHSIZE+1);
 //   m_detectTime=time(0);
 }
 
 NFSFileHandle::NFSFileHandle(const NFSFileHandle & handle)
-:m_isInvalid(FALSE)
+:m_isInvalid(false)
 {
    m_handle[NFS_FHSIZE]='\0';
    memcpy(m_handle,handle.m_handle,NFS_FHSIZE);
@@ -220,11 +220,11 @@ NFSFileHandle& NFSFileHandle::operator= (const char* src)
 {
    if (src==0)
    {
-      m_isInvalid=TRUE;
+      m_isInvalid=true;
       return *this;
    };
    memcpy(m_handle,src,NFS_FHSIZE);
-   m_isInvalid=FALSE;
+   m_isInvalid=false;
 //   m_detectTime=time(0);
    return *this;
 }
@@ -455,7 +455,7 @@ void NFSProtocol::openConnection()
    if (!checkForError(clnt_stat, 0, m_currentHost.latin1())) return;
 
    fhstatus fhStatus;
-   bool atLeastOnceSucceeded(FALSE);
+   bool atLeastOnceSucceeded(false);
    for(; exportlist!=0;exportlist = exportlist->ex_next) {
       kdDebug(7121) << "found export: " << exportlist->ex_dir << endl;
 
@@ -463,7 +463,7 @@ void NFSProtocol::openConnection()
       clnt_stat = clnt_call(m_client, MOUNTPROC_MNT,(xdrproc_t) xdr_dirpath, (char*)(&(exportlist->ex_dir)),
                             (xdrproc_t) xdr_fhstatus,(char*) &fhStatus,total_timeout);
       if (fhStatus.fhs_status==0) {
-         atLeastOnceSucceeded=TRUE;
+         atLeastOnceSucceeded=true;
          NFSFileHandle fh;
          fh=fhStatus.fhstatus_u.fhs_fhandle;
          TQString fname;
@@ -1018,7 +1018,7 @@ bool NFSProtocol::checkForError(int clientStat, int nfsStat, const TQString& tex
       kdDebug(7121)<<"rpc error: "<<clientStat<<endl;
       //does this mapping make sense ?
       error(ERR_CONNECTION_BROKEN,i18n("An RPC error occurred."));
-      return FALSE;
+      return false;
    }
    if (nfsStat!=NFS_OK)
    {
@@ -1083,9 +1083,9 @@ bool NFSProtocol::checkForError(int clientStat, int nfsStat, const TQString& tex
          error(ERR_UNKNOWN,text);
          break;
       }
-      return FALSE;
+      return false;
    }
-   return TRUE;
+   return true;
 }
 
 void NFSProtocol::del( const KURL& url, bool isfile)
@@ -1585,7 +1585,7 @@ void NFSProtocol::symlink( const TQString &target, const KURL &dest, bool )
 bool NFSProtocol::isValidLink(const TQString& parentDir, const TQString& linkDest)
 {
    kdDebug(7121)<<"isValidLink: parent: "<<parentDir<<" link: "<<linkDest<<endl;
-   if (linkDest.isEmpty()) return FALSE;
+   if (linkDest.isEmpty()) return false;
    if (isAbsoluteLink(linkDest))
    {
       kdDebug(7121)<<"is an absolute link"<<endl;
@@ -1601,7 +1601,7 @@ bool NFSProtocol::isValidLink(const TQString& parentDir, const TQString& linkDes
       absDest=TQDir::cleanDirPath(absDest);
       kdDebug(7121)<<"simplified to "<<absDest<<endl;
       if (absDest.find("../")==0)
-         return FALSE;
+         return false;
 
       kdDebug(7121)<<"is inside the nfs tree"<<endl;
       absDest=parentDir+"/"+linkDest;
@@ -1610,6 +1610,6 @@ bool NFSProtocol::isValidLink(const TQString& parentDir, const TQString& linkDes
       NFSFileHandle fh=getFileHandle(absDest);
       return (!fh.isInvalid());
    }
-   return FALSE;
+   return false;
 }
 
diff --git a/tdeioslave/nfs/tdeio_nfs.h b/tdeioslave/nfs/tdeio_nfs.h
index 0930924a2..d71c57329 100644
--- a/tdeioslave/nfs/tdeio_nfs.h
+++ b/tdeioslave/nfs/tdeio_nfs.h
@@ -45,7 +45,7 @@ class NFSFileHandle
       NFSFileHandle& operator= (const char* src);
       operator const char* () const {return m_handle;}
       bool isInvalid() const {return m_isInvalid;}
-      void setInvalid() {m_isInvalid=TRUE;}
+      void setInvalid() {m_isInvalid=true;}
 //      time_t age() const;
    protected:
       char m_handle[NFS_FHSIZE+1];
diff --git a/tdeioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp
index 7b5fedf6c..1aba9025b 100644
--- a/tdeioslave/nntp/nntp.cpp
+++ b/tdeioslave/nntp/nntp.cpp
@@ -15,7 +15,7 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
@@ -35,7 +35,7 @@
 
 using namespace TDEIO;
 
-extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
+extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain(int argc, char **argv) {
 
diff --git a/tdeioslave/pop3/pop3.cpp b/tdeioslave/pop3/pop3.cpp
index f45f06d60..0132dc92c 100644
--- a/tdeioslave/pop3/pop3.cpp
+++ b/tdeioslave/pop3/pop3.cpp
@@ -52,7 +52,7 @@ extern "C" {
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <kmdcodec.h>
 #include <tdeprotocolmanager.h>
@@ -70,7 +70,7 @@ extern "C" {
 #define POP3_DEBUG kdDebug(7105)
 
 extern "C" {
-  int KDE_EXPORT kdemain(int argc, char **argv);
+  int TDE_EXPORT kdemain(int argc, char **argv);
 }
 
 using namespace TDEIO;
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
index 5b042295d..22bd19e7b 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 
 #include <kdirnotify_stub.h>
 
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
index a93ec7eae..e3e32fb5c 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
@@ -28,7 +28,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
 }
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
+	TDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj)
 	{
 		TDEGlobal::locale()->insertCatalogue("tdeio_remote");
 		return new RemoteDirNotifyModule(obj);
diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp
index a0f37b624..659273834 100644
--- a/tdeioslave/remote/remoteimpl.cpp
+++ b/tdeioslave/remote/remoteimpl.cpp
@@ -21,8 +21,8 @@
 
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 #include <kservice.h>
 #include <tdelocale.h>
 
@@ -140,7 +140,7 @@ KURL RemoteImpl::findBaseURL(const TQString &filename) const
 	TQString file = findDesktopFile(filename);
 	if (!file.isEmpty())
 	{
-		KDesktopFile desktop(file, true);
+		TDEDesktopFile desktop(file, true);
 		return desktop.readURL();
 	}
 	
@@ -218,7 +218,8 @@ void RemoteImpl::createEntry(TDEIO::UDSEntry &entry,
 {
 	kdDebug(1220) << "RemoteImpl::createEntry" << endl;
 
-	KDesktopFile desktop(directory+file, true);
+	TQString desktopPath(directory + file);
+	TDEDesktopFile desktop(desktopPath, true);
 
 	kdDebug(1220) << "path = " << directory << file << endl;
 
@@ -237,6 +238,8 @@ void RemoteImpl::createEntry(TDEIO::UDSEntry &entry,
 
 	addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon);
 	addAtom(entry, TDEIO::UDS_LINK_DEST, 0, desktop.readURL());
+
+	addAtom(entry, TDEIO::UDS_LOCAL_PATH, 0, desktopPath);
 }
 
 bool RemoteImpl::statNetworkFolder(TDEIO::UDSEntry &entry, const TQString &filename) const
@@ -286,7 +289,7 @@ bool RemoteImpl::renameFolders(const TQString &src, const TQString &dest,
 		bool res = dir.rename(src+".desktop", dest+".desktop");
 		if (res)
 		{
-			KDesktopFile desktop(directory+dest+".desktop");
+			TDEDesktopFile desktop(directory+dest+".desktop");
 			desktop.writeEntry("Name", dest);
 		}
 		return res;
diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp
index 271b0913f..258102a97 100644
--- a/tdeioslave/remote/tdeio_remote.cpp
+++ b/tdeioslave/remote/tdeio_remote.cpp
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
 };
 
 extern "C" {
-	int KDE_EXPORT kdemain( int argc, char **argv )
+	int TDE_EXPORT kdemain( int argc, char **argv )
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
diff --git a/tdeioslave/settings/tdeio_settings.cpp b/tdeioslave/settings/tdeio_settings.cpp
index 5d1e67a0e..3bdbd00eb 100644
--- a/tdeioslave/settings/tdeio_settings.cpp
+++ b/tdeioslave/settings/tdeio_settings.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tdeio/slavebase.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <tqtextstream.h>
 #include <tdelocale.h>
@@ -26,10 +26,10 @@
 #include <dcopclient.h>
 #include <tqdatastream.h>
 #include <time.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 class SettingsProtocol : public TDEIO::SlaveBase
 {
@@ -49,7 +49,7 @@ private:
 };
 
 extern "C" {
-	KDE_EXPORT int kdemain( int, char **argv )
+	TDE_EXPORT int kdemain( int, char **argv )
 	{
 	  kdDebug() << "kdemain for settings tdeioslave" << endl;
 	  TDEInstance instance( "tdeio_settings" );
diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index d62e7e062..3e88b8e65 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -33,6 +33,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
+#include <numeric>
+#include <functional>
+#include <vector>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -50,7 +54,7 @@
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/ioslave_defaults.h>
@@ -68,7 +72,7 @@
 using namespace TDEIO;
 extern "C"
 {
-  int KDE_EXPORT kdemain( int argc, char **argv )
+  int TDE_EXPORT kdemain( int argc, char **argv )
   {
     TDEInstance instance( "tdeio_sftp" );
 
@@ -92,6 +96,54 @@ extern "C"
   }
 }
 
+// Some helper functions/classes
+namespace {
+
+// A quick and dirty scope guard implementation
+class ExitGuard {
+public:
+  template<class Callable>
+  ExitGuard(Callable && undo_func) : f(std::forward<Callable>(undo_func)) {}
+  ExitGuard(ExitGuard && other) : f(std::move(other.f)) {
+      other.f = nullptr;
+  }
+
+  ~ExitGuard() {
+    run();
+  }
+
+  void run() noexcept {
+    if(f) { f(); f = nullptr; }
+  }
+
+  void abort() {
+    f = nullptr;
+  }
+
+  ExitGuard(const ExitGuard&) = delete;
+  void operator= (const ExitGuard&) = delete;
+
+private:
+    std::function<void()> f;
+};
+
+// A small helper to purge passwords. Paranoiac's note: this is not enough to guarantee the
+// complete purge of the password and all its copy from memory (ioslaves are sending the passwords
+// via dcop, so it's far beyond calling it "secure" in any way), but it's still better than nothing.
+void purgeString(TQString &s) {
+  s.fill('\0');
+  s.setLength(0);
+  s = TQString::null;
+}
+
+// A helper class to cleanup password when it goes out of the scope
+class PasswordPurger: public ExitGuard {
+public:
+  PasswordPurger(TQString &pw) : ExitGuard( [&pw](){purgeString(pw);} ) {}
+};
+
+} /* namespace */
+
 // The callback function for libssh
 int auth_callback(const char *prompt, char *buf, size_t len,
                   int echo, int verify, void *userdata)
@@ -120,6 +172,68 @@ void log_callback(ssh_session session, int priority, const char *message,
   slave->log_callback(session, priority, message, userdata);
 }
 
+class PublicKeyAuth: public SSHAuthMethod {
+public:
+  unsigned flag() override {return SSH_AUTH_METHOD_PUBLICKEY;};
+  int authenticate(sftpProtocol *ioslave) const override {
+    return ioslave->authenticatePublicKey();
+  }
+  SSHAuthMethod* clone() override {return new PublicKeyAuth; }
+};
+
+class KeyboardInteractiveAuth: public SSHAuthMethod {
+public:
+  KeyboardInteractiveAuth(bool noPaswordQuery = false): mNoPaswordQuery(noPaswordQuery) {}
+
+  unsigned flag() override {return SSH_AUTH_METHOD_INTERACTIVE;};
+  int authenticate(sftpProtocol *ioslave) const override {
+    return ioslave->authenticateKeyboardInteractive(mNoPaswordQuery);
+  }
+  SSHAuthMethod* clone() override {return new KeyboardInteractiveAuth(mNoPaswordQuery); }
+
+private:
+  const bool mNoPaswordQuery;
+};
+
+class PasswordAuth: public SSHAuthMethod {
+public:
+  PasswordAuth(bool noPaswordQuery = false): mNoPaswordQuery(noPaswordQuery) {}
+
+  unsigned flag() override {return SSH_AUTH_METHOD_PASSWORD;};
+  int authenticate(sftpProtocol *ioslave) const override {
+    return ioslave->authenticatePassword(mNoPaswordQuery);
+  }
+  SSHAuthMethod* clone() override {return new PasswordAuth(mNoPaswordQuery); }
+
+private:
+  const bool mNoPaswordQuery;
+};
+
+TQString SSHAuthMethod::flagToStr (unsigned m) {
+  switch (m) {
+    case SSH_AUTH_METHOD_NONE        : return TQString::fromLatin1 ( "none" );
+    case SSH_AUTH_METHOD_PASSWORD    : return TQString::fromLatin1 ( "password" );
+    case SSH_AUTH_METHOD_PUBLICKEY   : return TQString::fromLatin1 ( "publickey" );
+    case SSH_AUTH_METHOD_HOSTBASED   : return TQString::fromLatin1 ( "hostbased" );
+    case SSH_AUTH_METHOD_INTERACTIVE : return TQString::fromLatin1 ( "keyboard-interactive" );
+    case SSH_AUTH_METHOD_GSSAPI_MIC  : return TQString::fromLatin1 ( "gssapi-with-mic" );
+    default                          : return TQString::fromLatin1 ( "unknown" );
+  }
+}
+
+TQStringList SSHAuthMethod::bitsetToStr (unsigned m) {
+  TQStringList rv;
+
+  for (int i=0; m>>i; i++) {
+    unsigned flag = m & (1 << i);
+    if (flag) {
+      rv.append(flagToStr(flag));
+    }
+  }
+  return rv;
+}
+
+
 // Public key authentication
 int sftpProtocol::auth_callback(const char *prompt, char *buf, size_t len,
                                 int echo, int verify, void *userdata)
@@ -128,42 +242,82 @@ int sftpProtocol::auth_callback(const char *prompt, char *buf, size_t len,
   (void) echo;
   (void) verify;
   (void) userdata;
+  (void) prompt;
+
+  Q_ASSERT(len>0);
 
   kdDebug(TDEIO_SFTP_DB) << "Entering public key authentication callback" << endl;
 
-  if(!pubKeyInfo)
-  {
-    pubKeyInfo = new TDEIO::AuthInfo;
-  }
-  else
-  {
-    // TODO: inform user about incorrect password
-  }
+  int rc=0;
+  bool firstTimeCalled = !mPubKeyAuthData.wasCalled;
+  mPubKeyAuthData.wasCalled = true;
 
-  pubKeyInfo->url.setProtocol("sftp");
-  pubKeyInfo->url.setHost(mHost);
-  pubKeyInfo->url.setPort(mPort);
-  pubKeyInfo->url.setUser(mUsername);
+  AuthInfo pubKeyInfo = authInfo();
 
-  pubKeyInfo->caption      = i18n("SFTP Login");
-  pubKeyInfo->comment      = "sftp://" + mUsername + "@"  + mHost;
-  pubKeyInfo->username     = mUsername;
-  pubKeyInfo->readOnly     = false;
-  pubKeyInfo->prompt       = TQString::fromUtf8(prompt);
-  pubKeyInfo->keepPassword = false; // don't save passwords for public key,
+  pubKeyInfo.keepPassword = false; // don't save passwords for public key,
                                    // that's the task of ssh-agent.
+  pubKeyInfo.readOnly     = true;  // We don't want to handle user name change when authing with a key
 
-  if (!openPassDlg(*pubKeyInfo)) {
-    kdDebug(TDEIO_SFTP_DB) << "User canceled entry of public key password." << endl;
-    return -1;
+  TQString errMsg;
+  TQString keyFile;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 10, 0)
+  // no way to determine keyfile name on older libssh
+#else
+  char *ssh_key_file = 0;
+  rc = ssh_userauth_publickey_auto_get_current_identity(mSession, &ssh_key_file);
+
+  if (rc == 0 && ssh_key_file && ssh_key_file[0]) {
+    keyFile = ssh_key_file;
   }
+  ssh_string_free_char(ssh_key_file);
+#endif
 
-  strncpy(buf, pubKeyInfo->password.utf8().data(), len - 1);
+  bool firstTry = !mPubKeyAuthData.attemptedKeys.contains(keyFile);
 
-  pubKeyInfo->password.fill('x');
-  pubKeyInfo->password = "";
+  if (firstTry) {
+    SlaveBase::s_seqNr = mPubKeyAuthData.current_seqNr;
+  } else {
+    errMsg = i18n("Incorrect or invalid passphrase.").append('\n');
+  }
 
-  return 0;
+  // libssh prompt is trash and we know we use this function only for publickey auth, so we'll give
+  // the user a descent prompt
+  if (!keyFile.isEmpty()) {
+      pubKeyInfo.prompt = i18n("Please enter the passphrase for next public key:\n%1").arg(keyFile);
+  } else { // Generally shouldn't happend but on older libssh
+      pubKeyInfo.prompt = i18n("Please enter the passphrase for your public key.");
+  }
+
+  // We don't want to clobber with normal passwords in kpasswdserver's cache
+  pubKeyInfo.realmValue = "keyfile passphrase:" + keyFile;
+
+  if (openPassDlg(pubKeyInfo, errMsg)) {
+    if (len < pubKeyInfo.password.utf8().length()+1) {
+      kdDebug(TDEIO_SFTP_DB) << "Insufficient buffer size for password: " << len
+        << " (" << pubKeyInfo.password.utf8().length()+1 << "needed)" << endl;
+    }
+
+    strncpy(buf, pubKeyInfo.password.utf8().data(), len-1);
+    buf[len-1]=0; // Just to be on the safe side
+
+    purgeString(pubKeyInfo.password);
+
+    // take a note that we already tried unlocking this keyfile
+    if(firstTry) {
+      mPubKeyAuthData.attemptedKeys.append(keyFile);
+    }
+
+    // we consider publickey auth canceled only if we cancel all the key dialogs
+    mPubKeyAuthData.wasCanceled = false;
+  } else {
+    kdDebug(TDEIO_SFTP_DB) << "User canceled entry of public key passphrase" << endl;
+    rc = -1;
+    if (firstTimeCalled) {
+      mPubKeyAuthData.wasCanceled = true;
+    }
+  }
+
+  return rc;
 }
 
 void sftpProtocol::log_callback(ssh_session session, int priority,
@@ -174,91 +328,323 @@ void sftpProtocol::log_callback(ssh_session session, int priority,
   kdDebug(TDEIO_SFTP_DB) << "[" << priority << "] " << message << endl;
 }
 
-int sftpProtocol::authenticateKeyboardInteractive(AuthInfo &info) {
-  TQString name, instruction, prompt;
-  int err = SSH_AUTH_ERROR;
+int sftpProtocol::authenticatePublicKey(){
+  kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with public key" << endl;
+
+  // First let's do some cleanup
+  mPubKeyAuthData.attemptedKeys.clear();
+  mPubKeyAuthData.current_seqNr = SlaveBase::s_seqNr;
+  mPubKeyAuthData.wasCalled = 0;
+  mPubKeyAuthData.wasCanceled = 0;
+
+  int rc;
+
+  while (1) {
+    mPubKeyAuthData.wasCalled = 0;
+    rc = ssh_userauth_publickey_auto(mSession, nullptr, nullptr);
+
+    kdDebug(TDEIO_SFTP_DB) << "ssh_userauth_publickey_auto returned rc=" << rc
+      << " ssh_err=" << ssh_get_error_code(mSession)
+      << " (" <<  ssh_get_error(mSession) << ")" << endl;
+    if (rc == SSH_AUTH_DENIED) {
+      if (!mPubKeyAuthData.wasCalled) {
+        kdDebug(TDEIO_SFTP_DB) << "Passkey auth denied because it has no matching key" << endl;
+        break; /* rc == SSH_AUTH_DENIED */
+      } else if (mPubKeyAuthData.wasCanceled) {
+        kdDebug(TDEIO_SFTP_DB) << "Passkey auth denied because user canceled" << endl;
+        rc = sftpProtocol::SSH_AUTH_CANCELED;
+        break;
+      } else {
+        kdDebug(TDEIO_SFTP_DB) << "User entered wrong passphrase for the key" << endl;
+        mPubKeyAuthData.current_seqNr = SlaveBase::s_seqNr;
+        // Try it again
+      }
+    } else {
+      // every other rc is either error or success
+      break;
+    }
+  }
+
+  return rc;
+}
 
+int sftpProtocol::authenticateKeyboardInteractive(bool noPaswordQuery) {
   kdDebug(TDEIO_SFTP_DB) << "Entering keyboard interactive function" << endl;
 
-  err = ssh_userauth_kbdint(mSession, mUsername.utf8().data(), NULL);
-  while (err == SSH_AUTH_INFO) {
+  int rc = SSH_AUTH_ERROR;
+
+  bool retryDenied = false; // a flag to avoid infinite looping
+
+  TQString cachablePassword;
+  PasswordPurger cachePurger(cachablePassword);
+
+  // Different prompts during a single pass should be queried with the same s_seqNr value
+  long current_seqNr = SlaveBase::s_seqNr;
+
+  while (1) {
     int n = 0;
     int i = 0;
 
+    rc = ssh_userauth_kbdint(mSession, NULL, NULL);
+
+    if (rc == SSH_AUTH_DENIED) { // do nothing
+      kdDebug(TDEIO_SFTP_DB) << "kb-interactive auth was denied; retrying again" << endl;
+      if (retryDenied) {
+        // If we were denied update the s_seqNr
+        current_seqNr = SlaveBase::s_seqNr;
+        continue;
+      } else {
+        break;
+      }
+    } else if (rc != SSH_AUTH_INFO) {
+      kdDebug(TDEIO_SFTP_DB) << "Finishing kb-interactive auth rc=" << rc
+        << " ssh_err=" << ssh_get_error_code(mSession)
+        << " (" <<  ssh_get_error(mSession) << ")" << endl;
+      break;
+    }
+
+    // See "RFC4256 Section 3.3 User Interface" for meaning of the values
+    TQString name, instruction, prompt;
     name = TQString::fromUtf8(ssh_userauth_kbdint_getname(mSession));
     instruction = TQString::fromUtf8(ssh_userauth_kbdint_getinstruction(mSession));
     n = ssh_userauth_kbdint_getnprompts(mSession);
 
+    if (n>0) {
+      // If there is at least one prompt we will want to retry auth if we fail
+      retryDenied = true;
+    }
+
     kdDebug(TDEIO_SFTP_DB) << "name=" << name << " instruction=" << instruction
-      << " prompts" << n << endl;
+      << " prompts:" << n << endl;
 
     for (i = 0; i < n; ++i) {
       char echo;
-      const char *answer = "";
+      bool isPassword=false;
+      TQString answer;
+      TQString errMsg;
+
+      // restore the s_seqNr so it would be the same for all the prompts
+      SlaveBase::s_seqNr = current_seqNr;
 
       prompt = TQString::fromUtf8(ssh_userauth_kbdint_getprompt(mSession, i, &echo));
       kdDebug(TDEIO_SFTP_DB) << "prompt=" << prompt << " echo=" << TQString::number(echo) << endl;
-      if (echo) {
-        // See RFC4256 Section 3.3 User Interface
-        TQString newPrompt;
-        TDEIO::AuthInfo infoKbdInt;
 
-        infoKbdInt.url.setProtocol("sftp");
-        infoKbdInt.url.setHost(mHost);
-        infoKbdInt.url.setPort(mPort);
+      TDEIO::AuthInfo infoKbdInt = authInfo();
+      infoKbdInt.realmValue = prompt; // each prompt will be treated on its own by kpasswdserver
+      infoKbdInt.keepPassword = false;
+
+      if (!name.isEmpty()) {
+        infoKbdInt.caption = TQString(i18n("SFTP Login") + " - " + name);
+      }
+
+      // Those strings might or might not contain some sensitive information
+      PasswordPurger answerPurger{answer};
+      PasswordPurger infoPurger{infoKbdInt.password};
 
-        infoKbdInt.caption = i18n("SFTP Login");
-        infoKbdInt.comment = "sftp://" + mUsername + "@"  + mHost;
+      if (!echo) {
+        // ssh server requests us to ask user a question without displaying an answer. In normal
+        // circumstances this is probably a password, but it might be something else depending
+        // on the server configuration.
+        if (prompt.lower().startsWith("password")) {
+          // We can assume that the ssh server asks for a password and we will handle that case
+          // with more care since it's what most users will see
+          isPassword = true;
+          if (noPaswordQuery) { // if we have a cached password we might use it
+            kdDebug(TDEIO_SFTP_DB) << "Using cached password" << endl;
+            answer = mPassword;
+            cachablePassword = mPassword;
+            purgeString(mPassword); // if we used up password purge it
+          } else {
+            infoKbdInt.prompt = i18n("Please enter your password.");
+            infoKbdInt.realmValue = TQString(); // passwords use generic realm
+            infoKbdInt.keepPassword = true;
+
+            if (mPasswordWasPrompted) {
+              errMsg = i18n("Login failed: incorrect password or username.").append('\n');
+            }
+            mPasswordWasPrompted = true;
+          }
+        } else {
+          // If the server's request doesn't look like a password, keep the servers prompt but
+          // don't prompt for saving the answer
+          infoKbdInt.prompt = i18n("Please enter answer for the next request:");
+          if (!instruction.isEmpty()) {
+            infoKbdInt.prompt.append("\n\n").append(instruction);
+          }
+          infoKbdInt.prompt.append("\n\n").append(prompt);
+          infoKbdInt.readOnly = true; // set username readonly (enable changing it only with password)
+        }
+
+        if (answer.isNull()) {
+          if (openPassDlg(infoKbdInt, errMsg)) {
+            answer = infoKbdInt.password;
+            kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog" << endl;
 
-        if (!name.isEmpty()) {
-          infoKbdInt.caption = TQString(i18n("SFTP Login") + " - " + name);
+            if (isPassword) {
+              TQString sshUser=sshUsername();
+              if (infoKbdInt.username != sshUser) {
+                kdDebug(TDEIO_SFTP_DB) << "Username changed from " << sshUser
+                                       << " to " << infoKbdInt.username << endl;
+                mCachedUsername = infoKbdInt.username;
+                mPassword = infoKbdInt.password;
+
+                return sftpProtocol::SSH_AUTH_NEED_RECONNECT;
+              }
+            }
+          } else {
+            return sftpProtocol::SSH_AUTH_CANCELED;
+          }
         }
+      } else {
+        // ssh server asks for some clear-text information from a user (e.g. a one-time
+        // identification code) which should be echoed while user enters it. As for now tdeio has
+        // no means to handle that correctly, so we will have to be creative with the password
+        // dialog.
+        TQString newPrompt;
 
         if (!instruction.isEmpty()) {
           newPrompt = instruction + "\n\n";
         }
+        newPrompt.append(prompt).append("\n\n");
+        newPrompt.append(i18n("Use the username input field to answer this question."));
+        infoKbdInt.prompt = newPrompt;
 
-        newPrompt.append(prompt + "\n\n");
-        infoKbdInt.readOnly = false;
-        infoKbdInt.keepPassword = false;
-        infoKbdInt.prompt = i18n("Use the username input field to answer this question.");
+        infoKbdInt.url.setUser(infoKbdInt.username);
+        infoKbdInt.username = TQString::null;
 
+        infoKbdInt.readOnly = false;
 
         if (openPassDlg(infoKbdInt)) {
-          kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog" << endl;
-          answer = info.username.utf8().data();
+          answer = infoKbdInt.username;
+          kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog: " << answer << endl;
+        } else {
+          return sftpProtocol::SSH_AUTH_CANCELED;
         }
+      }
 
-        if (ssh_userauth_kbdint_setanswer(mSession, i, answer) < 0) {
-          kdDebug(TDEIO_SFTP_DB) << "An error occurred setting the answer: "
-            << ssh_get_error(mSession) << endl;
-          return SSH_AUTH_ERROR;
-        }
-        break;
-      } else {
-        if (prompt.lower().startsWith("password")) {
-          answer = mPassword.utf8().data();
-        } else {
-          info.readOnly = true; // set username readonly
-          info.prompt = prompt;
+      if (ssh_userauth_kbdint_setanswer(mSession, i, answer.utf8().data()) < 0) {
+        kdDebug(TDEIO_SFTP_DB) << "An error occurred setting the answer: "
+          << ssh_get_error(mSession) << endl;
+        return SSH_AUTH_ERROR;
+      }
+    } // for each ssh_userauth_kbdint_getprompt()
+  } // while (1)
 
-          if (openPassDlg(info)) {
-            kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog" << endl;
-            answer = info.password.utf8().data();
-          }
-        }
+  if (!mPasswordWasPrompted && !cachablePassword.isEmpty() && (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_PARTIAL)) {
+    // if the password was never prompted, it was never cached, so we should cache it manually
+    TDEIO::AuthInfo info = authInfo();
+    info.password = cachablePassword;
+    info.keepPassword = false;
+    cacheAuthentication(info);
+    purgeString(info.password);
+  }
 
-        if (ssh_userauth_kbdint_setanswer(mSession, i, answer) < 0) {
-          kdDebug(TDEIO_SFTP_DB) << "An error occurred setting the answer: "
-            << ssh_get_error(mSession) << endl;
-          return SSH_AUTH_ERROR;
-        }
+  return rc;
+}
+
+int sftpProtocol::authenticatePassword(bool noPaswordQuery) {
+  kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with password" << endl;
+
+  AuthInfo info = authInfo();
+  info.keepPassword = true;
+  info.prompt = i18n("Please enter your username and password.");
+
+  PasswordPurger pPurger(info.password);
+
+  int rc;
+  do {
+    TQString errMsg;
+
+    if(noPaswordQuery) { // on the first try use cached password
+      info.password = mPassword;
+      purgeString(mPassword);
+    } else {
+      if (mPasswordWasPrompted) {
+        errMsg = i18n("Login failed: incorrect password or username.").append('\n');
+      }
+
+      mPasswordWasPrompted = true;
+
+      // Handle user canceled or dialog failed to open...
+      if (!openPassDlg(info, errMsg)) {
+        kdDebug(TDEIO_SFTP_DB) << "User canceled password dialog" << endl;
+        return sftpProtocol::SSH_AUTH_CANCELED;
+      }
+
+      TQString sshUser=sshUsername();
+      if (info.username != sshUser) {
+        kdDebug(TDEIO_SFTP_DB) << "Username changed from " << sshUser
+                               << " to " << info.username << endl;
+        mCachedUsername = info.username;
+        mPassword = info.password;
+        // libssh doc says that most servers don't permit changing the username during
+        // authentication, so we should reinitialize the session here
+        return sftpProtocol::SSH_AUTH_NEED_RECONNECT;
       }
     }
-    err = ssh_userauth_kbdint(mSession, mUsername.utf8().data(), NULL);
+
+    rc = ssh_userauth_password(mSession, NULL, info.password.utf8().data());
+
+  } while (rc == SSH_AUTH_DENIED && !noPaswordQuery);
+
+  if (!mPasswordWasPrompted && (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_PARTIAL)) {
+    // if the password was never prompted, it was never cached, so we should cache it manually
+    info.keepPassword = false;
+    cacheAuthentication(info);
+  }
+  return rc;
+}
+
+
+TQString sftpProtocol::sshUsername() {
+  int rc;
+  TQString rv;
+
+  char *ssh_username = NULL;
+  rc = ssh_options_get(mSession, SSH_OPTIONS_USER, &ssh_username);
+  if (rc == 0 && ssh_username && ssh_username[0]) {
+    rv = TQString::fromUtf8(ssh_username);
   }
+  ssh_string_free_char(ssh_username);
 
-  return err;
+  return rv;
+}
+
+
+TQString sftpProtocol::sshError(TQString errMsg) {
+  if (ssh_get_error_code(mSession)) {
+    errMsg.append("\n\n").append(i18n("SSH error: \"%1\" (%2)")
+      .arg(TQString::fromUtf8(ssh_get_error(mSession))).arg(ssh_get_error_code(mSession)));
+  }
+  return errMsg;
+}
+
+TDEIO::AuthInfo sftpProtocol::authInfo() {
+  TDEIO::AuthInfo rv;
+
+  rv.url.setProtocol("sftp");
+  rv.url.setHost(mHost);
+  rv.url.setPort(mPort);
+  rv.url.setUser(mUsername);
+
+  rv.caption = i18n("SFTP Login");
+  rv.comment = "sftp://" + mHost + ':' + TQString::number(mPort);
+  rv.commentLabel = i18n("site:");
+
+  if(!mUsername.isEmpty()) {
+    rv.username = mUsername;
+  } if(!mCachedUsername.isEmpty()) {
+    rv.username = mCachedUsername;
+  } else if (mSession) {
+    rv.username = sshUsername();
+  }
+
+  // if username was specified in the address string it shouldn't be changed
+  if (!mUsername.isEmpty()) {
+    rv.readOnly = true;
+  }
+
+  return rv;
 }
 
 void sftpProtocol::reportError(const KURL &url, const int err) {
@@ -447,7 +833,7 @@ TQString sftpProtocol::canonicalizePath(const TQString &path) {
 sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
              : SlaveBase("tdeio_sftp", pool_socket, app_socket),
                   mConnected(false), mPort(-1), mSession(NULL), mSftp(NULL) {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
   kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
 
   kdDebug(TDEIO_SFTP_DB) << "debug = " << getenv("TDEIO_SFTP_LOG_VERBOSITY") << endl;
@@ -470,15 +856,17 @@ sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_so
 }
 
 sftpProtocol::~sftpProtocol() {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
   kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
 #endif
   closeConnection();
 
-  delete mCallbacks;
+  free(mCallbacks);
 
   /* cleanup and shut down cryto stuff */
   ssh_finalize();
+
+  purgeString(mPassword);
 }
 
 void sftpProtocol::setHost(const TQString& h, int port, const TQString& user, const TQString& pass) {
@@ -505,53 +893,11 @@ void sftpProtocol::setHost(const TQString& h, int port, const TQString& user, co
 
   mUsername = user;
   mPassword = pass;
+  mCachedUsername = TQString::null;
 }
 
-void sftpProtocol::openConnection() {
-
-  if (mConnected) {
-    return;
-  }
-
-  kdDebug(TDEIO_SFTP_DB) << "username=" << mUsername << ", host=" << mHost << ", port=" << mPort << endl;
-
-  infoMessage(i18n("Opening SFTP connection to host %1:%2").arg(mHost).arg(mPort));
-
-  if (mHost.isEmpty()) {
-    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
-    error(TDEIO::ERR_UNKNOWN_HOST, i18n("No hostname specified."));
-    return;
-  }
-
-  // Setup AuthInfo for use with password caching and the
-  // password dialog box.
-  AuthInfo info;
-
-  info.url.setProtocol("sftp");
-  info.url.setHost(mHost);
-  info.url.setPort(mPort);
-  info.url.setUser(mUsername);
-  info.caption = i18n("SFTP Login");
-  info.comment = "sftp://" + mHost + ':' + TQString::number(mPort);
-  info.commentLabel = i18n("site:");
-  info.username = mUsername;
-  info.keepPassword = true; // make the "keep Password" check box visible to the user.
-
-  // Check for cached authentication info if no password is specified...
-  if (mPassword.isEmpty()) {
-    kdDebug(TDEIO_SFTP_DB) << "checking cache: info.username = " << info.username
-      << ", info.url = " << info.url.prettyURL() << endl;
-
-    if (checkCachedAuthentication(info)) {
-      kdDebug() << "using cached" << endl;
-      mUsername = info.username;
-      mPassword = info.password;
-    }
-  }
 
-  // Start the ssh connection.
-  TQString msg;     // msg for dialog box
-  TQString caption; // dialog box caption
+int sftpProtocol::initializeConnection() {
   unsigned char *hash = NULL; // the server hash
   char *hexa;
   char *verbosity;
@@ -561,7 +907,7 @@ void sftpProtocol::openConnection() {
   mSession = ssh_new();
   if (mSession == NULL) {
     error(TDEIO::ERR_INTERNAL, i18n("Could not create a new SSH session."));
-    return;
+    return SSH_ERROR;
   }
 
   kdDebug(TDEIO_SFTP_DB) << "Creating the SSH session and setting options" << endl;
@@ -591,23 +937,24 @@ void sftpProtocol::openConnection() {
   rc = ssh_options_set(mSession, SSH_OPTIONS_HOST, mHost.utf8().data());
   if (rc < 0) {
     error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set host."));
-    return;
+    return SSH_ERROR;
   }
 
   if (mPort > 0) {
     rc = ssh_options_set(mSession, SSH_OPTIONS_PORT, &mPort);
     if (rc < 0) {
-        error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set port."));
-      return;
+      error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set port."));
+      return SSH_ERROR;
     }
   }
 
   // Set the username
-  if (!mUsername.isEmpty()) {
-    rc = ssh_options_set(mSession, SSH_OPTIONS_USER, mUsername.utf8().data());
+  if (!mCachedUsername.isEmpty() || !mUsername.isEmpty()) {
+    TQString username = !mCachedUsername.isEmpty() ? mCachedUsername : mUsername;
+    rc = ssh_options_set(mSession, SSH_OPTIONS_USER, username.utf8().data());
     if (rc < 0) {
       error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set username."));
-      return;
+      return rc;
     }
   }
 
@@ -616,7 +963,7 @@ void sftpProtocol::openConnection() {
     rc = ssh_options_set(mSession, SSH_OPTIONS_LOG_VERBOSITY_STR, verbosity);
     if (rc < 0) {
       error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not set log verbosity."));
-      return;
+      return rc;
     }
   }
 
@@ -624,7 +971,7 @@ void sftpProtocol::openConnection() {
   rc = ssh_options_parse_config(mSession, NULL);
   if (rc < 0) {
     error(TDEIO::ERR_INTERNAL, i18n("Could not parse the config file."));
-    return;
+    return rc;
   }
 
   ssh_set_callbacks(mSession, mCallbacks);
@@ -634,9 +981,8 @@ void sftpProtocol::openConnection() {
   /* try to connect */
   rc = ssh_connect(mSession);
   if (rc < 0) {
-    error(TDEIO::ERR_COULD_NOT_CONNECT, TQString::fromUtf8(ssh_get_error(mSession)));
-    closeConnection();
-    return;
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
   }
 
   kdDebug(TDEIO_SFTP_DB) << "Getting the SSH server hash" << endl;
@@ -644,24 +990,24 @@ void sftpProtocol::openConnection() {
   /* get the hash */
   ssh_key serverKey;
 #if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
-  if (ssh_get_publickey(mSession, &serverKey) < 0) {
+  rc = ssh_get_publickey(mSession, &serverKey);
 #else
-  if (ssh_get_server_publickey(mSession, &serverKey) < 0) {
+  rc = ssh_get_server_publickey(mSession, &serverKey);
 #endif
-    error(TDEIO::ERR_COULD_NOT_CONNECT, TQString::fromUtf8(ssh_get_error(mSession)));
-    closeConnection();
-    return;
+  if (rc<0) {
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
   }
 
   size_t hlen;
 #if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 8, 90)
-  if (ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_MD5, &hash, &hlen) < 0) {
+  rc = ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_MD5, &hash, &hlen);
 #else
-  if (ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_SHA256, &hash, &hlen) < 0) {
+  rc = ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_SHA256, &hash, &hlen);
 #endif
-    error(TDEIO::ERR_COULD_NOT_CONNECT, TQString::fromUtf8(ssh_get_error(mSession)));
-    closeConnection();
-    return;
+  if (rc<0) {
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
   }
 
   kdDebug(TDEIO_SFTP_DB) << "Checking if the SSH server is known" << endl;
@@ -682,8 +1028,7 @@ void sftpProtocol::openConnection() {
             "An attacker might change the default server key to confuse your "
             "client into thinking the key does not exist.\n"
             "Please contact your system administrator.\n%1").arg(TQString::fromUtf8(ssh_get_error(mSession))));
-      closeConnection();
-      return;
+      return SSH_ERROR;
     case TDEIO_SSH_KNOWN_HOSTS_CHANGED:
       hexa = ssh_get_hexa(hash, hlen);
       delete hash;
@@ -695,10 +1040,11 @@ void sftpProtocol::openConnection() {
           "Please contact your system administrator.\n%3").arg(
           mHost).arg(TQString::fromUtf8(hexa)).arg(TQString::fromUtf8(ssh_get_error(mSession))));
       delete hexa;
-      closeConnection();
-      return;
+      return SSH_ERROR;
     case TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND:
-    case TDEIO_SSH_KNOWN_HOSTS_UNKNOWN:
+    case TDEIO_SSH_KNOWN_HOSTS_UNKNOWN: {
+      TQString msg;     // msg for dialog box
+      TQString caption; // dialog box caption
       hexa = ssh_get_hexa(hash, hlen);
       delete hash;
       caption = i18n("Warning: Cannot verify host's identity.");
@@ -708,9 +1054,8 @@ void sftpProtocol::openConnection() {
       delete hexa;
 
       if (KMessageBox::Yes != messageBox(WarningYesNo, msg, caption)) {
-        closeConnection();
         error(TDEIO::ERR_USER_CANCELED, TQString());
-        return;
+        return SSH_ERROR;
       }
 
       /* write the known_hosts file */
@@ -720,136 +1065,200 @@ void sftpProtocol::openConnection() {
 #else
       if (ssh_session_update_known_hosts(mSession) != SSH_OK) {
 #endif
-        error(TDEIO::ERR_USER_CANCELED, TQString::fromUtf8(ssh_get_error(mSession)));
-        closeConnection();
-        return;
+        error(TDEIO::ERR_USER_CANCELED, sshError());
+        return SSH_ERROR;
       }
       break;
+    }
     case TDEIO_SSH_KNOWN_HOSTS_ERROR:
       delete hash;
-      error(TDEIO::ERR_COULD_NOT_CONNECT, TQString::fromUtf8(ssh_get_error(mSession)));
-      return;
+      error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+      return SSH_ERROR;
   }
 
   kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with the server" << endl;
 
-  // Try to authenticate
-  rc = ssh_userauth_none(mSession, NULL);
-  if (rc == SSH_AUTH_ERROR) {
-    closeConnection();
-        error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed (method: %1).")
-                                          .arg(i18n("none")));
+  return SSH_OK;
+}
+
+
+void sftpProtocol::openConnection() {
+
+  if (mConnected) {
     return;
   }
 
-  int method = ssh_auth_list(mSession);
-  if (!method && rc != SSH_AUTH_SUCCESS)
-  {
-    error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed."
-          " The server did not send any authentication methods!"));
+  kdDebug(TDEIO_SFTP_DB) << "username=" << mUsername << ", host=" << mHost << ", port=" << mPort << endl;
+
+  infoMessage(i18n("Opening SFTP connection to host %1:%2").arg(mHost).arg(mPort));
+
+  if (mHost.isEmpty()) {
+    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
+    error(TDEIO::ERR_UNKNOWN_HOST, i18n("No hostname specified."));
     return;
   }
 
-  bool firstTime = true;
-  bool dlgResult;
-  while (rc != SSH_AUTH_SUCCESS) {
-    // Try to authenticate with public key first
-    if (rc != SSH_AUTH_SUCCESS && (method & SSH_AUTH_METHOD_PUBLICKEY) && !mPassword)
-    {
-      kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with public key" << endl;
-      for(;;)
-      {
-        rc = ssh_userauth_publickey_auto(mSession, nullptr, nullptr);
-        if (rc == SSH_AUTH_ERROR)
-        {
-          clearPubKeyAuthInfo();
-          closeConnection();
-          error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed (method: %1).")
-                                            .arg(i18n("public key")));
-          return;
-        }
-        if (rc == SSH_AUTH_DENIED || !pubKeyInfo || !pubKeyInfo->isModified())
-        {
-          clearPubKeyAuthInfo();
-          break;
-        }
-      }
+  // Check for cached authentication info if no password is specified...
+  if (mPassword.isEmpty()) {
+    AuthInfo info = authInfo();
+
+    kdDebug(TDEIO_SFTP_DB) << "checking cache: info.username = " << info.username
+      << ", info.url = " << info.url.prettyURL() << endl;
+
+    if (checkCachedAuthentication(info)) {
+      kdDebug() << "using cached" << endl;
+      mCachedUsername = info.username;
+      mPassword = info.password;
+
+      purgeString(info.password); //< not really necessary because of Qt's implicit data sharing
     }
+  }
 
-    // Try to authenticate with keyboard interactive
-    if (rc != SSH_AUTH_SUCCESS && (method & SSH_AUTH_METHOD_INTERACTIVE))
-    {
-      kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with keyboard interactive" << endl;
+  mPasswordWasPrompted = false;
+  PasswordPurger pwPurger{mPassword};
 
-      TDEIO::AuthInfo tmpInfo(info);
-      rc = authenticateKeyboardInteractive(tmpInfo);
-      if (rc == SSH_AUTH_SUCCESS)
-      {
-        info = tmpInfo;
-      }
-      else if (rc == SSH_AUTH_ERROR)
-      {
-        closeConnection();
-        error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed (method: %1).")
-                                          .arg(i18n("keyboard interactive")));
-        return;
-      }
-   }
+  int rc;
+  ExitGuard connectionCloser([this](){ closeConnection(); });
 
-    // Try to authenticate with password
-    if (rc != SSH_AUTH_SUCCESS && (method & SSH_AUTH_METHOD_PASSWORD))
-    {
-      kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with password" << endl;
-
-      info.keepPassword = true;
-      for(;;)
-      {
-        if(!firstTime || mPassword.isEmpty())
-        {
-          if (firstTime) {
-            info.prompt = i18n("Please enter your username and password.");
-          } else {
-            info.prompt =  i18n("Login failed.\nPlease confirm your username and password, and enter them again.");
-          }
-          dlgResult = openPassDlg(info);
-
-          // Handle user canceled or dialog failed to open...
-          if (!dlgResult) {
-            kdDebug(TDEIO_SFTP_DB) << "User canceled, dlgResult = " << dlgResult << endl;
-            closeConnection();
-            error(TDEIO::ERR_USER_CANCELED, TQString());
-            return;
-          }
+  do { // A loop to restart connection when needed
+    // Start the ssh connection.
+    if (initializeConnection() < 0) {
+      return;
+    }
 
-          firstTime = false;
-        }
+    // Try to authenticate (this required before calling ssh_auth_list())
+    rc = ssh_userauth_none(mSession, NULL);
+    if (rc == SSH_AUTH_ERROR) {
+      error(TDEIO::ERR_COULD_NOT_LOGIN, sshError(i18n("Authentication failed (method: %1).")
+                                        .arg(i18n("none"))));
+      return;
+    }
 
-        if (mUsername != info.username) {
-          kdDebug(TDEIO_SFTP_DB) << "Username changed from " << mUsername
-                                 << " to " << info.username << endl;
-        }
-        mUsername = info.username;
-        mPassword = info.password;
+    // Preinit the list of supported auth methods
+    static const auto authMethodsNormal = [](){
+      std::vector<std::unique_ptr<SSHAuthMethod>> rv;
+      rv.emplace_back(std::unique_ptr<PublicKeyAuth>(new PublicKeyAuth));
+      rv.emplace_back(std::unique_ptr<KeyboardInteractiveAuth>(new KeyboardInteractiveAuth));
+      rv.emplace_back(std::unique_ptr<PasswordAuth>(new PasswordAuth));
+      return rv;
+    }();
+
+    const static int supportedMethods = std::accumulate(
+        authMethodsNormal.begin(), authMethodsNormal.end(),
+        SSH_AUTH_METHOD_NONE, //< none is supported by default
+        [](int acc, const std::unique_ptr<SSHAuthMethod> &m){ return acc |= m->flag(); });
+
+    unsigned attemptedMethods = 0;
+
+    // Backup of the value of the SlaveBase::s_seqNr. This is used to query different data values
+    // with openPassDlg() with the same seqNr. Otherwise it will result in the prompting of the pass
+    // dialog to the user in cases the values should be recovered from the cache.
+    // This is a bit hacky but necessary
+    long current_seqNr = SlaveBase::s_seqNr;
+
+    while (rc != SSH_AUTH_SUCCESS) {
+      // Note this loop can rerun in case of multistage ssh authentication e.g. "password,publickey"
+      // which will require user to provide a valid password at first and then a valid public key.
+      // see AuthenticationMethods in man 5 sshd_config for more info
+      bool wasCanceled = false;
+      unsigned availableMethodes = ssh_auth_list(mSession);
+
+      SlaveBase::s_seqNr = current_seqNr;
+
+      if (!availableMethodes) {
+        // Technically libssh docs suggest that the server merely MAY send auth methods, but it's
+        // highly unclear what we should do in such case and it looks like openssh doesn't have an
+        // option for that, so let's just consider this server a jerk and don't talk to him anymore.
+        error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed.\n"
+              "The server did not send any authentication methods!"));
+        return;
+      } else if (!(availableMethodes & supportedMethods)) {
+        error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed.\n"
+              "The server sent only unsupported authentication methods (%1)!")
+              .arg(SSHAuthMethod::bitsetToStr(availableMethodes).join(", ")));
+        return;
+      }
 
-        rc = ssh_userauth_password(mSession, mUsername.utf8().data(),
-                                  mPassword.utf8().data());
-        if (rc == SSH_AUTH_ERROR) {
-          closeConnection();
-          error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed (method: %1).")
-                                            .arg(i18n("password")));
+      const auto *authMethods = &authMethodsNormal;
+
+      // If we have cached password we want try to use it before public key
+      if(!mPassword.isEmpty()) {
+        static const auto authMethodsWithPassword = []() {
+          std::vector<std::unique_ptr<SSHAuthMethod>> rv;
+          rv.emplace_back(std::unique_ptr<KeyboardInteractiveAuth>(
+                      new KeyboardInteractiveAuth(/* noPasswordQuery = */true) ) );
+          rv.emplace_back(std::unique_ptr<PasswordAuth>(
+                      new PasswordAuth(/* noPasswordQuery = */true) ) );
+          for (const auto &m: authMethodsNormal) { rv.emplace_back(m->clone()); }
+          return rv;
+        }();
+
+        authMethods = &authMethodsWithPassword;
+      }
+
+      // Actually iterate over the list of methods and try them out
+      for (const auto &method: *authMethods) {
+        if (!(availableMethodes & method->flag())) { continue; }
+
+        rc = method->authenticate( this );
+        attemptedMethods |= method->flag();
+        if (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_PARTIAL) {
+          kdDebug(TDEIO_SFTP_DB) << "method=" << method->name() << ": auth "
+            << (rc == SSH_AUTH_SUCCESS ? "success" : "partial") << endl;
+          break; // either next auth method or continue on with the connect
+        } else if (rc == SSH_AUTH_ERROR || rc == SSH_AUTH_AGAIN) {
+          TQString errMsg = i18n("Authentication failed (method: %1).").arg(method->name());
+          // SSH_AUTH_AGAIN returned in case of some errors when server hangs up unexpectedly like
+          // in case there were too many failed authentication attempts
+          if (rc == SSH_AUTH_AGAIN) {
+            errMsg.append("\n").append(i18n("Server is slow to respond or hung up unexpectedly."));
+          }
+          error(TDEIO::ERR_COULD_NOT_LOGIN, sshError(errMsg));
           return;
-        } else if (rc == SSH_AUTH_SUCCESS) {
+        } else if (rc == SSH_AUTH_CANCELED) {
+          kdDebug(TDEIO_SFTP_DB) << "method=" << method->name() << " was canceled by user"  << endl;
+          // don't quit immediately due to that the user might have canceled one method to use another
+          wasCanceled = true;
+        } else if (rc == SSH_AUTH_NEED_RECONNECT) {
+          kdDebug(TDEIO_SFTP_DB) << "method=" << method->name() << " requested reconnection"  << endl;
           break;
+        } else if (rc == SSH_AUTH_DENIED) {
+          kdDebug(TDEIO_SFTP_DB) << "Auth for method=" << method->name() << " was denied"  << endl;
+          // do nothing, just proceed with next auth method
+        } else {
+          // Shouldn't happen, but to be on the safe side better handle it
+          error(TDEIO::ERR_UNKNOWN, sshError(i18n("Authentication failed unexpectedly")));
+          return;
         }
       }
-    }
-  }
+
+      // At this point rc values should be one of:
+      //   SSH_AUTH_SUCCESS, SSH_AUTH_PARTIAL, SSH_AUTH_DENIED, SSH_AUTH_CANCELED or SSH_AUTH_NEED_RECONNECT
+      if(rc == SSH_AUTH_NEED_RECONNECT) {
+        closeConnection(); //< have to do it manually
+        break;
+      } else if (wasCanceled && (rc == SSH_AUTH_CANCELED || rc == SSH_AUTH_DENIED)) {
+        error(TDEIO::ERR_USER_CANCELED, TQString::null);
+        return;
+      } else if (rc != SSH_AUTH_SUCCESS && rc != SSH_AUTH_PARTIAL) {
+        TQString errMsg = i18n("Authentication denied (attempted methods: %1).")
+                          .arg(SSHAuthMethod::bitsetToStr(attemptedMethods).join(", "));
+        if (availableMethodes & ~supportedMethods) {
+          errMsg.append("\n")
+                .append(i18n("Note: server also declares some unsupported authentication methods (%1)")
+                .arg(SSHAuthMethod::bitsetToStr(availableMethodes & ~supportedMethods).join(", ")));
+        }
+        error(TDEIO::ERR_COULD_NOT_LOGIN, errMsg);
+        return;
+      }
+    } // while (rc != SSH_AUTH_SUCCESS)
+  } while(rc == SSH_AUTH_NEED_RECONNECT);
+
 
   // start sftp session
   kdDebug(TDEIO_SFTP_DB) << "Trying to request the sftp session" << endl;
   mSftp = sftp_new(mSession);
   if (mSftp == NULL) {
-    closeConnection();
     error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Unable to request the SFTP subsystem. "
           "Make sure SFTP is enabled on the server."));
     return;
@@ -857,34 +1266,19 @@ void sftpProtocol::openConnection() {
 
   kdDebug(TDEIO_SFTP_DB) << "Trying to initialize the sftp session" << endl;
   if (sftp_init(mSftp) < 0) {
-    closeConnection();
     error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Could not initialize the SFTP session."));
     return;
   }
 
   // Login succeeded!
   infoMessage(i18n("Successfully connected to %1").arg(mHost));
-  info.url.setProtocol("sftp");
-  info.url.setHost(mHost);
-  info.url.setPort(mPort);
-  info.url.setUser(mUsername);
-  info.username = mUsername;
-  info.password = mPassword;
-
-  kdDebug(TDEIO_SFTP_DB) << "Caching info.username = " << info.username
-    << ", info.url = " << info.url.prettyURL() << endl;
-
-  cacheAuthentication(info);
 
   //setTimeoutSpecialCommand(TDEIO_SFTP_SPECIAL_TIMEOUT);
 
   mConnected = true;
-  connected();
+  connectionCloser.abort();
 
-  mPassword.fill('x');
-  mPassword = "";
-  info.password.fill('x');
-  info.password = "";
+  connected();
 
   return;
 }
@@ -925,7 +1319,7 @@ void sftpProtocol::special(const TQByteArray &data) {
     }
 
     if (rc < 0) {
-        kdDebug(TDEIO_SFTP_DB) << "channel_poll failed: " << ssh_get_error(mSession);
+        kdDebug(TDEIO_SFTP_DB) << "channel_poll failed: " << ssh_get_error(mSession) << endl;
     }
 
     setTimeoutSpecialCommand(TDEIO_SFTP_SPECIAL_TIMEOUT);
@@ -1833,12 +2227,3 @@ void sftpProtocol::slave_status() {
   kdDebug(TDEIO_SFTP_DB) << "connected to " << mHost << "?: " << mConnected << endl;
   slaveStatus((mConnected ? mHost : TQString()), mConnected);
 }
-
-void sftpProtocol::clearPubKeyAuthInfo()
-{
-  if (!pubKeyInfo)
-  {
-    delete pubKeyInfo;
-    pubKeyInfo = nullptr;
-  }
-}
diff --git a/tdeioslave/sftp/tdeio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h
index 8e46d815c..75b295cfd 100644
--- a/tdeioslave/sftp/tdeio_sftp.h
+++ b/tdeioslave/sftp/tdeio_sftp.h
@@ -31,6 +31,7 @@
 #include <tdeio/slavebase.h>
 #include <kdebug.h>
 #include <stdint.h>
+#include <memory>
 
 #include <libssh/libssh.h>
 #include <libssh/sftp.h>
@@ -95,10 +96,18 @@ public:
   void log_callback(ssh_session session, int priority, const char *message,
                     void *userdata);
 
+  // Callbacks for SSHAuthMethod-derived strategies
+  int authenticatePublicKey();
+  int authenticateKeyboardInteractive(bool noPaswordQuery = false);
+  int authenticatePassword(bool noPaswordQuery = false);
+
+  /** Some extra authentication failure reasons intended to use alongside was declared in libssh */
+  enum extra_ssh_auth_e {
+    SSH_AUTH_CANCELED=128,   //< user canceled password entry dialog
+    SSH_AUTH_NEED_RECONNECT  //< it is required to reinitialize connection from scratch
+  };
 
 private: // Private variables
-  void statMime(const KURL &url);
-  void closeFile();
   /** True if ioslave is connected to sftp server. */
   bool mConnected;
 
@@ -114,10 +123,16 @@ private: // Private variables
   /** The sftp session for the connection */
   sftp_session mSftp;
 
-  /** Username to use when connecting */
+  /** Username to use when connecting, Note: it's the one passed in the URL */
   TQString mUsername;
 
-  /** User's password */
+  /** Username to use with the next connection attempt: it's either from the cached data or from
+   * the password dialog that was prompted to the user. */
+  TQString mCachedUsername;
+
+  /** User's password. Note: the password would be set only if it was somehow cached: passed to
+   * setHost(), received from passwdserver's cache or was entered by user before reconnection
+   */
   TQString mPassword;
 
   /** The open file */
@@ -138,12 +153,39 @@ private: // Private variables
   //  TQString text;
   //};
 
-  TDEIO::AuthInfo *pubKeyInfo;
+  /** Some data needed to interact with auth_callback() */
+  struct {
+    /** List of keys user was already prompted to enter the passphrase for.
+     *  Note: Under most sane circumstances the list shouldn't go beyond size=2,
+     *        so no fancy containers here
+     */
+    TQStringList attemptedKeys;
+    /** A backup for SlaveBase::s_seqNr to pass the same value to prompts for different keys */
+    long current_seqNr;
+    /** true if callback was called */
+    bool wasCalled;
+    /** true if user canceled all passphrase entry dialogues */
+    bool wasCanceled;
+  } mPubKeyAuthData;
+
+  /** true if the password dialog was prompted to the user at leas once */
+  bool mPasswordWasPrompted = false;
 
 private: // private methods
+  void statMime(const KURL &url);
+  void closeFile();
 
-  int authenticateKeyboardInteractive(TDEIO::AuthInfo &info);
-  void clearPubKeyAuthInfo();
+  /** @returns username used by libssh during the connection */
+  TQString sshUsername();
+
+  /** Adds ssh error (if any) to the given message string */
+  TQString sshError(TQString errMsg=TQString());
+
+  /** A small helper function to construct auth info skeleton for the protocol */
+  TDEIO::AuthInfo authInfo();
+
+  /** A helper function encapsulating creation of an ssh connection before authentication */
+  int initializeConnection();
 
   void reportError(const KURL &url, const int err);
 
@@ -153,4 +195,25 @@ private: // private methods
   TQString canonicalizePath(const TQString &path);
 };
 
+/** A base class for ssh authentication methods. */
+class SSHAuthMethod {
+public:
+  /** libssh's flag for he method */
+  virtual unsigned flag() = 0;
+  /** The user-friendly (probably translated) name of the method */
+  virtual TQString name() {return flagToStr(flag());}
+  /** Actually do perform the auth process */
+  virtual int authenticate(sftpProtocol *ioslave) const = 0;
+  /** Creates a copy of derived class */
+  virtual SSHAuthMethod* clone() = 0;
+
+  virtual ~SSHAuthMethod() {};
+
+  /** Returns a name for the given libssh auth method flag */
+  static TQString flagToStr(unsigned method);
+
+  /** Returns a list of names for all the methods set in the given libssh auth method bitset */
+  static TQStringList bitsetToStr(unsigned method);
+};
+
 #endif
diff --git a/tdeioslave/smb/tdeio_smb.cpp b/tdeioslave/smb/tdeio_smb.cpp
index 28c54b3ac..d21af7e4f 100644
--- a/tdeioslave/smb/tdeio_smb.cpp
+++ b/tdeioslave/smb/tdeio_smb.cpp
@@ -56,7 +56,7 @@ SMBSlave::~SMBSlave()
 SMBSlave* G_TheSlave;
 
 //===========================================================================
-int KDE_EXPORT kdemain( int argc, char **argv )
+int TDE_EXPORT kdemain( int argc, char **argv )
 {
 
     TDEInstance instance( "tdeio_smb" );
diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h
index 56c296c31..f56b11cbd 100644
--- a/tdeioslave/smb/tdeio_smb.h
+++ b/tdeioslave/smb/tdeio_smb.h
@@ -49,7 +49,7 @@
 // KDE includes
 //--------------
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeio/global.h>
 #include <tdeio/slavebase.h>
 #include <kurl.h>
diff --git a/tdeioslave/smb/tdeio_smb_auth.cpp b/tdeioslave/smb/tdeio_smb_auth.cpp
index 87dd8c026..e025f837e 100644
--- a/tdeioslave/smb/tdeio_smb_auth.cpp
+++ b/tdeioslave/smb/tdeio_smb_auth.cpp
@@ -32,7 +32,7 @@
 #include "tdeio_smb.h"
 #include "tdeio_smb_internal.h"
 
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tqdir.h>
 #include <stdlib.h>
 
@@ -163,7 +163,7 @@ bool SMBSlave::auth_initialize_smbc()
     if(m_initialized_smbc == false)
     {
         kdDebug(TDEIO_SMB) << "smbc_init call" << endl;
-        KSimpleConfig cfg( "tdeioslaverc", true );
+        TDESimpleConfig cfg( "tdeioslaverc", true );
 
         cfg.setGroup( "SMB" );
         int debug_level = cfg.readNumEntry( "DebugLevel", 0 );
diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index 0aef92698..ea4928bec 100644
--- a/tdeioslave/smb/tdeio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -19,11 +19,11 @@
 */
 
 #include "tdeio_smb.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqcstring.h>
 #include <unistd.h>
 #include <tqdir.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 void SMBSlave::readOutput(TDEProcess *, char *buffer, int buflen)
 {
@@ -113,11 +113,11 @@ void SMBSlave::special( const TQByteArray & data)
          proc << TDEProcess::quote(mountPoint.local8Bit());
          proc << options;
 
-         connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
-                 TQT_SLOT(readOutput(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+                 TQ_SLOT(readOutput(TDEProcess *, char *, int)));
 
-         connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
-                 TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+                 TQ_SLOT(readStdErr(TDEProcess *, char *, int)));
 
          if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput ))
          {
@@ -154,11 +154,11 @@ void SMBSlave::special( const TQByteArray & data)
          mybuf.truncate(0);
          mystderr.truncate(0);
 
-         connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
-                 TQT_SLOT(readOutput(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )),
+                 TQ_SLOT(readOutput(TDEProcess *, char *, int)));
 
-         connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
-                 TQT_SLOT(readStdErr(TDEProcess *, char *, int)));
+         connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )),
+                 TQ_SLOT(readStdErr(TDEProcess *, char *, int)));
 
          if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) )
          {
diff --git a/tdeioslave/smtp/interactivesmtpserver.cpp b/tdeioslave/smtp/interactivesmtpserver.cpp
index 4055a47a4..ed13d7253 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cpp
+++ b/tdeioslave/smtp/interactivesmtpserver.cpp
@@ -55,8 +55,8 @@ InteractiveSMTPServerWindow::~InteractiveSMTPServerWindow() {
     if ( mSocket ) {
         mSocket->close();
         if ( mSocket->state() == TQSocket::Closing )
-            connect( mSocket, TQT_SIGNAL(delayedCloseFinished()),
-                     mSocket, TQT_SLOT(deleteLater()) );
+            connect( mSocket, TQ_SIGNAL(delayedCloseFinished()),
+                     mSocket, TQ_SLOT(deleteLater()) );
         else
             mSocket->deleteLater();
         mSocket = 0;
@@ -108,17 +108,17 @@ InteractiveSMTPServerWindow::InteractiveSMTPServerWindow( TQSocket * socket, TQW
   hlay->addWidget( mLineEdit, 1 );
   hlay->addWidget( but );
 
-  connect( mLineEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotSendResponse()) );
-  connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotSendResponse()) );
+  connect( mLineEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotSendResponse()) );
+  connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotSendResponse()) );
 
   but = new TQPushButton( "&Close Connection", this );
   vlay->addWidget( but );
 
-  connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotConnectionClosed()) );
+  connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotConnectionClosed()) );
 
-  connect( socket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotConnectionClosed()) );
-  connect( socket, TQT_SIGNAL(error(int)), TQT_SLOT(slotError(int)) );
-  connect( socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead()) );
+  connect( socket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotConnectionClosed()) );
+  connect( socket, TQ_SIGNAL(error(int)), TQ_SLOT(slotError(int)) );
+  connect( socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotReadyRead()) );
 
   mLineEdit->setText( "220 hi there" );
   mLineEdit->setFocus();
diff --git a/tdeioslave/smtp/smtp.cpp b/tdeioslave/smtp/smtp.cpp
index 00dff3684..1197de853 100644
--- a/tdeioslave/smtp/smtp.cpp
+++ b/tdeioslave/smtp/smtp.cpp
@@ -61,7 +61,7 @@ using KioSMTP::TransactionState;
 #include <tdeemailsettings.h>
 #include <ksock.h>
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeio/connection.h>
 #include <tdeio/slaveinterface.h>
 #include <tdelocale.h>
@@ -71,7 +71,6 @@ using KioSMTP::TransactionState;
 #include <tqcstring.h>
 
 #include <memory>
-using std::auto_ptr;
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -91,7 +90,7 @@ using std::auto_ptr;
 
 
 extern "C" {
-  KDE_EXPORT int kdemain(int argc, char **argv);
+  TDE_EXPORT int kdemain(int argc, char **argv);
 } 
 
 int kdemain(int argc, char **argv)
@@ -446,8 +445,8 @@ void SMTPProtocol::queueCommand( int type ) {
 }
 
 bool SMTPProtocol::execute( int type, TransactionState * ts ) {
-  auto_ptr<Command> cmd( Command::createSimpleCommand( type, this ) );
-  kdFatal( !cmd.get(), 7112 ) << "Command::createSimpleCommand( " << type << " ) returned null!" << endl;
+  std::unique_ptr<Command> cmd( Command::createSimpleCommand( type, this ) );
+  kdFatal( !cmd, 7112 ) << "Command::createSimpleCommand( " << type << " ) returned null!" << endl;
   return execute( cmd.get(), ts );
 }
 
diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
index 059c7cfc9..80e27d212 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 
 #include <kdirnotify_stub.h>
 
@@ -65,7 +65,7 @@ void SystemDirNotify::init()
 		{
 			if (!names_found.contains(*name))
 			{
-				KDesktopFile desktop(*dirpath+*name, true);
+				TDEDesktopFile desktop(*dirpath+*name, true);
 
 				TQString system_name = *name;
 				system_name.truncate(system_name.length()-8);
diff --git a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
index ec95c0e32..7b12ffb7f 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
@@ -28,7 +28,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
 }
 
 extern "C" {
-	KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
+	TDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj)
 	{
 		TDEGlobal::locale()->insertCatalogue("tdeio_system");
 		return new SystemDirNotifyModule(obj);
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 21a9da7da..52f1ace36 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -21,8 +21,8 @@
 
 #include <kdebug.h>
 #include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
-#include <kdesktopfile.h>
+#include <tdestandarddirs.h>
+#include <tdedesktopfile.h>
 
 #include <tqapplication.h>
 #include <tqeventloop.h>
@@ -169,7 +169,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const
 		{
 			if (*name==filename+".desktop")
 			{
-				KDesktopFile desktop(*dirpath+filename+".desktop", true);
+				TDEDesktopFile desktop(*dirpath+filename+".desktop", true);
 				if ( desktop.readURL().isEmpty() )
 				{
 					KURL url;
@@ -226,7 +226,7 @@ TQString SystemImpl::readPathINL(TQString filename)
 		line = s.readLine();
 	}
  	if (isPathExpanded == false) {
-		KDesktopFile desktop(filename, true);
+		TDEDesktopFile desktop(filename, true);
 		return desktop.readPath();
 	}
 	else {
@@ -240,7 +240,7 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry,
 {
 	kdDebug() << "SystemImpl::createEntry" << endl;
 
-	KDesktopFile desktop(directory+file, true);
+	TDEDesktopFile desktop(directory+file, true);
 
 	kdDebug() << "path = " << directory << file << endl;
 
@@ -279,12 +279,12 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry,
 		m_lastListingEmpty = true;
 
 		TDEIO::ListJob *job = TDEIO::listDir(url, false, false);
-		connect( job, TQT_SIGNAL( entries(TDEIO::Job *,
+		connect( job, TQ_SIGNAL( entries(TDEIO::Job *,
 		                      const TDEIO::UDSEntryList &) ),
-		         this, TQT_SLOT( slotEntries(TDEIO::Job *,
+		         this, TQ_SLOT( slotEntries(TDEIO::Job *,
 			             const TDEIO::UDSEntryList &) ) );
-		connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-		         this, TQT_SLOT( slotResult(TDEIO::Job *) ) );
+		connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+		         this, TQ_SLOT( slotResult(TDEIO::Job *) ) );
 		tqApp->eventLoop()->enterLoop();
 
 		if (m_lastListingEmpty) icon = empty_icon;
diff --git a/tdeioslave/system/systemimpl.h b/tdeioslave/system/systemimpl.h
index d4cc0e1cb..41d0242a3 100644
--- a/tdeioslave/system/systemimpl.h
+++ b/tdeioslave/system/systemimpl.h
@@ -22,7 +22,7 @@
 
 #include <tdeio/global.h>
 #include <tdeio/job.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kurl.h>
 #include <dcopobject.h>
 
diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp
index 54dd0da6d..76bfc7f82 100644
--- a/tdeioslave/system/tdeio_system.cpp
+++ b/tdeioslave/system/tdeio_system.cpp
@@ -39,7 +39,7 @@ static const TDECmdLineOptions options[] =
 };
 
 extern "C" {
-	KDE_EXPORT int kdemain( int argc, char **argv )
+	TDE_EXPORT int kdemain( int argc, char **argv )
 	{
 		// TDEApplication is necessary to use other ioslaves
 		putenv(strdup("SESSION_MANAGER="));
diff --git a/tdeioslave/tar/ktartest.cpp b/tdeioslave/tar/ktartest.cpp
index efb1e42fe..2fe00d32c 100644
--- a/tdeioslave/tar/ktartest.cpp
+++ b/tdeioslave/tar/ktartest.cpp
@@ -1,7 +1,7 @@
 #include "ktar.h"
 #include <stdio.h>
 #include <tqfile.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 
 void recursive_print( const KTarDirectory * dir, const TQString & path )
diff --git a/tdeioslave/tar/tar.cpp b/tdeioslave/tar/tar.cpp
index b7ba70687..a006d537f 100644
--- a/tdeioslave/tar/tar.cpp
+++ b/tdeioslave/tar/tar.cpp
@@ -12,7 +12,7 @@
 #include <tdeglobal.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <ktar.h>
 #include <kzip.h>
 #include <kar.h>
@@ -28,7 +28,7 @@
 
 using namespace TDEIO;
 
-extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
+extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
diff --git a/tdeioslave/thumbnail/cursorcreator.cpp b/tdeioslave/thumbnail/cursorcreator.cpp
index a8f6a2eb9..42a573d1d 100644
--- a/tdeioslave/thumbnail/cursorcreator.cpp
+++ b/tdeioslave/thumbnail/cursorcreator.cpp
@@ -20,7 +20,7 @@
 #include <tqimage.h>
 #include <tqfile.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "cursorcreator.h"
 
@@ -29,7 +29,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new CursorCreator;
     }
diff --git a/tdeioslave/thumbnail/djvucreator.cpp b/tdeioslave/thumbnail/djvucreator.cpp
index 20a32fb26..31b4fcfe1 100644
--- a/tdeioslave/thumbnail/djvucreator.cpp
+++ b/tdeioslave/thumbnail/djvucreator.cpp
@@ -39,7 +39,7 @@
 #include <tqfile.h>
 #include <tqimage.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "djvucreator.h"
 
@@ -47,7 +47,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new DjVuCreator;
     }
diff --git a/tdeioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp
index 9ec2dd706..5cc3fe277 100644
--- a/tdeioslave/thumbnail/exrcreator.cpp
+++ b/tdeioslave/thumbnail/exrcreator.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new EXRCreator;
     }
diff --git a/tdeioslave/thumbnail/htmlcreator.cpp b/tdeioslave/thumbnail/htmlcreator.cpp
index 34742a0e9..0a0bac58e 100644
--- a/tdeioslave/thumbnail/htmlcreator.cpp
+++ b/tdeioslave/thumbnail/htmlcreator.cpp
@@ -29,7 +29,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new HTMLCreator;
     }
@@ -50,7 +50,7 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i
     if (!m_html)
     {
         m_html = new TDEHTMLPart;
-        connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
+        connect(m_html, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted()));
         m_html->setJScriptEnabled(false);
         m_html->setJavaEnabled(false);
         m_html->setPluginsEnabled(false);
diff --git a/tdeioslave/thumbnail/imagecreator.cpp b/tdeioslave/thumbnail/imagecreator.cpp
index 259a8928f..80c34a577 100644
--- a/tdeioslave/thumbnail/imagecreator.cpp
+++ b/tdeioslave/thumbnail/imagecreator.cpp
@@ -28,7 +28,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         KImageIO::registerFormats();
         return new ImageCreator;
diff --git a/tdeioslave/thumbnail/imagethumbnail.desktop b/tdeioslave/thumbnail/imagethumbnail.desktop
index d9b43e91b..a7ebf4a0b 100644
--- a/tdeioslave/thumbnail/imagethumbnail.desktop
+++ b/tdeioslave/thumbnail/imagethumbnail.desktop
@@ -4,6 +4,6 @@ Type=Service
 Name=Images
 
 X-TDE-ServiceTypes=ThumbCreator
-MimeTypes=image/cgm,image/fax-g3,image/gif,image/jp2,image/jpeg,image/pjpeg,image/png,image/tiff,image/x-bmp,image/x-dds,image/x-ico,image/x-jng,image/x-pcx,image/x-photo-cd,image/x-portable-bitmap,image/x-portable-greymap,image/x-portable-pixmap,image/x-rgb,image/x-targa,image/x-wmf,image/x-xbm,image/x-xcf-gimp,image/x-xfig,image/x-xpm
+MimeTypes=image/cgm,image/fax-g3,image/gif,image/jp2,image/jpeg,image/pjpeg,image/png,image/tiff,image/webp,image/x-bmp,image/x-dds,image/x-ico,image/x-jng,image/x-pcx,image/x-photo-cd,image/x-portable-bitmap,image/x-portable-greymap,image/x-portable-pixmap,image/x-rgb,image/x-targa,image/x-wmf,image/x-xbm,image/x-xcf-gimp,image/x-xfig,image/x-xpm
 X-TDE-Library=imagethumbnail
 CacheThumbnail=true
diff --git a/tdeioslave/thumbnail/textcreator.cpp b/tdeioslave/thumbnail/textcreator.cpp
index 13f3ba83f..8d8e378e3 100644
--- a/tdeioslave/thumbnail/textcreator.cpp
+++ b/tdeioslave/thumbnail/textcreator.cpp
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kpixmapsplitter.h>
 #include <kmimetype.h>
 
@@ -30,7 +30,7 @@
 
 extern "C"
 {
-    KDE_EXPORT ThumbCreator *new_creator()
+    TDE_EXPORT ThumbCreator *new_creator()
     {
         return new TextCreator;
     }
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index 98b01138c..9d3e16498 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -85,7 +85,7 @@ using namespace TDEIO;
 
 extern "C"
 {
-    KDE_EXPORT int kdemain(int argc, char **argv);
+    TDE_EXPORT int kdemain(int argc, char **argv);
 }
 
 
diff --git a/tdeioslave/trash/discspaceutil.cpp b/tdeioslave/trash/discspaceutil.cpp
index 186cb0e7f..bca944e39 100644
--- a/tdeioslave/trash/discspaceutil.cpp
+++ b/tdeioslave/trash/discspaceutil.cpp
@@ -52,10 +52,17 @@ unsigned long DiscSpaceUtil::sizeOfPath( const TQString &path )
     TQFileInfoListIterator it( *infos );
 
     unsigned long sum = 0;
-    TQFileInfo *info = 0;
-    while ( (info = it.current()) != 0 ) {
-      if ( info->fileName() != "." && info->fileName() != ".." )
-      sum += sizeOfPath( info->absFilePath() );
+    const TQFileInfo *info = nullptr;
+    while ((info = it.current()))
+    {
+      if (info->isFile())
+      {
+        sum += info->size();
+      }
+      else if (info->fileName() != "." && info->fileName() != "..")
+      {
+        sum += sizeOfPath(info->absFilePath());
+      }
       ++it;
     }
 
@@ -102,9 +109,9 @@ void DiscSpaceUtil::done()
 void DiscSpaceUtil::calculateFullSize()
 {
   KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo( mDirectory );
-  connect( sp, TQT_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ),
-           this, TQT_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) );
-  connect( sp, TQT_SIGNAL( done() ), this, TQT_SLOT( done() ) );
+  connect( sp, TQ_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ),
+           this, TQ_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) );
+  connect( sp, TQ_SIGNAL( done() ), this, TQ_SLOT( done() ) );
 
   tqApp->eventLoop()->enterLoop();
 }
diff --git a/tdeioslave/trash/kcmtrash.cpp b/tdeioslave/trash/kcmtrash.cpp
index 4747e092a..06c458593 100644
--- a/tdeioslave/trash/kcmtrash.cpp
+++ b/tdeioslave/trash/kcmtrash.cpp
@@ -29,7 +29,7 @@
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *)
   {
     return new TrashModule(parent, "kcmtrash");
   }
@@ -51,7 +51,7 @@ TrashModule::TrashModule(TQWidget *parent, const char *name)
 
 	policyWidget = new KTrashPropsWidget(this);
   tab->addTab(policyWidget, i18n("&Trash Policy"));
-  connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+  connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
 
   TQVBoxLayout *top = new TQVBoxLayout(this);
   top->addWidget(tab);
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
index 067c10b6e..76882f956 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
@@ -35,7 +35,7 @@
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kgenericfactory.h>
 #include <tdeglobal.h>
 #include <kiconloader.h>
@@ -63,7 +63,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
 		if (!KPropsDlgPlugin::isDesktopFile(item))
 			return;
 
-		KDesktopFile deskFile( itemUrl.path(), true /* readonly */ );
+		TDEDesktopFile deskFile( itemUrl.path(), true /* readonly */ );
 		if ( deskFile.readURL() != "trash:/" )
 			return;
 	}
@@ -74,7 +74,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
 	policyWidget = new KTrashPropsWidget(frame);
   TQVBoxLayout *vLayout = new TQVBoxLayout(frame, 0, 0);
   vLayout->addWidget(policyWidget);
-  connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SLOT(setDirty()));
+  connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SLOT(setDirty()));
 }
 
 KTrashPropsDlgPlugin::~KTrashPropsDlgPlugin()
diff --git a/tdeioslave/trash/ktrashpropswidget.cpp b/tdeioslave/trash/ktrashpropswidget.cpp
index 40e12cb4f..2040e9a76 100644
--- a/tdeioslave/trash/ktrashpropswidget.cpp
+++ b/tdeioslave/trash/ktrashpropswidget.cpp
@@ -50,15 +50,15 @@ KTrashPropsWidget::KTrashPropsWidget(TQWidget *parent, const char *name)
   mTrashImpl->init();
 
   setupGui();
-  connect(mUseTimeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged()));
-  connect(mDays, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setDirty()));
-  connect(mUseSizeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged()));
-  connect(mPercentSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(percentSizeChanged(double)));
-  connect(mFixedSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(fixedSizeChanged(double)));
-  connect(mFixedSizeUnit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fixedSizeUnitActivated(int)));
-  connect(mRbPercentSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbPercentSizeToggled(bool)));
-  connect(mRbFixedSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbFixedSizeToggled(bool)));
-  connect(mLimitReachedAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDirty()));
+  connect(mUseTimeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged()));
+  connect(mDays, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setDirty()));
+  connect(mUseSizeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged()));
+  connect(mPercentSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(percentSizeChanged(double)));
+  connect(mFixedSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(fixedSizeChanged(double)));
+  connect(mFixedSizeUnit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fixedSizeUnitActivated(int)));
+  connect(mRbPercentSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbPercentSizeToggled(bool)));
+  connect(mRbFixedSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbFixedSizeToggled(bool)));
+  connect(mLimitReachedAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDirty()));
 
   inhibitChangedSignal = true;
   load();
@@ -87,7 +87,7 @@ void KTrashPropsWidget::setupGui()
       mountPoints->insertItem(folderPixmap, util.mountPoint(), it.key());
     }
     mountPoints->setCurrentItem(0);
-    connect(mountPoints, TQT_SIGNAL(highlighted(int)), TQT_SLOT(trashChanged(int)));
+    connect(mountPoints, TQ_SIGNAL(highlighted(int)), TQ_SLOT(trashChanged(int)));
   }
 
   mCurrentTrash = map[0];
diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp
index eeb0f600b..5fc21a350 100644
--- a/tdeioslave/trash/tdeio_trash.cpp
+++ b/tdeioslave/trash/tdeio_trash.cpp
@@ -26,7 +26,7 @@
 #include <klargefile.h>
 #include <tdecmdlineargs.h>
 #include <kmimetype.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include <dcopclient.h>
 #include <tqdatastream.h>
@@ -50,7 +50,7 @@ static const TDECmdLineOptions options[] =
 };
 
 extern "C" {
-    int KDE_EXPORT kdemain( int argc, char **argv )
+    int TDE_EXPORT kdemain( int argc, char **argv )
     {
         //TDEInstance instance( "tdeio_trash" );
         // TDEApplication is necessary to use tdeio_file
@@ -533,12 +533,12 @@ void TrashProtocol::get( const KURL& url )
     KURL fileURL;
     fileURL.setPath( physicalPath );
     TDEIO::Job* job = TDEIO::get( fileURL );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-             this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ),
-             this, TQT_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) );
-    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-             this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+             this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ),
+             this, TQ_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+             this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
     tqApp->eventLoop()->enterLoop();
 }
 
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index 60fe2d1a6..84c0106d8 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -41,7 +41,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <tdefileitem.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {
@@ -372,7 +372,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat
     TQFileInfo info( infoPath );
     assert( info.exists() );
     assert( info.isFile() );
-    KSimpleConfig infoFile( info.absFilePath(), true );
+    TDESimpleConfig infoFile( info.absFilePath(), true );
     if ( !infoFile.hasGroup( "Trash Info" ) )
         kdFatal() << "no Trash Info group in " << info.absFilePath() << endl;
     infoFile.setGroup( "Trash Info" );
@@ -476,7 +476,7 @@ void TestTrash::trashUmlautFileFromHome()
 
 void TestTrash::testTrashNotEmpty()
 {
-    KSimpleConfig cfg( "trashrc", true );
+    TDESimpleConfig cfg( "trashrc", true );
     assert( cfg.hasGroup( "Status" ) );
     cfg.setGroup( "Status" );
     assert( cfg.readBoolEntry( "Empty", true ) == false );
@@ -1094,8 +1094,8 @@ void TestTrash::listRootDir()
     m_entryCount = 0;
     m_listResult.clear();
     TDEIO::ListJob* job = TDEIO::listDir( "trash:/" );
-    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1111,8 +1111,8 @@ void TestTrash::listRecursiveRootDir()
     m_entryCount = 0;
     m_listResult.clear();
     TDEIO::ListJob* job = TDEIO::listRecursive( "trash:/" );
-    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1128,8 +1128,8 @@ void TestTrash::listSubDir()
     m_entryCount = 0;
     m_listResult.clear();
     TDEIO::ListJob* job = TDEIO::listDir( "trash:/0-trashDirFromHome" );
-    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl;
@@ -1179,7 +1179,7 @@ void TestTrash::emptyTrash()
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
 
-    KSimpleConfig cfg( "trashrc", true );
+    TDESimpleConfig cfg( "trashrc", true );
     assert( cfg.hasGroup( "Status" ) );
     cfg.setGroup( "Status" );
     assert( cfg.readBoolEntry( "Empty", false ) == true );
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index 8bfbbca8d..19078539c 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -29,7 +29,7 @@
 #include <kurl.h>
 #include <kdirnotify_stub.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <kmountpoint.h>
 #include <tdemessagebox.h>
@@ -251,7 +251,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
         return false;
     }
 
-    // Contents of the info file. We could use KSimpleConfig, but that would
+    // Contents of the info file. We could use TDESimpleConfig, but that would
     // mean closing and reopening fd, i.e. opening a race condition...
     TQCString info = "[Trash Info]\n";
     info += "Path=";
@@ -374,8 +374,8 @@ bool TrashImpl::move( const TQString& src, const TQString& dest )
 #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
     job->setInteractive( false );
 #endif
-    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-             this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+             this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
     tqApp->eventLoop()->enterLoop();
 
     return m_lastErrorCode == 0;
@@ -424,8 +424,8 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest )
 #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE
     job->setInteractive( false );
 #endif
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-             this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+             this, TQ_SLOT( jobFinished( TDEIO::Job* ) ) );
     tqApp->eventLoop()->enterLoop();
 
     return m_lastErrorCode == 0;
@@ -513,15 +513,15 @@ bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, boo
         KFileItemList fileItemList;
         fileItemList.append( &fileItem );
         TDEIO::ChmodJob* chmodJob = TDEIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ );
-        connect( chmodJob, TQT_SIGNAL( result(TDEIO::Job *) ),
-                 this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+        connect( chmodJob, TQ_SIGNAL( result(TDEIO::Job *) ),
+                 this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
         tqApp->eventLoop()->enterLoop();
     }
 
     kdDebug() << k_funcinfo << "deleting " << url << endl;
     TDEIO::DeleteJob *job = TDEIO::del( url, false, false );
-    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-             this, TQT_SLOT( jobFinished(TDEIO::Job *) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+             this, TQ_SLOT( jobFinished(TDEIO::Job *) ) );
     tqApp->eventLoop()->enterLoop();
     bool ok = m_lastErrorCode == 0;
     if ( !setLastErrorCode ) {
@@ -620,7 +620,7 @@ bool TrashImpl::infoForFile( int trashId, const TQString& fileId, TrashedFileInf
 
 bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, int trashId )
 {
-    KSimpleConfig cfg( infoPath, true );
+    TDESimpleConfig cfg( infoPath, true );
     if ( !cfg.hasGroup( "Trash Info" ) ) {
         error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, infoPath );
         return false;
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 90032762d..6d96859f7 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -21,7 +21,7 @@
 #define TRASHIMPL_H
 
 #include <tdeio/jobclasses.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 
 #include <tqstring.h>
 #include <tqdatetime.h>
@@ -172,7 +172,7 @@ private:
     mutable bool m_trashDirectoriesScanned;
     int m_mibEnum;
 
-    KSimpleConfig m_config;
+    TDESimpleConfig m_config;
 
     // We don't cache any data related to the trashed files.
     // Another tdeioslave could change that behind our feet.
diff --git a/tdekbdledsync/CMakeLists.txt b/tdekbdledsync/CMakeLists.txt
index a7ba5c621..78d95187f 100644
--- a/tdekbdledsync/CMakeLists.txt
+++ b/tdekbdledsync/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 
 tde_add_executable( tdekbdledsync
   SOURCES getfd.c main.cpp
-  LINK udev X11
+  LINK ${UDEV_LIBRARIES} X11
   DESTINATION ${BIN_INSTALL_DIR}
   SETUID
 )
diff --git a/tdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp
index dd37bba9d..bea316c8c 100644
--- a/tdepasswd/kcm/chfacedlg.cpp
+++ b/tdepasswd/kcm/chfacedlg.cpp
@@ -68,16 +68,16 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
   m_FacesWidget->setItemsMovable( false );
   m_FacesWidget->setMinimumSize( 400, 200 );
 
-  connect( m_FacesWidget, TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQT_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
+  connect( m_FacesWidget, TQ_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQ_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
 
-  connect( m_FacesWidget, TQT_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQT_SLOT( slotOk() ) );
+  connect( m_FacesWidget, TQ_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQ_SLOT( slotOk() ) );
 
   top->addWidget( m_FacesWidget );
 
   // Buttons to get more pics
   TQHBoxLayout * morePics = new TQHBoxLayout( 0, 0, spacingHint() );
   TQPushButton *browseBtn = new TQPushButton( i18n("Custom &Image..."), page );
-  connect( browseBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGetCustomImage() ) );
+  connect( browseBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotGetCustomImage() ) );
   morePics->addWidget( browseBtn );
 #if 0
   TQPushButton *acquireBtn = new TQPushButton( i18n("&Acquire Image..."), page );
@@ -110,7 +110,7 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
   m_FacesWidget->arrangeItemsInGrid();
 
   enableButtonOK( false );
-  //connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSaveCustomImage() ) );
+  //connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotSaveCustomImage() ) );
 
   resize( 420, 400 );
 }
diff --git a/tdepasswd/kcm/kcm_useraccount.kcfg b/tdepasswd/kcm/kcm_useraccount.kcfg
index 549afdb1e..9bd2c60ea 100644
--- a/tdepasswd/kcm/kcm_useraccount.kcfg
+++ b/tdepasswd/kcm/kcm_useraccount.kcfg
@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 	<include>tdeglobal.h</include>
-	<include>kstandarddirs.h</include>
+	<include>tdestandarddirs.h</include>
 	<kcfgfile name="tdm/tdmrc"/>
 	<group name="X-*-Greeter">
 		<entry name="faceDir" type="Path">
diff --git a/tdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp
index 0751c997e..1d08564c3 100644
--- a/tdepasswd/kcm/main.cpp
+++ b/tdepasswd/kcm/main.cpp
@@ -37,11 +37,11 @@
 #include <kuser.h>
 #include <kdialog.h>
 #include <kimageio.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kurldrag.h>
@@ -63,14 +63,14 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
 	_mw = new MainWidget(this);
 	topLayout->addWidget( _mw );
 
-	connect( _mw->btnChangeFace, TQT_SIGNAL(clicked()), TQT_SLOT(slotFaceButtonClicked()));
-	connect( _mw->btnChangePassword, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangePassword()));
+	connect( _mw->btnChangeFace, TQ_SIGNAL(clicked()), TQ_SLOT(slotFaceButtonClicked()));
+	connect( _mw->btnChangePassword, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangePassword()));
 	_mw->btnChangePassword->setGuiItem( KGuiItem( i18n("Change &Password..."), "password" ));
 	
-	connect( _mw->leRealname, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-	connect( _mw->leOrganization, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-	connect( _mw->leEmail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
-	connect( _mw->leSMTP, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+	connect( _mw->leRealname, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+	connect( _mw->leOrganization, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+	connect( _mw->leEmail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+	connect( _mw->leSMTP, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
 
 	_ku = new KUser();
 	_kes = new KEMailSettings();
diff --git a/tdepasswd/passwd.cpp b/tdepasswd/passwd.cpp
index 3db14efbf..fc3873770 100644
--- a/tdepasswd/passwd.cpp
+++ b/tdepasswd/passwd.cpp
@@ -26,7 +26,7 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tdesu/process.h>
 #include "passwd.h"
diff --git a/tdepasswd/tdepasswd.cpp b/tdepasswd/tdepasswd.cpp
index 398d6d6bf..150a2948a 100644
--- a/tdepasswd/tdepasswd.cpp
+++ b/tdepasswd/tdepasswd.cpp
@@ -8,7 +8,7 @@
 
 #include <config.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
@@ -36,15 +36,15 @@ int main(int argc, char **argv)
  
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions(options);
-    KUniqueApplication::addCmdLineOptions();
+    TDEUniqueApplication::addCmdLineOptions();
 
 
-    if (!KUniqueApplication::start()) {
+    if (!TDEUniqueApplication::start()) {
 	kdDebug() << "tdepasswd is already running" << endl;
 	return 0;
     }
 
-    KUniqueApplication app;
+    TDEUniqueApplication app;
 
     KUser ku;
     TQString user;
diff --git a/tdeprint/kjobviewer/kjobviewer-autostart.desktop b/tdeprint/kjobviewer/kjobviewer-autostart.desktop
index cc7b52114..4188f3eb2 100644
--- a/tdeprint/kjobviewer/kjobviewer-autostart.desktop
+++ b/tdeprint/kjobviewer/kjobviewer-autostart.desktop
@@ -14,4 +14,4 @@ X-TDE-autostart-condition=tdeprintrc:Jobs:KeepWindow:false
 X-TDE-autostart-phase=1
 X-TDE-StartupNotify=false
 Categories=Qt;TDE;Utility;Printing;HardwareSettings;TrayIcon;
-ShowOnlyIn=TDE;
+OnlyShowIn=TDE;
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index f1fe23d47..6e75ef474 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -39,7 +39,7 @@ class JobTray : public KSystemTray
 {
 public:
 	JobTray(KJobViewerApp *parent, const char *name = 0)
-		: KSystemTray(0, name), m_app(parent) { connect( this, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); }
+		: KSystemTray(0, name), m_app(parent) { connect( this, TQ_SIGNAL( quitSelected() ), tdeApp, TQ_SLOT( quit() ) ); }
 protected:
 	void mousePressEvent(TQMouseEvent*);
 private:
@@ -89,7 +89,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e)
 
 //-------------------------------------------------------------
 
-KJobViewerApp::KJobViewerApp() : KUniqueApplication()
+KJobViewerApp::KJobViewerApp() : TDEUniqueApplication()
 {
 	m_views.setAutoDelete(true);
 	m_tray = 0;
@@ -120,7 +120,7 @@ void KJobViewerApp::initialize()
 	if (!m_timer)
 	{
 		m_timer = KMTimer::self();
-		connect(m_timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
+		connect(m_timer,TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer()));
 	}
 
 	if (prname.isEmpty() && all)
@@ -149,10 +149,10 @@ void KJobViewerApp::initialize()
         {
             kdDebug() << "creating new view: " << TQString(prname) << endl;
             view = new KMJobViewer();
-            connect(view, TQT_SIGNAL(jobsShown(KMJobViewer*,bool)), TQT_SLOT(slotJobsShown(KMJobViewer*,bool)));
-            connect(view, TQT_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQT_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&)));
-            connect(view, TQT_SIGNAL(refreshClicked()), TQT_SLOT(slotTimer()));
-            connect(view, TQT_SIGNAL(viewerDestroyed(KMJobViewer*)), TQT_SLOT(slotViewerDestroyed(KMJobViewer*)));
+            connect(view, TQ_SIGNAL(jobsShown(KMJobViewer*,bool)), TQ_SLOT(slotJobsShown(KMJobViewer*,bool)));
+            connect(view, TQ_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQ_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&)));
+            connect(view, TQ_SIGNAL(refreshClicked()), TQ_SLOT(slotTimer()));
+            connect(view, TQ_SIGNAL(viewerDestroyed(KMJobViewer*)), TQ_SLOT(slotViewerDestroyed(KMJobViewer*)));
             m_views.insert(prname, view);
         }
 
@@ -184,7 +184,7 @@ void KJobViewerApp::slotJobsShown(KMJobViewer *view, bool hasJobs)
 	}
 	else {
 		TDEStartupInfo::appStarted();
-		kapp->quit();
+		tdeApp->quit();
 	}
 }
 
@@ -230,7 +230,7 @@ void KJobViewerApp::slotViewerDestroyed(KMJobViewer *view)
 	if (view)
 		m_views.take(view->printer());
 	if (m_views.count() == 0)
-		kapp->quit();
+		tdeApp->quit();
 }
 
 #include "kjobviewer.moc"
diff --git a/tdeprint/kjobviewer/kjobviewer.h b/tdeprint/kjobviewer/kjobviewer.h
index af606b551..611c04ba3 100644
--- a/tdeprint/kjobviewer/kjobviewer.h
+++ b/tdeprint/kjobviewer/kjobviewer.h
@@ -20,7 +20,7 @@
 #ifndef KJOBVIEWER_H
 #define KJOBVIEWER_H
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdeprint/kpreloadobject.h>
 #include <tqdict.h>
 
@@ -28,7 +28,7 @@ class KMJobViewer;
 class KMTimer;
 class JobTray;
 
-class KJobViewerApp : public KUniqueApplication, public KPReloadObject
+class KJobViewerApp : public TDEUniqueApplication, public KPReloadObject
 {
 	TQ_OBJECT
 	friend class JobTray;
diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp
index 0445c71a5..48745216b 100644
--- a/tdeprint/kjobviewer/main.cpp
+++ b/tdeprint/kjobviewer/main.cpp
@@ -33,7 +33,7 @@ static TDECmdLineOptions options[] = {
 };
 
 
-extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
+extern "C" int TDE_EXPORT kdemain(int argc, char *argv[])
 {
 	TDEAboutData	aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),TDEAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, 0);
 	aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be");
diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp
index fd528b705..61ed345d1 100644
--- a/tdeprint/kprinter/main.cpp
+++ b/tdeprint/kprinter/main.cpp
@@ -42,14 +42,14 @@ static TDECmdLineOptions options[] =
 	TDECmdLineLastOption
 };
 
-extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
+extern "C" int TDE_EXPORT kdemain(int argc, char *argv[])
 {
 	TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1");
 	TDECmdLineArgs::addCmdLineOptions(options);
 	TDEApplication	app;
 	PrintWrapper	*wrap = new PrintWrapper;
 	app.setMainWidget(wrap);
-	TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint()));
+	TQTimer::singleShot(10,wrap,TQ_SLOT(slotPrint()));
 
 	int	result = app.exec();
 	delete wrap;
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 6ee4bbc4a..77f5012c8 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -35,7 +35,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kdebug.h>
@@ -262,11 +262,11 @@ void PrintWrapper::slotPrint()
 		dlg = KPrintDialog::printerDialog(&kprinter, 0);
 		if (dlg)
 		{
-			connect(dlg, TQT_SIGNAL(printRequested(KPrinter*)), TQT_SLOT(slotPrintRequested(KPrinter*)));
+			connect(dlg, TQ_SIGNAL(printRequested(KPrinter*)), TQ_SLOT(slotPrintRequested(KPrinter*)));
 			if( check_stdin )
 			{
-			    notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-			    connect( notif, TQT_SIGNAL( activated( int )), this, TQT_SLOT( slotGotStdin()));
+			    notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, this );
+			    connect( notif, TQ_SIGNAL( activated( int )), this, TQ_SLOT( slotGotStdin()));
 			    kdDebug( 500 ) << "waiting for input on stdin" << endl;
 			}
 			dlg->exec();
@@ -276,7 +276,7 @@ void PrintWrapper::slotPrint()
 			errormsg(i18n("Unable to construct the print dialog."));
 	}
 
-	TQTimer::singleShot(10,kapp,TQT_SLOT(quit()));
+	TQTimer::singleShot(10,tdeApp,TQ_SLOT(quit()));
 }
 
 void hack( KPrintDialog* dlg );
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index 2e714087a..4efcbe569 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -28,16 +28,16 @@
 #include <tqtextstream.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeio/global.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <tdeio/job.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdetempfile.h>
 #include <tqfile.h>
 #include <tqdom.h>
@@ -50,7 +50,7 @@
 
 extern "C"
 {
-	int KDE_EXPORT kdemain(int argc, char **argv);
+	int TDE_EXPORT kdemain(int argc, char **argv);
 }
 
 void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString())
@@ -455,11 +455,11 @@ bool TDEIO_Print::getDBFile( const KURL& src )
 
 	/* start the transfer job */
 	TDEIO::TransferJob *job = TDEIO::get( src, false, false );
-	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResult( TDEIO::Job* ) ) );
-	connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-	connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-	connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-	kapp->enter_loop();
+	connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+	connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+	connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+	tdeApp->enter_loop();
 	m_httpBuffer.close();
 
 	/* return the result */
@@ -510,7 +510,7 @@ void TDEIO_Print::slotResult( TDEIO::Job *j )
 		m_httpError = j->error();
 		m_httpErrorTxt = j->errorText();
 	}
-	kapp->exit_loop();
+	tdeApp->exit_loop();
 }
 
 void TDEIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d )
diff --git a/tdeprint/slave/templates/top-left.png b/tdeprint/slave/templates/top-left.png
index 042e2bb8b..e7e39d9aa 100644
--- a/tdeprint/slave/templates/top-left.png
+++ b/tdeprint/slave/templates/top-left.png
diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp
index 3c9b0e9f1..9377e53fb 100644
--- a/tdeprint/tdeprint_part/printpart.cpp
+++ b/tdeprint/tdeprint_part/printpart.cpp
@@ -23,7 +23,7 @@
 #include <tdeprint/kiconselectaction.h>
 #include <tdeaction.h>
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index 7fdb4fec1..9af40d224 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -32,7 +32,7 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 
 ConfFilters::ConfFilters(TQWidget *parent, const char *name)
@@ -45,7 +45,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 	m_filters->setLineWidth(1);
 	m_filters->setSorting(-1);
 	m_filters->header()->setStretchEnabled(true, 1);
-	connect(m_filters, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotChange()));
+	connect(m_filters, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(slotChange()));
 
 	m_add = new TQPushButton(this);
 	m_add->setPixmap(BarIcon("document-new"));
@@ -57,11 +57,11 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 	m_up->setIconSet(BarIconSet("go-up"));
 	m_down = new TQPushButton(this);
 	m_down->setIconSet(BarIconSet("go-down"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
-	connect(m_change, TQT_SIGNAL(clicked()), TQT_SLOT(slotChange()));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
+	connect(m_change, TQ_SIGNAL(clicked()), TQ_SLOT(slotChange()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown()));
 	TQToolTip::add(m_add, i18n("Add filter"));
 	TQToolTip::add(m_change, i18n("Modify filter"));
 	TQToolTip::add(m_remove, i18n("Remove filter"));
@@ -80,7 +80,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)
 	l1->addWidget(m_down);
 	l1->addStretch(1);
 	updateButton();
-	connect(m_filters, TQT_SIGNAL(selectionChanged ()),TQT_SLOT(updateButton()));
+	connect(m_filters, TQ_SIGNAL(selectionChanged ()),TQ_SLOT(updateButton()));
 }
 
 void ConfFilters::load()
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index ad7512d8d..b79e2f52b 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -49,7 +49,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
 	m_replace_int_char_val = new TQLineEdit( this );
 	m_replace_int_char_val->setEnabled( false );
 
-	connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) );
+	connect( m_replace_int_char, TQ_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQ_SLOT( setEnabled( bool ) ) );
 
 	TQGridLayout	*l0 = new TQGridLayout(this, 6, 2, 10, 10);
 	l0->setColStretch(1, 1);
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index e6ef4e299..bfb201691 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -51,7 +51,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
 	TQLabel	*cmdlabel = new TQLabel(i18n("Co&mmand:"), this);
 	syslabel->setBuddy(m_system);
 	cmdlabel->setBuddy(m_command);
-	connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int)));
+	connect(m_system, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSystemChanged(int)));
 	m_current = 0;
 	m_system->setCurrentItem(m_current);
 
@@ -66,7 +66,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
 	for (int i=0; i<10; i++)
 		m_device->insertItem(TQString(i18n("Serial Port #%1").arg(i)));
 	m_device->insertItem( i18n( "Other" ) );
-	connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) );
+	connect( m_device, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotDeviceChanged( int ) ) );
 	m_device_edit = new TQLineEdit( m_dummy2 );
 	slotDeviceChanged( 0 );
 
diff --git a/tdeprint/tdeprintfax/defcmds.cpp b/tdeprint/tdeprintfax/defcmds.cpp
index 9529c757d..d785d06f6 100644
--- a/tdeprint/tdeprintfax/defcmds.cpp
+++ b/tdeprint/tdeprintfax/defcmds.cpp
@@ -20,7 +20,7 @@
 #include "defcmds.h"
 
 #include <tqregexp.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 TQString defaultCommand(const TQString& cmd)
 {
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index 1b3eb6131..f9f16c4aa 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -45,9 +45,9 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 	m_ok = new KPushButton(KStdGuiItem::ok(), this);
 	TQPushButton	*m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
 	TQPushButton	*m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this);
-	connect(m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
-	connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
-	connect(m_ab, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditAb()));
+	connect(m_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
+	connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
+	connect(m_ab, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditAb()));
 	m_ok->setDefault(true);
 
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
@@ -66,7 +66,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 	resize( conf->readSizeEntry( "ABSize", &defsize ) );
 
 	initialize();
-	connect(TDEABC::StdAddressBook::self(), TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(slotAbChanged(AddressBook*)));
+	connect(TDEABC::StdAddressBook::self(), TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(slotAbChanged(AddressBook*)));
 }
 
 FaxAB::~FaxAB()
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index f87ee4377..5c4c349bc 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -35,13 +35,13 @@
 #include <tqvaluestack.h>
 #include <tqstylesheet.h>
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <twin.h>
 #include <tdeemailsettings.h>
@@ -356,10 +356,10 @@ FaxCtrl::FaxCtrl(TQWidget *parent, const char *name)
 {
 	m_process = new TDEProcess();
 	m_process->setUseShell(true);
-	connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
-	connect(this, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(cleanTempFiles()));
+	connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
+	connect(this, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(cleanTempFiles()));
 	m_logview = 0;
 }
 
@@ -486,7 +486,7 @@ void FaxCtrl::filter()
 		}
 		else
 		{
-			TQString	tmp = locateLocal("tmp","tdeprintfax_") + kapp->randomString(8);
+			TQString	tmp = locateLocal("tmp","tdeprintfax_") + tdeApp->randomString(8);
 			m_filteredfiles.prepend(tmp);
 			m_tempfiles.append(tmp);
 			m_process->clearArguments();
@@ -530,11 +530,11 @@ void FaxCtrl::viewLog(TQWidget *)
 		TQPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView );
 		TQPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView );
 		m_close->setDefault(true);
-		connect(m_clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearLog()));
-		connect(m_close, TQT_SIGNAL(clicked()), TQT_SLOT(slotCloseLog()));
-		connect(m_logview, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCloseLog()));
-		connect( m_print, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPrintLog() ) );
-		connect( m_save, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSaveLog() ) );
+		connect(m_clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearLog()));
+		connect(m_close, TQ_SIGNAL(clicked()), TQ_SLOT(slotCloseLog()));
+		connect(m_logview, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCloseLog()));
+		connect( m_print, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPrintLog() ) );
+		connect( m_save, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSaveLog() ) );
 
 		TQVBoxLayout	*l0 = new TQVBoxLayout(topView, 10, 10);
 		l0->addWidget(m_logview);
diff --git a/tdeprint/tdeprintfax/filterdlg.cpp b/tdeprint/tdeprintfax/filterdlg.cpp
index 141e7138a..fa3eed829 100644
--- a/tdeprint/tdeprintfax/filterdlg.cpp
+++ b/tdeprint/tdeprintfax/filterdlg.cpp
@@ -47,8 +47,8 @@ FilterDlg::FilterDlg(TQWidget *parent, const char *name)
 	setMainWidget(w);
 	m_mime->setFocus();
 	resize(300, 100);
-	connect(m_mime, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged()));
-        connect(m_cmd, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged()));
+	connect(m_mime, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged()));
+        connect(m_cmd, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged()));
         slotTextFilterChanged();
 }
 
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 4cf67d0ca..3511b2bae 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -62,22 +62,22 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 {
 	m_faxctrl = new FaxCtrl(this);
 	m_quitAfterSend = false;
-	connect(m_faxctrl, TQT_SIGNAL(message(const TQString&)), TQT_SLOT(slotMessage(const TQString&)));
-	connect(m_faxctrl, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(slotFaxSent(bool)));
+	connect(m_faxctrl, TQ_SIGNAL(message(const TQString&)), TQ_SLOT(slotMessage(const TQString&)));
+	connect(m_faxctrl, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(slotFaxSent(bool)));
 
 	TQWidget	*mainw = new TQWidget(this);
 	setCentralWidget(mainw);
 	m_files = new TDEListBox(mainw);
-	connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) );
+	connect( m_files, TQ_SIGNAL( currentChanged( TQListBoxItem* ) ), TQ_SLOT( slotCurrentChanged() ) );
 	m_upbtn = new KPushButton( mainw );
 	m_upbtn->setIconSet( SmallIconSet( "go-up" ) );
 	TQToolTip::add( m_upbtn, i18n( "Move up" ) );
-	connect( m_upbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) );
+	connect( m_upbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) );
 	m_upbtn->setEnabled( false );
 	m_downbtn = new KPushButton( mainw );
 	m_downbtn->setIconSet( SmallIconSet( "go-down" ) );
 	TQToolTip::add( m_downbtn, i18n( "Move down" ) );
-	connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) );
+	connect( m_downbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) );
 	m_downbtn->setEnabled( false );
 	TQLabel	*m_filelabel = new TQLabel(i18n("F&iles:"), mainw);
         m_filelabel->setBuddy(m_files);
@@ -89,21 +89,21 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	m_numbers->addColumn( i18n("Enterprise") );
 	m_numbers->header()->setStretchEnabled( true );
 	m_numbers->setSelectionMode( TQListView::Extended );
-	connect( m_numbers, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotFaxSelectionChanged() ) );
-	connect( m_numbers, TQT_SIGNAL( executed( TQListViewItem* ) ), TQT_SLOT( slotFaxExecuted( TQListViewItem* ) ) );
+	connect( m_numbers, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotFaxSelectionChanged() ) );
+	connect( m_numbers, TQ_SIGNAL( executed( TQListViewItem* ) ), TQ_SLOT( slotFaxExecuted( TQListViewItem* ) ) );
 	m_newbtn = new KPushButton( mainw );
 	m_newbtn->setPixmap( SmallIcon( "edit" ) );
 	TQToolTip::add( m_newbtn, i18n( "Add fax number" ) );
-	connect( m_newbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxAdd() ) );
+	connect( m_newbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxAdd() ) );
 	m_abbtn = new KPushButton( mainw );
 	m_abbtn->setPixmap( SmallIcon( "kaddressbook" ) );
 	TQToolTip::add( m_abbtn, i18n( "Add fax number from addressbook" ) );
-	connect( m_abbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotKab() ) );
+	connect( m_abbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotKab() ) );
 	m_delbtn = new KPushButton( mainw );
 	m_delbtn->setIconSet( SmallIconSet( "edittrash" ) );
 	TQToolTip::add( m_delbtn, i18n( "Remove fax number" ) );
 	m_delbtn->setEnabled( false );
-	connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) );
+	connect( m_delbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxRemove() ) );
 	TQLabel	*m_commentlabel = new TQLabel(i18n("&Comment:"), mainw);
 	KSystemTray	*m_tray = new KSystemTray(this);
 	m_tray->setPixmap(SmallIcon("tdeprintfax"));
@@ -124,9 +124,9 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	m_time = new TQTimeEdit(mainw);
 	m_time->setTime(TQTime::currentTime());
 	m_time->setEnabled(false);
-	connect(m_timecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeComboActivated(int)));
+	connect(m_timecombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeComboActivated(int)));
 	m_cover = new TQCheckBox(i18n("Send Co&ver Sheet"), mainw);
-	connect(m_cover, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCoverToggled(bool)));
+	connect(m_cover, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCoverToggled(bool)));
 	m_subject = new TQLineEdit( mainw );
 	TQLabel *m_subjectlabel = new TQLabel( i18n( "Su&bject:" ), mainw );
 	m_subjectlabel->setBuddy( m_subject );
@@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	updateState();
 
 	resize(550,500);
-	TQWidget	*d = TQT_TQWIDGET(kapp->desktop());
+	TQWidget	*d = tdeApp->desktop();
 	move((d->width()-width())/2, (d->height()-height())/2);
 }
 
@@ -188,23 +188,23 @@ KdeprintFax::~KdeprintFax()
 
 void KdeprintFax::initActions()
 {
-	new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
-	new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
-	new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
-	new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
-	new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
-	new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
-	new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
-	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
+	new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, this, TQ_SLOT(slotAdd()), actionCollection(), "file_add");
+	new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, this, TQ_SLOT(slotRemove()), actionCollection(), "file_remove");
+	new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, this, TQ_SLOT(slotFax()), actionCollection(), "fax_send");
+	new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(slotAbort()), actionCollection(), "fax_stop");
+	new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, this, TQ_SLOT(slotKab()), actionCollection(), "fax_ab");
+	new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, this, TQ_SLOT(slotViewLog()), actionCollection(), "fax_log");
+	new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, this, TQ_SLOT(slotView()), actionCollection(), "file_view");
+	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, this, TQ_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
 
-	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+	KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection());
 	setStandardToolBarMenuEnabled(true);
-	KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenuBar()), actionCollection());
-	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
-        KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
+	KStdAction::showMenubar(this, TQ_SLOT(slotToggleMenuBar()), actionCollection());
+	KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
+        KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), 
 actionCollection());
 	actionCollection()->action("fax_stop")->setEnabled(false);
-	connect(actionCollection()->action("file_remove"), TQT_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQT_SLOT(setEnabled(bool)));
+	connect(actionCollection()->action("file_remove"), TQ_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQ_SLOT(setEnabled(bool)));
 	actionCollection()->action("file_remove")->setEnabled(false);
 
 	createGUI();
diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp
index fce4491e7..69dcce638 100644
--- a/tdescreensaver/blankscrn.cpp
+++ b/tdescreensaver/blankscrn.cpp
@@ -23,16 +23,16 @@
 // libtdescreensaver interface
 extern "C"
 {
-    KDE_EXPORT const char *kss_applicationName = "kblankscrn.kss";
-    KDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" );
-    KDE_EXPORT const char *kss_version = "2.2.0";
+    TDE_EXPORT const char *kss_applicationName = "kblankscrn.kss";
+    TDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" );
+    TDE_EXPORT const char *kss_version = "2.2.0";
 
-    KDE_EXPORT KScreenSaver* kss_create( WId id )
+    TDE_EXPORT KScreenSaver* kss_create( WId id )
     {
         return new KBlankSaver( id );
     }
 
-    KDE_EXPORT TQDialog* kss_setup()
+    TDE_EXPORT TQDialog* kss_setup()
     {
         return new KBlankSetup();
     }
@@ -55,8 +55,8 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name )
 
 	KColorButton *colorPush = new KColorButton( color, main );
 	colorPush->setMinimumWidth(80);
-	connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ),
-		TQT_SLOT( slotColor(const TQColor &) ) );
+	connect( colorPush, TQ_SIGNAL( changed(const TQColor &) ),
+		TQ_SLOT( slotColor(const TQColor &) ) );
 	grid->addWidget(colorPush, 1, 0);
 
 	preview = new TQWidget( main );
diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp
index b7c90db97..bd8c1d640 100644
--- a/tdescreensaver/random.cpp
+++ b/tdescreensaver/random.cpp
@@ -22,10 +22,10 @@
 #include <tqfileinfo.h>
 
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <krandomsequence.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
                         howoften = 0;
                 }
 
-		KDesktopFile saver(tempSaverFileList[i], true);
+		TDEDesktopFile saver(tempSaverFileList[i], true);
                 if (!saver.tryExec())
                     continue;
 		TQString saverType = saver.readEntry("X-TDE-Type");
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
 	int indx = rnd.getLong(saverFileList.count());
 	TQString filename = *(saverFileList.at(indx));
 
-	KDesktopFile config(filename, true);
+	TDEDesktopFile config(filename, true);
 
 	TQString cmd;
 	if (windowId && config.hasActionGroup("InWindow"))
diff --git a/tdesu/ChangeLog b/tdesu/ChangeLog
index f9bd05eb5..3d01f2e01 100644
--- a/tdesu/ChangeLog
+++ b/tdesu/ChangeLog
@@ -50,7 +50,7 @@ Wed, 8 Sep 99    Geert Jansen <g.t.jansen@stud.tue.nl>
 
 Wed, 1 Sep 99    Geert Jansen <g.t.jansen@stud.tue.nl>
 
-    * Deferred instantiation of kapp in tdesu.cpp.
+    * Deferred instantiation of tdeApp in tdesu.cpp.
     * Finished porting to KDE2.
 
 Sun, 29 Aug 99    Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index b36b0513b..b5c75471d 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
     
     {
         TDEStartupInfoId id;
-        id.initId( kapp->startupId());
+        id.initId( tdeApp->startupId());
         id.setupStartupEnv(); // make DESKTOP_STARTUP_ID env. var. available again
     }
 
@@ -272,7 +272,7 @@ static int startApp()
     
     QCStringList env;
     TQCString options;
-    env << ( "DESKTOP_STARTUP_ID=" + kapp->startupId());
+    env << ( "DESKTOP_STARTUP_ID=" + tdeApp->startupId());
     
     if (pw->pw_uid)
     {
@@ -348,7 +348,7 @@ static int startApp()
     if (needpw)
     {
         TDEStartupInfoId id;
-        id.initId( kapp->startupId());
+        id.initId( tdeApp->startupId());
         TDEStartupInfoData data;
         data.setSilent( TDEStartupInfoData::Yes );
         TDEStartupInfo::sendChange( id, data );
@@ -380,7 +380,7 @@ static int startApp()
     }
 
     // Some events may need to be handled (like a button animation)
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // Run command
     if (!change_uid)
diff --git a/tdesu/tdesud/secure.cpp b/tdesu/tdesud/secure.cpp
index dd778575e..e6a6c65c8 100644
--- a/tdesu/tdesud/secure.cpp
+++ b/tdesu/tdesud/secure.cpp
@@ -63,12 +63,12 @@ SocketSecurity::SocketSecurity(int sockfd)
 
 SocketSecurity::SocketSecurity(int sockfd)
 {
-    static bool warned_him = FALSE;
+    static bool warned_him = false;
 
     if (!warned_him) {
         kdWarning() << "Using void socket security. Please add support for your" << endl;
         kdWarning() << "platform to tdesu/tdesud/secure.cpp" << endl;
-        warned_him = TRUE;
+        warned_him = true;
     }
 
     // This passes the test made in handler.cpp
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index 950bb91b4..8bef2cfac 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -64,11 +64,11 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeaboutdata.h>
 #include <tdesu/client.h>
 #include <tdesu/defaults.h>
diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake
index 8ebba8e6d..d0080f4f1 100644
--- a/tdm/ConfigureChecks.cmake
+++ b/tdm/ConfigureChecks.cmake
@@ -18,7 +18,11 @@ check_function_exists( getdomainname HAVE_GETDOMAINNAME )
 check_function_exists( initgroups HAVE_INITGROUPS )
 check_function_exists( mkstemp HAVE_MKSTEMP )
 check_function_exists( setproctitle HAVE_SETPROCTITLE )
+tde_save_and_set( CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE" "-D__BSD_VISIBLE=1" )
+tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "pthread" )
 check_function_exists( pthread_setname_np HAVE_PTHREAD_SETNAME_NP )
+tde_restore( CMAKE_REQUIRED_DEFINITIONS )
+tde_restore( CMAKE_REQUIRED_LIBRARIES )
 check_function_exists( sysinfo HAVE_SYSINFO )
 check_function_exists( strnlen HAVE_STRNLEN )
 check_function_exists( getifaddrs HAVE_GETIFADDRS )
diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt
index f09704486..a9144d5ff 100644
--- a/tdm/backend/CMakeLists.txt
+++ b/tdm/backend/CMakeLists.txt
@@ -49,6 +49,8 @@ tde_add_executable( tdm
     process.c protodpy.c reset.c resource.c rpcauth.c
     server.c session.c sessreg.c socket.c streams.c
     util.c xdmauth.c xdmcp.c
-  LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES}
+  LINK
+    X11 ${CMAKE_THREAD_LIBS_INIT} ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY}
+    ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdm/backend/ctrl.c b/tdm/backend/ctrl.c
index cc9540745..200b7056b 100644
--- a/tdm/backend/ctrl.c
+++ b/tdm/backend/ctrl.c
@@ -592,7 +592,7 @@ processCtrl( const char *string, int len, int fd, struct display *d )
 		} else if (fd >= 0 && !strcmp( ar[0], "activevt" )) {
 #ifdef HAVE_VTS
 			Reply( "ok" );
-			int vt_fd = getfd(NULL);
+			int vt_fd = getfd();
 			if (vt_fd > 0) {
 				struct vt_stat vtstat;
 				if (!ioctl(vt_fd, VT_GETSTATE, &vtstat)) {
diff --git a/tdm/backend/dm.c b/tdm/backend/dm.c
index 627d2c23d..05dfb7a5b 100644
--- a/tdm/backend/dm.c
+++ b/tdm/backend/dm.c
@@ -36,6 +36,13 @@ from the copyright holder.
 
 #include <tqglobal.h>
 
+#include <config.h>
+#ifdef HAVE_PTHREAD_SETNAME_NP
+#define _GNU_SOURCE
+#define __BSD_VISIBLE 1
+#include <pthread.h>
+#endif /* pthread_setname_np() */
+
 #include "dm.h"
 #include "dm_auth.h"
 #include "dm_error.h"
@@ -53,10 +60,6 @@ from the copyright holder.
 # include <sys/vt.h>
 #endif
 
-#ifdef HAVE_PTHREAD_SETNAME_NP
-#include <pthread.h>
-#endif /* pthread_setname_np() */
-
 // Limited by the number of VTs configured into the kernel or 256, whichever is less
 #define MAX_VT_NUMBER 48
 
diff --git a/tdm/backend/dm.h b/tdm/backend/dm.h
index ae731aeca..c3d327a5e 100644
--- a/tdm/backend/dm.h
+++ b/tdm/backend/dm.h
@@ -61,10 +61,6 @@ from the copyright holder.
 #include <errno.h>
 
 #ifdef XDMCP
-# if defined(__osf__)
-/* someone somewhere defines QUERY under Tru64 which confuses Xdmcp.h */
-#  undef QUERY
-# endif
 # include <X11/Xdmcp.h>
 #endif
 
diff --git a/tdm/backend/xdmcp.c b/tdm/backend/xdmcp.c
index 6abaf5fc8..85bea54be 100644
--- a/tdm/backend/xdmcp.c
+++ b/tdm/backend/xdmcp.c
@@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from, int fromlen,
 	int family;
 	int length;
 
-	family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) );
+	family = ConvertAddr( (XdmcpNetaddr)from, &length, (char**)&(addr.data) );
 	addr.length = length; /* convert int to short */
 	Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n",
 	       family, addr.length, addr.data );
diff --git a/tdm/cryptocardwatcher/main.cpp b/tdm/cryptocardwatcher/main.cpp
index 5d27ff19b..34cc96b59 100644
--- a/tdm/cryptocardwatcher/main.cpp
+++ b/tdm/cryptocardwatcher/main.cpp
@@ -123,8 +123,8 @@ int main(int argc, char *argv[]) {
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		TQObject::connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		TQObject::connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		TQObject::connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		TQObject::connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 
diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp
index 9f0c714c0..0bc007e23 100644
--- a/tdm/kfrontend/kchooser.cpp
+++ b/tdm/kfrontend/kchooser.cpp
@@ -72,10 +72,10 @@ ChooserDlg::ChooserDlg()
 	vbox->addWidget( host_view );
 
 	iline = new TQLineEdit( this );
-	iline->setEnabled( TRUE );
+	iline->setEnabled( true );
 	TQLabel *itxt = new TQLabel( iline, i18n("Hos&t:"), this );
 	TQPushButton *addButton = new TQPushButton( i18n("A&dd"), this );
-	connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addHostname()) );
+	connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addHostname()) );
 	TQBoxLayout *hibox = new TQHBoxLayout( vbox, 10 );
 	hibox->addWidget( itxt );
 	hibox->addWidget( iline );
@@ -106,13 +106,13 @@ ChooserDlg::ChooserDlg()
 		vbox->addWidget( consoleView );
 #endif
 
-	sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-	connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) );
+	sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this );
+	connect( sn, TQ_SIGNAL(activated( int )), TQ_SLOT(slotReadPipe()) );
 
-	connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) );
-	connect( acceptButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-//	connect( helpButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) );
-	connect( host_view, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(accept()) );
+	connect( pingButton, TQ_SIGNAL(clicked()), TQ_SLOT(pingHosts()) );
+	connect( acceptButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+//	connect( helpButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) );
+	connect( host_view, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(accept()) );
 
 	adjustGeometry();
 }
diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp
index bf1560aed..e885b3b5a 100644
--- a/tdm/kfrontend/kconsole.cpp
+++ b/tdm/kfrontend/kconsole.cpp
@@ -39,12 +39,10 @@ extern "C" {
 #include <termios.h>
 }
 #endif
-#if !defined(__osf__)
 #ifdef HAVE_TERMIO_H
 /* needed at least on AIX */
 #include <termio.h>
 #endif
-#endif
 
 #if defined (_HPUX_SOURCE)
 #define _TERMIOS_INCLUDED
@@ -129,7 +127,7 @@ KConsole::OpenConsole()
 
   gotcon:
 	notifier = new TQSocketNotifier( fd, TQSocketNotifier::Read, this );
-	connect( notifier, TQT_SIGNAL(activated( int )), TQT_SLOT(slotData()) );
+	connect( notifier, TQ_SIGNAL(activated( int )), TQ_SLOT(slotData()) );
 	return 1;
 }
 
diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp
index 428b2ce09..30ee85a00 100644
--- a/tdm/kfrontend/kfdialog.cpp
+++ b/tdm/kfrontend/kfdialog.cpp
@@ -178,7 +178,7 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
 	button->setDefault( true );
 	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
-	connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+	connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
 
 	TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
 	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 521c624f2..731cb33b5 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -35,11 +35,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sakdlg.h"
 
 #include <kuser.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdecmdlineargs.h>
-#include <kcrash.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdecrash.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #ifdef WITH_XRANDR
@@ -70,9 +70,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 bool argb_visual_available = false;
 bool has_twin = false;
 bool is_themed = false;
-bool trinity_desktop_lock_use_sak = TRUE;
-bool trinity_desktop_synchronize_keyboard_lights = TRUE;
-bool trinity_desktop_watch_cryptographic_cards = TRUE;
+bool trinity_desktop_lock_use_sak = true;
+bool trinity_desktop_synchronize_keyboard_lights = true;
+bool trinity_desktop_watch_cryptographic_cards = true;
 TQPoint primaryScreenPosition;
 
 static int
@@ -126,7 +126,7 @@ void GreeterApp::init()
 
 #ifdef WITH_TDEHWLIB
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*)));
 #endif
 }
 
@@ -193,8 +193,6 @@ xIOErr( Display * )
 	exit( EX_RESERVER_DPY );
 }
 
-//KSimpleConfig *iccconfig;
-
 void
 checkSAK(GreeterApp* app)
 {
@@ -306,7 +304,7 @@ kg_main( const char *argv0 )
 	// Load up the systemwide ICC profile
 	TQString iccConfigFile = TQString(KDE_CONFDIR);
 	iccConfigFile += "/kicc/kiccconfigrc";
-	KSimpleConfig iccconfig(iccConfigFile, true);
+	TDESimpleConfig iccconfig(iccConfigFile, true);
 	if (iccconfig.readBoolEntry("EnableICC", false) == true) {
 		TQString iccCommand = TDEGlobal::dirs()->findExe("dispwin");
 		if (iccCommand.isEmpty())
@@ -346,7 +344,7 @@ kg_main( const char *argv0 )
 
 	_colorScheme = locate( "data", "tdedisplay/color-schemes/" + _colorScheme + ".kcsrc" );
 	if (!_colorScheme.isEmpty()) {
-		KSimpleConfig config( _colorScheme, true );
+		TDESimpleConfig config( _colorScheme, true );
 		config.setGroup( "Color Scheme" );
 		app->setPalette( app->createApplicationPalette( &config, 7 ) );
 	}
@@ -411,7 +409,7 @@ kg_main( const char *argv0 )
 		}
 
 		if (cmd == G_ErrorGreet) {
-			if (KGVerify::handleFailVerify( TQT_TQWIDGET(tqApp->desktop()->screen( _greeterScreen )) ))
+			if (KGVerify::handleFailVerify( tqApp->desktop()->screen( _greeterScreen ) ))
 				break;
 			_autoLoginDelay = 0;
 			cmd = G_Greet;
diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp
index 91058a0b8..684c57e6d 100644
--- a/tdm/kfrontend/kgdialog.cpp
+++ b/tdm/kfrontend/kgdialog.cpp
@@ -60,42 +60,42 @@ KGDialog::completeMenu()
 	if (_isLocal) {
 		dpyMenu = new TQPopupMenu( this );
 		int id = inserten( i18n("Sw&itch User"), ALT+Key_I, dpyMenu );
-		connect( dpyMenu, TQT_SIGNAL(activated( int )),
-		         TQT_SLOT(slotDisplaySelected( int )) );
-		connect( dpyMenu, TQT_SIGNAL(aboutToShow()),
-		         TQT_SLOT(slotPopulateDisplays()) );
+		connect( dpyMenu, TQ_SIGNAL(activated( int )),
+		         TQ_SLOT(slotDisplaySelected( int )) );
+		connect( dpyMenu, TQ_SIGNAL(aboutToShow()),
+		         TQ_SLOT(slotPopulateDisplays()) );
 		TQAccel *accel = new TQAccel( this );
 		accel->insertItem( ALT+CTRL+Key_Insert, id );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivateMenu( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivateMenu( int )) );
 	}
 #endif
 
 	if (_allowClose)
 		inserten( _isLocal ? i18n("R&estart X Server") : i18n("Clos&e Connection"),
-		          ALT+Key_E, TQT_SLOT(slotExit()) );
+		          ALT+Key_E, TQ_SLOT(slotExit()) );
 
 #ifdef XDMCP
 	if (_isLocal && _loginMode != _switchIf) {
 		switchCode = _switchCode;
-		inserten( _switchMsg, _switchAccel, TQT_SLOT(slotSwitch()) );
+		inserten( _switchMsg, _switchAccel, TQ_SLOT(slotSwitch()) );
 	}
 #endif
 
 	if (_hasConsole)
-		inserten( i18n("Co&nsole Login"), ALT+Key_N, TQT_SLOT(slotConsole()) );
+		inserten( i18n("Co&nsole Login"), ALT+Key_N, TQ_SLOT(slotConsole()) );
 
 	if (_allowShutdown != SHUT_NONE) {
                 ensureMenu();
-                optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQT_SLOT(slotShutdown(int)), ALT+Key_S );
+                optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQ_SLOT(slotShutdown(int)), ALT+Key_S );
 		TQAccel *accel = new TQAccel( this );
 		accel->insertItem( ALT+CTRL+Key_Delete );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) );
 		accel = new TQAccel( this );
 		accel->insertItem( SHIFT+ALT+CTRL+Key_PageUp, SHUT_REBOOT );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) );
 		accel = new TQAccel( this );
 		accel->insertItem( SHIFT+ALT+CTRL+Key_PageDown, SHUT_HALT );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) );
 	}
 }
 
@@ -125,7 +125,7 @@ KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu )
 	ensureMenu();
 	int id = optMenu->insertItem( txt, cmnu );
 	optMenu->setAccel( accel, id );
-	optMenu->connectItem( id, this, TQT_SLOT(slotActivateMenu( int )) );
+	optMenu->connectItem( id, this, TQ_SLOT(slotActivateMenu( int )) );
 	optMenu->setItemParameter( id, id );
 	return id;
 }
@@ -151,7 +151,7 @@ KGDialog::slotSwitch()
 {
 #ifdef XDMCP
 	// workaround for Qt bug
-	TQTimer::singleShot( 0, this, TQT_SLOT(slotReallySwitch()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(slotReallySwitch()) );
 #endif
 }
 
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 19d27fe2f..a9901b08c 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -47,10 +47,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <tdeapplication.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kseparator.h>
 #include <tdelistview.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
 #include <kdialog.h>
@@ -201,24 +201,24 @@ KGreeter::KGreeter( bool framed )
   , showInfoMessages( true )
   , closingDown( false )
 {
-	stsFile = new KSimpleConfig( _stsFile );
+	stsFile = new TDESimpleConfig( _stsFile );
 	stsFile->setGroup( "PrevUser" );
 
 	if (_userList) {
                 readFacesList();
 		userView = new UserListView( framed, this );
-		connect( userView, TQT_SIGNAL(clicked( TQListViewItem * )),
-		         TQT_SLOT(slotUserClicked( TQListViewItem * )) );
-		connect( userView, TQT_SIGNAL(doubleClicked( TQListViewItem * )),
-		         TQT_SLOT(accept()) );
+		connect( userView, TQ_SIGNAL(clicked( TQListViewItem * )),
+		         TQ_SLOT(slotUserClicked( TQListViewItem * )) );
+		connect( userView, TQ_SIGNAL(doubleClicked( TQListViewItem * )),
+		         TQ_SLOT(accept()) );
 	}
 	if (_userCompletion) {
 		userList = new TQStringList;
 	}
 
         sessMenu = new TQPopupMenu( this );
-	connect( sessMenu, TQT_SIGNAL(activated( int )),
-	         TQT_SLOT(slotSessionSelected( int )) );
+	connect( sessMenu, TQ_SIGNAL(activated( int )),
+	         TQ_SLOT(slotSessionSelected( int )) );
 	insertSessions();
 
 	if (curPlugin < 0) {
@@ -230,8 +230,8 @@ KGreeter::KGreeter( bool framed )
 	mControlPipeHandler = new ControlPipeHandlerObject();
 	mControlPipeHandler->mKGreeterParent = this;
 	mControlPipeHandler->moveToThread(mControlPipeHandlerThread);
-	TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString)));
-	TQTimer::singleShot(0, mControlPipeHandler, SLOT(run()));
+	TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString)));
+	TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run()));
 	mControlPipeHandlerThread->start();
 }
 
@@ -258,8 +258,8 @@ void KGreeter::cryptographicCardWatcherSetup() {
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 #endif
@@ -615,7 +615,7 @@ KGreeter::insertSessions()
 		TQStringList ents = TQDir( *dit ).entryList();
 		for (TQStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it)
 		  if ((*it).endsWith( ".desktop" ) && !(*it).endsWith("admin.desktop")) {
-				KSimpleConfig dsk( TQString( *dit ).append( '/' ).append( *it ) );
+				TDESimpleConfig dsk( TQString( *dit ).append( '/' ).append( *it ) );
 				dsk.setGroup( "Desktop Entry" );
 				putSession( (*it).left( (*it).length() - 8 ),
 				            dsk.readEntry( "Name" ),
@@ -656,7 +656,7 @@ KGreeter::slotUserEntered()
 	if (isVisible())
 		slotLoadPrevWM();
 	else
-		TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadPrevWM()) );
 }
 
 void
@@ -871,7 +871,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
 	return;
 #endif
 	// Make sure card logins are enabled before attempting one
-	KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	TDESimpleConfig *systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	systemconfig->setGroup(NULL);
 	bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
 	delete systemconfig;
@@ -1020,7 +1020,7 @@ KStdGreeter::KStdGreeter()
 		case LOGO_LOGO:
 			{
 				TQMovie movie( _logo );
-				kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 100 );
+				tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 100 );
 				TQPixmap pixmap;
 				if (!movie.framePixmap().isNull() || pixmap.load( _logo )) {
 					pixLabel = new TQLabel( this );
@@ -1053,7 +1053,7 @@ KStdGreeter::KStdGreeter()
 
 	goButton = new TQPushButton( i18n("L&ogin"), this );
 	goButton->setDefault( true );
-	connect( goButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+	connect( goButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
 	menuButton = new TQPushButton( i18n("&Menu"), this );
 	//helpButton
 
@@ -1112,7 +1112,7 @@ KStdGreeter::KStdGreeter()
         verify->setInfoMessageDisplay(showInfoMessages);
 	verify->start();
 
-	TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup()));
+	TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup()));
 }
 
 void
@@ -1168,8 +1168,8 @@ KThemedGreeter::KThemedGreeter()
 		return;
 	}
 
-	connect( themer, TQT_SIGNAL(activated( const TQString & )),
-	         TQT_SLOT(slotThemeActivated( const TQString & )) );
+	connect( themer, TQ_SIGNAL(activated( const TQString & )),
+	         TQ_SLOT(slotThemeActivated( const TQString & )) );
 
 	console_rect = themer->findNode( "xconsole" ); // tdm ext
 	userlist_rect = themer->findNode( "userlist" );
@@ -1256,14 +1256,14 @@ KThemedGreeter::KThemedGreeter()
 	system_button = themer->findNode( "system_button" );
 	TQAccel *accel = new TQAccel( this );
 	accel->insertItem( ALT+Key_M, 0 );
-	connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActionMenu()) );
+	connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActionMenu()) );
 
 	pluginSetup();
 
 	verify->setInfoMessageDisplay(showInfoMessages);
 	verify->start();
 
-	TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup()));
+	TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup()));
 }
 
 bool
diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h
index ed634c6e8..51a4f799e 100644
--- a/tdm/kfrontend/kgreeter.h
+++ b/tdm/kfrontend/kgreeter.h
@@ -37,7 +37,7 @@ class KdmThemer;
 class KdmItem;
 
 class TDEListView;
-class KSimpleConfig;
+class TDESimpleConfig;
 
 class TQLabel;
 class TQPushButton;
@@ -125,7 +125,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
 	virtual void pluginSetup();
 	void setPrevWM( int );
 
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
 	UserListView *userView;
 	TQStringList *userList;
 	TQPopupMenu *sessMenu;
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index 66b13e974..7b8e012a9 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -105,8 +105,8 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer,
 	, cardLoginDevice(NULL)
 #endif
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
-	connect( kapp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
+	connect( tdeApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
 
 	_parent->installEventFilter( this );
 }
@@ -125,8 +125,8 @@ KGVerify::getPlugMenu()
 		uint np = pluginList.count();
 		if (np > 1) {
 			plugMenu = new TQPopupMenu( parent );
-			connect( plugMenu, TQT_SIGNAL(activated( int )),
-			         TQT_SLOT(slotPluginSelected( int )) );
+			connect( plugMenu, TQ_SIGNAL(activated( int )),
+			         TQ_SLOT(slotPluginSelected( int )) );
 			for (uint i = 0; i < np; i++)
 				plugMenu->insertItem( i18n(greetPlugins[pluginList[i]].info->name), pluginList[i] );
 		}
@@ -301,7 +301,7 @@ void
 KGVerify::setInfoMessageDisplay(bool on)
 {
 	// assert( fixedEntity.isEmpty() );
-	Debug( "%s->setInfoMessageDisplay(%\"s)\n", pName.data(), on );
+	Debug( "%s->setInfoMessageDisplay(%\"d)\n", pName.data(), on );
 	greet->setInfoMessageDisplay(on);
 }
 
@@ -849,7 +849,7 @@ KGVerify::handleVerify()
 			failed = true;
 			updateStatus();
 			handler->verifyFailed();
-			timer.start( 1500 + kapp->random()/(RAND_MAX/1000) );
+			timer.start( 1500 + tdeApp->random()/(RAND_MAX/1000) );
 			return;
 		}
 		if (ret != V_FAIL)
@@ -1264,10 +1264,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
 	hlay->addWidget( cancelButton );
 	hlay->addStretch( 1 );
 
-	connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-	connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+	connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+	connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
-	TQTimer::singleShot( 0, verify, TQT_SLOT(start()) );
+	TQTimer::singleShot( 0, verify, TQ_SLOT(start()) );
 }
 
 KGChTok::~KGChTok()
@@ -1321,7 +1321,7 @@ QXTimer::QXTimer()
 	: inherited( 0 )
 	, left( -1 )
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
 }
 
 void
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index 7145eb18a..93f8521e1 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA.
 #include <config.h>
 
 #include <tdecmdlineargs.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 
 #include <tqfile.h>
@@ -49,10 +49,10 @@ static bool properties_inited = false;
 
 MyApplication::MyApplication( const char *conf )
 	: TDEApplication(),
-	  renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) )
+	  renderer( 0, new TDESimpleConfig( TQFile::decodeName( conf ) ) )
 {
-	connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
-	connect( &renderer, TQT_SIGNAL(imageDone( int )), this, TQT_SLOT(renderDone()) );
+	connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
+	connect( &renderer, TQ_SIGNAL(imageDone( int )), this, TQ_SLOT(renderDone()) );
 	renderer.enableTiling( true ); // optimize
 	renderer.changeWallpaper(); // cannot do it when we're killed, so do it now
 	timer.start( 60000 );
@@ -72,8 +72,8 @@ MyApplication::renderDone()
 	TQPixmap pm = renderer.pixmap();
 
 	// ...set it to the desktop widget...
-	TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm );
-	TQT_TQWIDGET(desktop())->repaint( true );
+	desktop()->setBackgroundPixmap( pm );
+	desktop()->repaint( true );
 
 	// ...and export it via Esetroot-style so that composition managers can use it!
 	Pixmap bgPm = pm.handle(); // fetch the actual X handle to it
diff --git a/tdm/kfrontend/pics/tdelogo.png b/tdm/kfrontend/pics/tdelogo.png
index 647b5c6ea..0bd71f4bb 100644..100755
--- a/tdm/kfrontend/pics/tdelogo.png
+++ b/tdm/kfrontend/pics/tdelogo.png
diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp
index 138045a52..1d7b952e4 100644
--- a/tdm/kfrontend/sakdlg.cpp
+++ b/tdm/kfrontend/sakdlg.cpp
@@ -20,7 +20,7 @@
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -84,7 +84,7 @@
 #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1"
 #define FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1"
 
-bool trinity_desktop_lock_use_system_modal_dialogs = TRUE;
+bool trinity_desktop_lock_use_system_modal_dialogs = true;
 extern bool trinity_desktop_lock_use_sak;
 
 //===========================================================================
@@ -133,7 +133,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
 
 	mSAKProcess = new TDEProcess;
 	*mSAKProcess << "tdmtsak" << "dm";
-	connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+	connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
 	mSAKProcess->start();
 
 #ifdef WITH_TDEHWLIB
@@ -143,8 +143,8 @@ SAKDlg::SAKDlg(TQWidget *parent)
 	TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard);
 	for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) {
 		TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice);
-		connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
-		connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*)));
+		connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
 		cdevice->enableCardMonitoring(true);
 	}
 #endif
@@ -153,8 +153,8 @@ SAKDlg::SAKDlg(TQWidget *parent)
 	mControlPipeHandler = new ControlPipeHandlerObject();
 	mControlPipeHandler->mSAKDlgParent = this;
 	mControlPipeHandler->moveToThread(mControlPipeHandlerThread);
-	TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString)));
-	TQTimer::singleShot(0, mControlPipeHandler, SLOT(run()));
+	TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString)));
+	TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run()));
 	mControlPipeHandlerThread->start();
 }
 
diff --git a/tdm/kfrontend/sakdlg.h b/tdm/kfrontend/sakdlg.h
index 8854d8ee0..5a9d15a4c 100644
--- a/tdm/kfrontend/sakdlg.h
+++ b/tdm/kfrontend/sakdlg.h
@@ -12,7 +12,7 @@
 #include <tqdialog.h>
 #include <tqstringlist.h>
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include "kgreeter.h"
 
diff --git a/tdm/kfrontend/sessions/tde.desktop.cmake b/tdm/kfrontend/sessions/tde.desktop.cmake
index a9d5950ff..591a67aa3 100644
--- a/tdm/kfrontend/sessions/tde.desktop.cmake
+++ b/tdm/kfrontend/sessions/tde.desktop.cmake
@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=XSession
 Exec=@TDE_BIN_DIR@/starttde
 TryExec=@TDE_BIN_DIR@/starttde
-DesktopNames=Trinity
+DesktopNames=TDE
 Name=TDE
 Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment
diff --git a/tdm/kfrontend/sessions/tde.desktop.in b/tdm/kfrontend/sessions/tde.desktop.in
index 81404ed7c..d31df0206 100644
--- a/tdm/kfrontend/sessions/tde.desktop.in
+++ b/tdm/kfrontend/sessions/tde.desktop.in
@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=XSession
 Exec=@TDE_BINDIR@/starttde
 TryExec=@TDE_BINDIR@/starttde
-DesktopNames=Trinity
+DesktopNames=TDE
 Name=TDE
 Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment
diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp
index 7c792c083..9f511d221 100644
--- a/tdm/kfrontend/tdmadmindialog.cpp
+++ b/tdm/kfrontend/tdmadmindialog.cpp
@@ -70,7 +70,7 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent )
     box->addLayout( verify->getLayout() );
     TQAccel *accel = new TQAccel( this );
     accel->insertItem( ALT+Key_A, 0 );
-    connect( accel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivatePlugMenu()) );
+    connect( accel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivatePlugMenu()) );
 
     box->addWidget( new KSeparator( KSeparator::HLine, this ) );
 
@@ -87,8 +87,8 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent )
     hlay->addWidget( cancelButton );
     hlay->addStretch( 1 );
 
-    connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-    connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+    connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+    connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
     slotWhenChanged();
 }
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index f9a7122b8..b3a79295f 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -37,24 +37,24 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
 {
 	// start timer
 	TQTimer *timer = new TQTimer( this );
-	connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
+	connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) );
 	timer->start( 1000 );
 
 	// reading rc file
-	//TDEConfig *config = kapp->config();
+	//TDEConfig *config = tdeApp->config();
 
 	//config->setGroup( "Option" );
-	mDate = false;//config->readNumEntry( "date", FALSE );
-	mSecond = true;//config->readNumEntry( "second", TRUE );
-	mDigital = false;//config->readNumEntry( "digital", FALSE );
-	mBorder = false;//config->readNumEntry( "border", FALSE );
+	mDate = false;//config->readNumEntry( "date", false );
+	mSecond = true;//config->readNumEntry( "second", true );
+	mDigital = false;//config->readNumEntry( "digital", false );
+	mBorder = false;//config->readNumEntry( "border", false );
 
 	//config->setGroup( "Font" );
 	mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
 	mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ );
 	mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ );
-	mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ );
-	mFont.setBold( TRUE/*config->readNumEntry( "Bold",TRUE )*/ );
+	mFont.setItalic( true/*config->readNumEntry( "Italic",true )*/ );
+	mFont.setBold( true/*config->readNumEntry( "Bold",true )*/ );
 
 	setFixedSize( 100, 100 );
 
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index 1a9ea254c..84a0153e5 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -30,9 +30,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 #include <kdialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kuser.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -108,7 +108,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		box->addLayout( verify->getLayout() );
 		TQAccel *accel = new TQAccel( this );
 		accel->insertItem( ALT+Key_A, 0 );
-		connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivatePlugMenu()) );
+		connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivatePlugMenu()) );
 	}
 
 	box->addWidget( new KSeparator( KSeparator::HLine, this ) );
@@ -121,7 +121,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		okButton->setDefault( true );
 		hlay->addWidget( okButton );
 		hlay->addStretch( 1 );
-		connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+		connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
 	}
 	if (maySched) {
 		KPushButton *schedButton =
@@ -129,7 +129,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		schedButton->setSizePolicy( fp );
 		hlay->addWidget( schedButton );
 		hlay->addStretch( 1 );
-		connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
+		connect( schedButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) );
 	}
 	cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
 	cancelButton->setSizePolicy( fp );
@@ -137,7 +137,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget )
 		cancelButton->setDefault( true );
 	hlay->addWidget( cancelButton );
 	hlay->addStretch( 1 );
-	connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+	connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 
 	updateNeedRoot();
 }
@@ -260,8 +260,8 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 
 	restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup );
 
-	connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
-	connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
+	connect( rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) );
+	connect( restart_rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) );
 
 	GSet( 1 );
 	GSendInt( G_ListBootOpts );
@@ -276,11 +276,11 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 		freeStrArr( tlist );
 		targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
 		TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
-		int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+		int spc = tdeApp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
 		          + howGroup->insideSpacing();
 		hb->addSpacing( spc );
 		hb->addWidget( targets );
-		connect( targets, TQT_SIGNAL(activated( int )), TQT_SLOT(slotTargetChanged()) );
+		connect( targets, TQ_SIGNAL(activated( int )), TQ_SLOT(slotTargetChanged()) );
 	}
 	GSet( 0 );
 
@@ -297,7 +297,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 
 	cb_force = new TQCheckBox( i18n("&Force after timeout"), schedGroup );
 	if (_allowNuke != SHUT_NONE) {
-		connect( cb_force, TQT_SIGNAL(clicked()), TQT_SLOT(slotWhenChanged()) );
+		connect( cb_force, TQ_SIGNAL(clicked()), TQ_SLOT(slotWhenChanged()) );
 		mayNuke = true;
 	} else
 		cb_force->setEnabled( false );
@@ -327,7 +327,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 static int
 get_date( const char *str )
 {
-	KProcIO prc;
+	TDEProcIO prc;
 	prc << "/bin/date" << "+%s" << "-d" << str;
 	prc.start( TDEProcess::Block, false );
 	TQString dstr;
@@ -437,9 +437,9 @@ TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item,
 	: inherited( item, parent, name )
 	, pop( 0 )
 {
-	connect( this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) );
-	connect( this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) );
-	connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
+	connect( this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) );
+	connect( this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) );
+	connect( &popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
 }
 
 void TDMDelayedPushButton::setPopup( TQPopupMenu *p )
@@ -503,7 +503,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
                 int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
                 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnReboot);
-		connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+		connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
 		
 		// Copied completely from the standard restart/shutdown dialog
 		GSet( 1 );
@@ -522,7 +522,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 									t, i );
 			}
 			btnReboot->setPopup( targets );
-			connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+			connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 		}
 		GSet( 0 );
 		// Copied completely from the standard restart/shutdown dialog
@@ -534,7 +534,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
                 i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
                 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
 		hbuttonbox->addWidget ( btnHalt );
-		connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+		connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
 
 		// cancel buttonbox
 		TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint()  );
@@ -543,7 +543,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 		// Back to tdm
 		KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
 		hbuttonbox2->addWidget( btnBack );
-		connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+		connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 	}
 	else
 	{
@@ -567,14 +567,14 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 		KPushButton *btnHalt = new
 			KPushButton( KGuiItem( i18n("&Turn Off Computer"), "system-log-out" ), this );
 		buttonlay->addWidget( btnHalt );
-		connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) );
+		connect( btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()) );
 	
 		buttonlay->addSpacing( KDialog::spacingHint() );
 	
 		TDMDelayedPushButton *btnReboot = new
 			TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this );
 		buttonlay->addWidget( btnReboot );
-		connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) );
+		connect( btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()) );
 	
 		GSet( 1 );
 		GSendInt( G_ListBootOpts );
@@ -591,7 +591,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 									t, i );
 			}
 			btnReboot->setPopup( targets );
-			connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+			connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
 		}
 		GSet( 0 );
 	
@@ -601,7 +601,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 			KPushButton *btnSched = new
 				KPushButton( KGuiItem( i18n("&Schedule...") ), this );
 			buttonlay->addWidget( btnSched );
-			connect( btnSched, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
+			connect( btnSched, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) );
 	
 			buttonlay->addStretch( 1 );
 		}
@@ -612,7 +612,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 	
 		KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this );
 		buttonlay->addWidget( btnBack );
-		connect( btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+		connect( btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
 	
 		buttonlay->addSpacing( KDialog::spacingHint() );	
 	}
@@ -698,7 +698,7 @@ void KSMPushButton::keyPressEvent( TQKeyEvent* e )
 		case Key_Enter:
 		case Key_Return:
 		case Key_Space:
-			m_pressed = TRUE;
+			m_pressed = true;
 			setDown(true);
 			emit pressed();
 		break;
@@ -723,7 +723,7 @@ void KSMPushButton::keyReleaseEvent( TQKeyEvent* e )
 			if ( m_pressed ) 
 			{
 			setDown(false);
-			m_pressed = FALSE;
+			m_pressed = false;
 			emit released();
 			emit clicked();
 			}
@@ -764,7 +764,7 @@ void FlatButton::keyPressEvent( TQKeyEvent* e )
 		case Key_Enter:
 		case Key_Return:
 		case Key_Space:
-			m_pressed = TRUE;
+			m_pressed = true;
 			setDown(true);
 			emit pressed();
 		break;
@@ -788,7 +788,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e )
 			if ( m_pressed ) 
 			{
 			setDown(false);
-			m_pressed = FALSE;
+			m_pressed = false;
 			emit released();
 			emit clicked();
 			}
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index e89890129..befcb7c35 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -238,7 +238,7 @@ KdmItem::setWidget( TQWidget *widget )
 
 	setGeometry(area, true);
 
-	connect( myWidget, TQT_SIGNAL(destroyed()), TQT_SLOT(widgetGone()) );
+	connect( myWidget, TQ_SIGNAL(destroyed()), TQ_SLOT(widgetGone()) );
 }
 
 void
@@ -253,11 +253,11 @@ KdmItem::setLayoutItem( TQLayoutItem *item )
 	myLayoutItem = item;
 	// XXX hiding not supported - it think it's pointless here
 	if (myLayoutItem->widget())
-		connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(layoutItemGone()) );
+		connect( myLayoutItem->widget(), TQ_SIGNAL(destroyed()),
+		         TQ_SLOT(layoutItemGone()) );
 	else if (myLayoutItem->layout())
-		connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(layoutItemGone()) );
+		connect( myLayoutItem->layout(), TQ_SIGNAL(destroyed()),
+		         TQ_SLOT(layoutItemGone()) );
 }
 
 void
@@ -583,8 +583,8 @@ KdmItem::addChildItem( KdmItem *item )
 	}
 
 	// signal bounce from child to parent
-	connect( item, TQT_SIGNAL(needUpdate( int, int, int, int )), TQT_SIGNAL(needUpdate( int, int, int, int )) );
-	connect( item, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
+	connect( item, TQ_SIGNAL(needUpdate( int, int, int, int )), TQ_SIGNAL(needUpdate( int, int, int, int )) );
+	connect( item, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) );
 }
 
 void
diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp
index f2fae90a6..1af382819 100644
--- a/tdm/kfrontend/themer/tdmlabel.cpp
+++ b/tdm/kfrontend/themer/tdmlabel.cpp
@@ -100,7 +100,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name )
 	if (label.isTimer) {
 		timer = new TQTimer( this );
 		timer->start( 1000 );
-		connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(update()) );
+		connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(update()) );
 	}
 	setTextInt( lookupText( label.text ) );
 }
@@ -117,7 +117,7 @@ KdmLabel::setTextInt( const TQString &txt)
 	  cText.remove('&');
 	  myAccel = new TQAccel(parentWidget());
 	  myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
-	  connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
+	  connect(myAccel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAccel()));
 	}
 }
 
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index fa9e0fcf5..685d1b2c8 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqfile.h>
 #include <tqpainter.h>
@@ -73,7 +73,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 					// Software blend only (no compositing support)
 					// Use the preset TDM background...
 					TDEStandardDirs *m_pDirs = TDEGlobal::dirs();
-					KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
+					TDESimpleConfig *config = new TDESimpleConfig( TQFile::decodeName( _backgroundCfg ) );
 					config->setGroup("Desktop0");
 					pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper"));
 					// TODO: Detect when there is no wallpaper and use the background settings instead
diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h
index 90d0a38aa..eb304fde3 100644
--- a/tdm/kfrontend/themer/tdmpixmap.h
+++ b/tdm/kfrontend/themer/tdmpixmap.h
@@ -27,8 +27,8 @@
 //#include <tqrect.h>
 #include <tqpixmap.h>
 
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 
 /*
  * KdmPixmap. A pixmap element
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index 0a0e7fabb..82ebf55e7 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <kimageeffect.h>
 #include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
@@ -62,7 +62,7 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget
 	// read the XML file and create DOM tree
 	TQString filename = _filename;
 	if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
-		KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
+		TDESimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
 		cfg.setGroup( "GdmGreeterTheme" );
 		filename += '/' + cfg.readEntry( "Greeter" );
 	}
@@ -78,24 +78,24 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget
 	// Set the root (screen) item
 	rootItem = new KdmRect( parent, TQDomNode(), "tdm root" );
 
-	connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )),
-	         widget(), TQT_SLOT(update( int, int, int, int )) );
+	connect( rootItem, TQ_SIGNAL(needUpdate( int, int, int, int )),
+	         widget(), TQ_SLOT(update( int, int, int, int )) );
 
 	rootItem->setBaseDir( TQFileInfo( filename ).dirPath( true ) );
 
 	// generate all the items defined in the theme
 	generateItems( rootItem );
 
-	connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) );
-	connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SLOT(slotActivated( const TQString & )) );
+	connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) );
+	connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SLOT(slotActivated( const TQString & )) );
 
-	TQTimer::singleShot(800, this, TQT_SLOT(slotPaintRoot()));
+	TQTimer::singleShot(800, this, TQ_SLOT(slotPaintRoot()));
 
 /*	*TODO*
 	// Animation timer
 	TQTimer *time = new TQTimer( this );
 	time->start( 500 );
-	connect( time, TQT_SIGNAL(timeout()), TQT_SLOT(update()) )
+	connect( time, TQ_SIGNAL(timeout()), TQ_SLOT(update()) )
 */
 }
 
@@ -432,8 +432,8 @@ KdmThemer::slotPaintRoot()
 	}
 	else return;
 	
-	TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm);
-	TQT_TQWIDGET(TQApplication::desktop()->screen())->erase();
+	TQApplication::desktop()->screen()->setErasePixmap(pm);
+	TQApplication::desktop()->screen()->erase();
 }
 
 #include "tdmthemer.moc"
diff --git a/tdmlib/dmctl.cpp b/tdmlib/dmctl.cpp
index 00c3cb489..6cd6f7e93 100644
--- a/tdmlib/dmctl.cpp
+++ b/tdmlib/dmctl.cpp
@@ -19,7 +19,7 @@
 
 #include "dmctl.h"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tdelocale.h>
 #include <dcopclient.h>
@@ -531,4 +531,4 @@ DM::type()
 	return DMType;
 }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/tdmlib/dmctl.h b/tdmlib/dmctl.h
index e0cdc966c..40ea95f26 100644
--- a/tdmlib/dmctl.h
+++ b/tdmlib/dmctl.h
@@ -32,7 +32,7 @@ struct SessEnt {
 typedef TQValueList<SessEnt> SessList;
 
 class DM {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 public:
 
@@ -77,7 +77,7 @@ private:
 
 	void GDMAuthenticate();
 
-#else // Q_WS_X11
+#else // TQ_WS_X11
 
 public:
 	DM() {}
@@ -100,7 +100,7 @@ public:
 
 	int type() { return NoDM }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 }; // class DM
 
diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp
index 44db90158..ac310a135 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -94,10 +94,10 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 		if (fixedUser.isEmpty()) {
 			loginEdit = new KLineEdit( parent );
 			loginEdit->setContextMenuEnabled( false );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
 			if (pred) {
 				parent->setTabOrder( pred, loginEdit );
 				pred = loginEdit;
@@ -120,9 +120,9 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 		else
 			passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
 			                                  parent );
-		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		         TQT_SLOT(slotActivity()) );
-		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		         TQ_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 		if (pred) {
 			parent->setTabOrder( pred, passwdEdit );
 			pred = passwdEdit;
@@ -611,7 +611,7 @@ create( KGreeterPluginHandler *handler, KdmThemer *themer,
 	return new KClassicGreeter( handler, themer, parent, predecessor, fixedEntity, func, ctx );
 }
 
-KDE_EXPORT kgreeterplugin_info kgreeterplugin_info = {
+TDE_EXPORT kgreeterplugin_info kgreeterplugin_info = {
 	I18N_NOOP("Username + password (classic)"), "classic",
 	kgreeterplugin_info::Local | kgreeterplugin_info::Presettable,
 	init, done, create
diff --git a/tdmlib/kgreet_classic.h b/tdmlib/kgreet_classic.h
index f5dc52122..2da7e633c 100644
--- a/tdmlib/kgreet_classic.h
+++ b/tdmlib/kgreet_classic.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class KLineEdit;
 class KPasswordEdit;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TQGridLayout;
 class TQLabel;
 
@@ -81,7 +81,7 @@ class KClassicGreeter : public TQObject, public KGreeterPlugin {
 	TQLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
 	KLineEdit *loginEdit;
 	KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
 	TQString fixedUser, curUser;
 	Function func;
 	Context ctx;
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index b0ef73a28..f0581a601 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -127,10 +127,10 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
 		if (fixedUser.isEmpty()) {
 			loginEdit = new KLineEdit( parent );
 			loginEdit->setContextMenuEnabled( false );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
 			if (pred) {
 				parent->setTabOrder( pred, loginEdit );
 				pred = loginEdit;
@@ -154,9 +154,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
 		else
 			passwdEdit = new TDMPasswordEdit( echoMode,
 			                                  parent );
-		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		         TQT_SLOT(slotActivity()) );
-		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		         TQ_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 		if (pred) {
 			parent->setTabOrder( pred, passwdEdit );
 			pred = passwdEdit;
@@ -377,7 +377,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
             if (tdmlabel) {
                 //userLabel->setText(TQString::fromUtf8(prompt));
                 tdmlabel->label.text = TQString::fromUtf8(prompt);
-                TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+                TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
             }
         }
     }
@@ -395,7 +395,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
                 //userLabel->setText(TQString::fromUtf8(prompt));
                 TQString str = TQString::fromUtf8(prompt);
                 tdmlabel->label.text = str;
-                TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+                TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
             }
         }
 
@@ -405,9 +405,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
 	    passwdEdit = new TDMPasswordEdit( m_parentWidget );
 	else
 	    passwdEdit = new TDMPasswordEdit( echoMode, m_parentWidget);
-	connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		TQT_SLOT(slotActivity()) );
-	connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+	connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		TQ_SLOT(slotActivity()) );
+	connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 	authEdit << passwdEdit;
 
 #if 1
@@ -435,7 +435,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
            if (0) {
                 //userLabel->setText(TQString::fromUtf8(prompt));
                 //tdmlabel->label.text = TQString::fromUtf8(prompt);
-                //TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+                //TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
            }
        } 
        else
@@ -708,7 +708,7 @@ create( KGreeterPluginHandler *handler, KdmThemer *themer,
 	return new KPamGreeter( handler, themer, parent, predecessor, fixedEntity, func, ctx );
 }
 
-KDE_EXPORT kgreeterplugin_info kgreeterplugin_info = {
+TDE_EXPORT kgreeterplugin_info kgreeterplugin_info = {
 	I18N_NOOP("Pam conversation plugin"), "pam",
 	kgreeterplugin_info::Local | kgreeterplugin_info::Presettable,
 	init, done, create
diff --git a/tdmlib/kgreet_pam.h b/tdmlib/kgreet_pam.h
index 98e3315b1..9ce055113 100644
--- a/tdmlib/kgreet_pam.h
+++ b/tdmlib/kgreet_pam.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class KLineEdit;
 class KPasswordEdit;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TQGridLayout;
 class TQLabel;
 
@@ -84,7 +84,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
 	KLineEdit *loginEdit;
         TQWidget* m_parentWidget;
         TQValueList<KPasswordEdit*> authEdit;
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
         KdmThemer *m_themer;
 	TQString fixedUser, curUser;
 	Function func;
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index 6065a9123..2c6080f40 100644
--- a/tdmlib/kgreet_winbind.cpp
+++ b/tdmlib/kgreet_winbind.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <klineedit.h>
 #include <kpassdlg.h>
 #include <kuser.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 
 #include <tqregexp.h>
 #include <tqlayout.h>
@@ -108,12 +108,12 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 	if (func != ChAuthTok) {
 		if (fixedUser.isEmpty()) {
 			domainCombo = new KComboBox( parent );
-			connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
-			         TQT_SLOT(slotChangedDomain( const TQString & )) );
-			connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
-			         TQT_SLOT(slotLoginLostFocus()) );
-			connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
-			         TQT_SLOT(slotActivity()) );
+			connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+			         TQ_SLOT(slotChangedDomain( const TQString & )) );
+			connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+			         TQ_SLOT(slotLoginLostFocus()) );
+			connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+			         TQ_SLOT(slotActivity()) );
 			// should handle loss of focus
 			loginEdit = new KLineEdit( parent );
 			loginEdit->setContextMenuEnabled( false );
@@ -136,13 +136,13 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 				grid->addWidget( loginLabel, line, 0 );
 				grid->addWidget( loginEdit, line++, 1 );
 			}
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
-			connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
-			connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
-			connect(&mDomainListTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartDomainList()));
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+			connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+			connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
+			connect(&mDomainListTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartDomainList()));
 			domainCombo->insertStringList( staticDomains );
-			TQTimer::singleShot(0, this, TQT_SLOT(slotStartDomainList()));
+			TQTimer::singleShot(0, this, TQ_SLOT(slotStartDomainList()));
 		} else if (ctx != Login && ctx != Shutdown && grid) {
 			domainLabel = new TQLabel( i18n("Domain:"), parent );
 			grid->addWidget( domainLabel, line, 0 );
@@ -156,9 +156,9 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 		else
 			passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
 			                                  parent );
-		connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		         TQT_SLOT(slotActivity()) );
-		connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+		         TQ_SLOT(slotActivity()) );
+		connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
 
 		if (!grid) {
 			passwdEdit->adjustSize();
@@ -612,9 +612,9 @@ KWinbindGreeter::slotStartDomainList()
     mDomainListTimer.stop();
     mDomainListing.clear();
 
-    m_domainLister = new KProcIO;
-    connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList()));
-    connect(m_domainLister, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotEndDomainList()));
+    m_domainLister = new TDEProcIO;
+    connect(m_domainLister, TQ_SIGNAL(readReady(TDEProcIO*)), TQ_SLOT(slotReadDomainList()));
+    connect(m_domainLister, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotEndDomainList()));
 
     (*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains";
     m_domainLister->setComm (TDEProcess::Stdout);
@@ -712,7 +712,7 @@ create( KGreeterPluginHandler *handler, KdmThemer *themer,
 	return new KWinbindGreeter( handler, themer, parent, predecessor, fixedEntity, func, ctx );
 }
 
-KDE_EXPORT kgreeterplugin_info kgreeterplugin_info = {
+TDE_EXPORT kgreeterplugin_info kgreeterplugin_info = {
 	I18N_NOOP("Winbind / Samba"), "classic",
 	kgreeterplugin_info::Local | kgreeterplugin_info::Fielded | kgreeterplugin_info::Presettable,
 	init, done, create
diff --git a/tdmlib/kgreet_winbind.h b/tdmlib/kgreet_winbind.h
index 7bd8e59e6..8ec404edd 100644
--- a/tdmlib/kgreet_winbind.h
+++ b/tdmlib/kgreet_winbind.h
@@ -34,11 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class KComboBox;
 class KLineEdit;
 class KPasswordEdit;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TQGridLayout;
 class TQLabel;
 class KdmThemer;
-class KProcIO;
+class TDEProcIO;
 
 class KWinbindGreeter : public TQObject, public KGreeterPlugin {
 	TQ_OBJECT
@@ -89,10 +89,10 @@ class KWinbindGreeter : public TQObject, public KGreeterPlugin {
 	KComboBox *domainCombo;
 	KLineEdit *loginEdit;
 	KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
-	KSimpleConfig *stsFile;
+	TDESimpleConfig *stsFile;
 	TQString fixedDomain, fixedUser, curUser;
 	TQStringList allUsers, mDomainListing;
-	KProcIO* m_domainLister;
+	TDEProcIO* m_domainLister;
         TQTimer mDomainListTimer;
 
 	Function func;
diff --git a/tdmlib/kgreeterplugin.h b/tdmlib/kgreeterplugin.h
index 1dcd0233b..946f48ed7 100644
--- a/tdmlib/kgreeterplugin.h
+++ b/tdmlib/kgreeterplugin.h
@@ -26,7 +26,7 @@
 
 #include <tqvariant.h>
 #include <tqmessagebox.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KdmThemer;
 
@@ -312,7 +312,7 @@ protected:
     TQLayoutItem *layoutItem;
 };
 
-struct KDE_EXPORT kgreeterplugin_info {
+struct TDE_EXPORT kgreeterplugin_info {
     /**
      * Human readable name of this plugin (should be a little more
      * informative than just the libary name). Must be I18N_NOOP()ed.
diff --git a/tqt3integration/README b/tqt3integration/README
index 1af1034a8..75579fdc9 100644
--- a/tqt3integration/README
+++ b/tqt3integration/README
@@ -19,7 +19,7 @@ v kded nesmi byt nic, co znovu vstupuje do event loop
     - udelat na to test
     - spravit tdewallet
 
-blokovat uzivatelsky vstup, jako to dela kapp pro dcop
+blokovat uzivatelsky vstup, jako to dela tdeApp pro dcop
 
 obcas se dela demand-attention v taskbaru
 - navic je problem s focus stealing prevention, kdyz aplikace nejdriv zobrazi jen samotny dialog
diff --git a/tqt3integration/libtqttde/tqttde.cpp b/tqt3integration/libtqttde/tqttde.cpp
index 3647db8a2..aa9f10a67 100644
--- a/tqt3integration/libtqttde/tqttde.cpp
+++ b/tqt3integration/libtqttde/tqttde.cpp
@@ -87,10 +87,10 @@ static DCOPClient* dcopClient()
         assert( tqApp != NULL ); // TODO
         prepared = true;
         dcop->bindToApp();
-        if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
+        if( !tqApp->inherits( "TDEApplication" )) // TDEApp takes care of input blocking
             {
             static tqttde_EventLoop* loop = new tqttde_EventLoop;
-            TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));
+            TQObject::connect( dcop, TQ_SIGNAL( blockUserInput( bool )), loop, TQ_SLOT( block( bool )));
             }
         }
     return dcop;
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index e397105b1..cf27233a9 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -38,7 +38,7 @@
 
 extern "C"
 { 
-    KDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj )
+    TDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj )
         {
             return new TDEIntegration::Module( obj );
         }
@@ -93,7 +93,7 @@ void* Module::getOpenFileNames( const TQString& filter, TQString workingDirector
     dlg->setMode(( multiple ? KFile::Files : KFile::File ) | KFile::LocalOnly );
     dlg->setPlainCaption( caption.isNull() ? i18n("Open") : caption );
 // TODO    dlg->ops->clearHistory();
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -117,7 +117,7 @@ void* Module::getSaveFileName( const TQString& initialSelection, const TQString&
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setOperationMode( KFileDialog::Saving );
     dlg->setPlainCaption( caption.isNull() ? i18n("Save As") : caption );
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -130,7 +130,7 @@ void* Module::getExistingDirectory( const TQString& initialDirectory, long paren
         name.isEmpty() ? name : "kdirselect dialog", false );
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setPlainCaption( caption.isNull() ? i18n( "Select Folder" ) : caption );
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -144,7 +144,7 @@ void* Module::getColor( const TQColor& color, long parent, const TQCString& name
         dlg->setColor( color );
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setPlainCaption( i18n( "Select Color" ));
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -156,7 +156,7 @@ void* Module::getFont( bool /*ok*/, const TQFont& def, long parent, const TQCStr
     dlg->setFont( def, false );
     prepareDialog( dlg, parent, wmclass1, wmclass2 );
     dlg->setPlainCaption( i18n( "Select Font" ));
-    connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dlg->show();
     return dlg;
     }
@@ -245,7 +245,7 @@ void* Module::messageBox1( int type, long parent, const TQString& caption, const
                        &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
     prepareDialog( dialog, parent, wmclass1, wmclass2 );
     dialog->setPlainCaption( caption );
-    connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     btns b;
     b.buttons[ 0 ] = buttons[ 0 ];
     b.buttons[ 1 ] = buttons[ 1 ];
@@ -277,7 +277,7 @@ void* Module::messageBox2( int type, long parent, const TQString& caption, const
                        &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
     prepareDialog( dialog, parent, wmclass1, wmclass2 );
     dialog->setPlainCaption( caption );
-    connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+    connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
     dialog->show();
     return dialog;
     }
diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt
index c75567af5..a65b3108e 100644
--- a/tqt3integration/utils/CMakeLists.txt
+++ b/tqt3integration/utils/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_executable( gen AUTOMOC
   LINK tdecore-shared
 )
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
   OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp
@@ -44,6 +44,6 @@ ADD_CUSTOM_COMMAND(
   DEPENDS gen
 )
 
-ADD_CUSTOM_TARGET( generate_tqt3_bindings
+add_custom_target( generate_tqt3_bindings
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
 )
diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp
index 03a2bf422..5e896fb14 100644
--- a/tqt3integration/utils/gen.cpp
+++ b/tqt3integration/utils/gen.cpp
@@ -740,7 +740,7 @@ void genarateTDEPreStub( TQTextStream& stream )
         if( function.delayed_return )
             {
             stream << "    JobData job;\n";
-            stream << "    job.transaction = kapp->dcopClient()->beginTransaction();\n";
+            stream << "    job.transaction = tdeApp->dcopClient()->beginTransaction();\n";
             stream << "    job.type = JobData::" + TQString( function.name[ 0 ].upper()) + function.name.mid( 1 ) + ";\n";
             }
         for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
@@ -870,7 +870,7 @@ void genarateTDEPostStub( TQTextStream& stream )
             stream << ";\n";
             }
         if( function.delayed_return )
-            stream << "    kapp->dcopClient()->endTransaction( job.transaction, replyType, replyData );\n";
+            stream << "    tdeApp->dcopClient()->endTransaction( job.transaction, replyType, replyData );\n";
         stream << "    }\n";
         stream << "\n";
         }
diff --git a/translations/desktop_files/applnk-compat/de.po b/translations/desktop_files/applnk-compat/de.po
index c320d16e3..657301f52 100644
--- a/translations/desktop_files/applnk-compat/de.po
+++ b/translations/desktop_files/applnk-compat/de.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Etienne Ruedin <ruedin@gmx.net>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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: 2024-08-11 04:10+0000\n"
+"Last-Translator: Etienne Ruedin <ruedin@gmx.net>\n"
+"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -48,7 +49,7 @@ msgstr ""
 #. Name
 #: kcmkonq.desktop:2
 msgid "File Manager"
-msgstr "Dateimanager"
+msgstr "Dateiverwaltung"
 
 #. Name
 #: kcmkxmlrpcd.desktop:2
diff --git a/translations/desktop_files/applnk-compat/es_AR.po b/translations/desktop_files/applnk-compat/es_AR.po
new file mode 100644
index 000000000..b1e1237f4
--- /dev/null
+++ b/translations/desktop_files/applnk-compat/es_AR.po
@@ -0,0 +1,119 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2024-11-19 14:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/applnk-compat/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
+msgid "Laptop"
+msgstr "Netbook"
+
+#. Name
+#: email.desktop:10
+msgid "Email"
+msgstr "Mail"
+
+#. Comment
+#: email.desktop:11
+msgid "Configure your identity, email addresses, mail servers, etc."
+msgstr ""
+"Configuración de tu identidad, direcciones de mail, servidores de mail, etc."
+
+#. Keywords
+#: email.desktop:13
+msgid ""
+"EMail;Mail;E-Mail;Address;Email server;IMAP;POP3;Local mailbox;mailbox;User "
+"Information;Reply Address;Server information;User Name;Passwords;Host;"
+"Current Profile;Profile;Organization;Incoming Host;Outgoing Host;Email "
+"Client;"
+msgstr ""
+"Correo electrónico;Correo;E-Mail;Dirección;Servidor de correo;IMAP;POP3;"
+"Buzón local;buzón;Información del usuario;Dirección de respuesta;Información "
+"del servidor;Nombre de usuario;Contraseñas;Máquina;Perfil "
+"actual;Perfil;Organización;Máquina entrante;Máquina saliente;Cliente de "
+"correo;"
+
+#. Name
+#: kcmkonq.desktop:2
+#, fuzzy
+msgid "File Manager"
+msgstr "Gestor de archivos"
+
+#. Name
+#: kcmkxmlrpcd.desktop:2
+#, fuzzy
+msgid "XML RPC Daemon"
+msgstr "Demonio XML RPC"
+
+#. Name
+#: konqhtml.desktop:2
+#, fuzzy
+msgid "Konqueror Browser"
+msgstr "Navegador Konqueror"
+
+#. Name
+#: passwords.desktop:11
+#, fuzzy
+msgid "Passwords"
+msgstr "Contraseñas"
+
+#. Comment
+#: passwords.desktop:13
+#, fuzzy
+msgid "Configure password settings"
+msgstr "Configurar las opciones de las contraseñas"
+
+#. Keywords
+#: passwords.desktop:15
+#, fuzzy
+msgid "Passwords;tdesu;Echo characters;Remember passwords;Timeout;"
+msgstr ""
+"Contraseñas;tdesu;Caracteres con eco;Recordar contraseñas;Tiempo de "
+"expiración;"
+
+#. Name
+#: socks.desktop:2
+#, fuzzy
+msgid "Socks"
+msgstr "Socks"
+
+#. Name
+#: userinfo.desktop:13
+#, fuzzy
+msgid "User Account"
+msgstr "Cuenta de usuario"
+
+#. Comment
+#: userinfo.desktop:14
+msgid "Change your account information"
+msgstr "Cambiar la información de tu cuenta"
+
+#. Keywords
+#: userinfo.desktop:15
+#, fuzzy
+msgid ""
+"Passwords;Password;Change Password;Icon;face;tdm;User Name;Name;Account;"
+msgstr ""
+"Contraseñas;Contraseña;Cambiar contraseña;Icono;cara;tdm;Nombre de "
+"usuario;Nombre;Cuenta;"
+
+#. Name
+#: virtualdesktops.desktop:2
+#, fuzzy
+msgid "Virtual Desktops"
+msgstr "Escritorios virtuales"
diff --git a/translations/desktop_files/applnk-compat/ka.po b/translations/desktop_files/applnk-compat/ka.po
index 9eccd7308..d4833659c 100644
--- a/translations/desktop_files/applnk-compat/ka.po
+++ b/translations/desktop_files/applnk-compat/ka.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
 msgid "Laptop"
-msgstr "ლეპტ�პი"
+msgstr "ნ�უთბუქი"
 
 #. Name
 #: email.desktop:10
@@ -29,8 +30,7 @@ msgstr "ელფ�სტ�"
 #. Comment
 #: email.desktop:11
 msgid "Configure your identity, email addresses, mail servers, etc."
-msgstr ""
-"თქვენი ვინ��ბის, ელფ�სტის მის�მ�რთის, ელფ�სტის სერვერების, დ� �.ს. შეყვ�ნ�"
+msgstr "მ�ირგეთ თქვენი ვინ��ბ�, ელფ�სტის მის�მ�რთი, ელფ�სტის სერვერები დ� �.შ."
 
 #. Keywords
 #: email.desktop:13
@@ -42,24 +42,24 @@ msgid ""
 msgstr ""
 "ელ-ფ�სტ�; ფ�სტ�; ელფ�სტ�; მის�მ�რთი; ს�ფ�სტ� სერვერი; IMAP; POP3; ლ�კ�ლური "
 "ს�ფ�სტ� ყუთი; ს�ფ�სტ� ყუთი; ინფ�რმ�ცი� მ�მხმ�რებლის შეს�ხებ; მიმღების "
-"მის�მ�რთი; ინფ�რმ�ცი� სერველის შეს�ხებ; მ�მხმ�რებლის ს�ხელი; პ�რ�ლები; "
-"ჰ�სტი; �ხლ�ნდელი პრ�ფილი; პრ�ფილი; �რგ�ნიზ�ცი�; შემ�მ�ვ�ლი ჰ�სტი; გ�მ�ვ�ლი "
-"ჰ�სტი; ს�ფ�სტ� კლიენტი;"
+"მის�მ�რთი; ინფ�რმ�ცი� სერველის შეს�ხებ; მ�მხმ�რებლის ს�ხელი; პ�რ�ლები; ჰ�სტი;"
+" �ხლ�ნდელი პრ�ფილი; �რგ�ნიზ�ცი�; შემ�მ�ვ�ლი ჰ�სტი; გ�მ�ვ�ლი ჰ�სტი; ს�ფ�სტ� "
+"კლიენტი;"
 
 #. Name
 #: kcmkonq.desktop:2
 msgid "File Manager"
-msgstr "ფ�ილთ� მენჯერი"
+msgstr "ფ�ილების მმ�რთველი"
 
 #. Name
 #: kcmkxmlrpcd.desktop:2
 msgid "XML RPC Daemon"
-msgstr "XML RPC–ის გუშ�გი"
+msgstr "XML RPC–ის დემ�ნი"
 
 #. Name
 #: konqhtml.desktop:2
 msgid "Konqueror Browser"
-msgstr "Konqueror"
+msgstr "ბრ�უზერი Konqueror"
 
 #. Name
 #: passwords.desktop:11
@@ -69,7 +69,7 @@ msgstr "პ�რ�ლები"
 #. Comment
 #: passwords.desktop:13
 msgid "Configure password settings"
-msgstr "პ�რ�ლების კ�ნფიგურ�ცი�"
+msgstr "პ�რ�ლის პ�რ�მეტრების მ�რგებ�"
 
 #. Keywords
 #: passwords.desktop:15
@@ -80,7 +80,7 @@ msgstr ""
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
@@ -103,4 +103,4 @@ msgstr ""
 #. Name
 #: virtualdesktops.desktop:2
 msgid "Virtual Desktops"
-msgstr "ვირტუ�ლური ს�მუშ�� დ�ფ�"
+msgstr "ვირტუ�ლური ს�მუშ�� მ�გიდები"
diff --git a/translations/desktop_files/applnk-compat/nl.po b/translations/desktop_files/applnk-compat/nl.po
index d2f9aa819..0f39b41d5 100644
--- a/translations/desktop_files/applnk-compat/nl.po
+++ b/translations/desktop_files/applnk-compat/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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-01-10 22:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/applnk-compat/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
 msgid "Laptop"
-msgstr ""
+msgstr "Laptop"
 
 #. Name
 #: email.desktop:10
@@ -29,7 +30,7 @@ msgstr "E-mail"
 #. Comment
 #: email.desktop:11
 msgid "Configure your identity, email addresses, mail servers, etc."
-msgstr "Voer uw identiteit, e-mailadressen, e-mailservers, enz. in"
+msgstr "Stel uw identiteit, e-mailadressen, e-mailservers, enz. in"
 
 #. Keywords
 #: email.desktop:13
@@ -52,12 +53,12 @@ msgstr "Bestandsbeheerder"
 #. Name
 #: kcmkxmlrpcd.desktop:2
 msgid "XML RPC Daemon"
-msgstr ""
+msgstr "Xml-rpc-achtergronddienst"
 
 #. Name
 #: konqhtml.desktop:2
 msgid "Konqueror Browser"
-msgstr "Konquerorbrowser"
+msgstr "Konqueror (webbrowser)"
 
 #. Name
 #: passwords.desktop:11
@@ -67,7 +68,7 @@ msgstr "Wachtwoorden"
 #. Comment
 #: passwords.desktop:13
 msgid "Configure password settings"
-msgstr "Hier kunt u de wachtwoordinstellingen instellen"
+msgstr "Stel de wachtwoordinstellingen in"
 
 #. Keywords
 #: passwords.desktop:15
@@ -78,7 +79,7 @@ msgstr ""
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
@@ -101,4 +102,4 @@ msgstr ""
 #. Name
 #: virtualdesktops.desktop:2
 msgid "Virtual Desktops"
-msgstr "Virtuele bureaubladen"
+msgstr "Virtuele werkbladen"
diff --git a/translations/desktop_files/applnk-compat/ru.po b/translations/desktop_files/applnk-compat/ru.po
index bc457de7c..bd71f2d99 100644
--- a/translations/desktop_files/applnk-compat/ru.po
+++ b/translations/desktop_files/applnk-compat/ru.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2021.
+# Alexander Golubev <fatzer2@gmail.com>, 2021, 2024.
 # Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: 2023-06-04 15:15+0000\n"
-"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/applnk-compat/ru/>\n"
 "Language: ru\n"
diff --git a/translations/desktop_files/applnk-directories/es_AR.po b/translations/desktop_files/applnk-directories/es_AR.po
new file mode 100644
index 000000000..e42d4ed7c
--- /dev/null
+++ b/translations/desktop_files/applnk-directories/es_AR.po
@@ -0,0 +1,310 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2025-05-20 12:16+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/applnk-directories/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
+
+#. Name
+#: .directory:2
+msgid "Default"
+msgstr "Por omisión"
+
+#. Name
+#: hidden.directory:4
+msgid "Internal Services"
+msgstr "Servicios internos"
+
+#. Name
+#: kde-development-webdevelopment.directory:4
+#: tde-development-webdevelopment.directory:4
+msgid "Web Development"
+msgstr "Desarrollo web"
+
+#. Name
+#: kde-development.directory:4 kde-games.directory:4 kde-graphics.directory:4
+#: kde-internet.directory:4 kde-multimedia.directory:4 kde-office.directory:4
+#: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
+#: kde-utilities.directory:4
+msgid "KDE"
+msgstr "KDE"
+
+#. Name
+#: kde-editors.directory:4 tde-editors.directory:4
+msgid "Editors"
+msgstr "Editores"
+
+#. Name
+#: kde-edu-languages.directory:4
+msgid "Languages"
+msgstr "Idiomas"
+
+#. Name
+#: kde-edu-mathematics.directory:4
+msgid "Mathematics"
+msgstr "Matematicas"
+
+#. Name
+#: kde-edu-miscellaneous.directory:4
+msgid "Miscellaneous"
+msgstr "Miscelaneo"
+
+#. Name
+#: kde-edu-science.directory:4 tde-science.directory:5
+msgid "Science"
+msgstr "Ciencia"
+
+#. Name
+#: kde-games-arcade.directory:4 tde-games-arcade.directory:4
+msgid "Arcade"
+msgstr "Arcade"
+
+#. Name
+#: kde-games-board.directory:4 tde-games-board.directory:4
+msgid "Board Games"
+msgstr "Juegos de mesa"
+
+#. Name
+#: kde-games-card.directory:4 tde-games-card.directory:4
+msgid "Card Games"
+msgstr "Juegos de cartas"
+
+#. Name
+#: kde-games-kids.directory:4 tde-games-kids.directory:4
+msgid "Games for Kids"
+msgstr "Juegos para chicos"
+
+#. Name
+#: kde-games-strategy.directory:4 tde-games-strategy.directory:4
+msgid "Tactics & Strategy"
+msgstr "Táctica y estrategia"
+
+#. Name
+#: kde-toys.directory:4 tde-toys.directory:4
+msgid "Toys"
+msgstr "Ocio"
+
+#. Name
+#. Comment
+#: kde-utilities-accessibility.directory:4
+#: tde-utilities-accessibility.directory:4
+#: tde-utilities-accessibility.directory:6
+msgid "Accessibility"
+msgstr "Accesibilidad"
+
+#. Name
+#. Comment
+#: kde-utilities-desktop.directory:4 tde-settings-desktop.directory:4
+#: tde-utilities-desktop.directory:4 tde-utilities-desktop.directory:6
+msgid "Desktop"
+msgstr "Escritorio"
+
+#. Name
+#. Comment
+#: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
+#: tde-utilities-pim.directory:6
+msgid "PIM"
+msgstr "PIM"
+
+#. Name
+#: tde-development-translation.directory:4
+msgid "Translation"
+msgstr "Traducción"
+
+#. Name
+#: tde-development.directory:4
+msgid "Development"
+msgstr "Desarrollo"
+
+#. Name
+#: tde-edutainment.directory:4
+msgid "Edutainment"
+msgstr "Entretenimientos educativos"
+
+#. Name
+#: tde-games-logic.directory:4
+msgid "Logic Games"
+msgstr "Juegos de lógica"
+
+#. Name
+#: tde-games-roguelikes.directory:4
+msgid "Rogue-like Games"
+msgstr "Juegos tipo Rogue"
+
+#. Name
+#: tde-games.directory:4
+msgid "Games"
+msgstr "Juegos"
+
+#. Name
+#: tde-graphics.directory:4
+msgid "Graphics"
+msgstr "Gráficos"
+
+#. Name
+#: tde-internet-terminal.directory:4 tde-system-terminal.directory:4
+msgid "Terminal Applications"
+msgstr "Aplicaciones de terminal"
+
+#. Name
+#: tde-internet.directory:4
+msgid "Internet"
+msgstr "Internet"
+
+#. Name
+#: tde-main.directory:5
+msgid "TDE Menu"
+msgstr "Menú de TDE"
+
+#. Name
+#: tde-more.directory:5
+msgid "More Applications"
+msgstr "Más programas"
+
+#. Name
+#: tde-multimedia.directory:4
+msgid "Multimedia"
+msgstr "Multimedia"
+
+#. Name
+#. Comment
+#: tde-office-pim.directory:4 tde-office-pim.directory:6
+msgid "Personal Information Management"
+msgstr "Gestión de información personal"
+
+#. Name
+#: tde-office.directory:4
+msgid "Office"
+msgstr "Oficina"
+
+#. Name
+#: tde-settings-accessibility.directory:4
+msgid "Regional & Accessibility"
+msgstr "Regional y accesibilidad"
+
+#. Name
+#: tde-settings-components.directory:4
+msgid "TDE Components"
+msgstr "Componentes de TDE"
+
+#. Name
+#: tde-settings-hardware.directory:4
+msgid "Hardware"
+msgstr "Hardware"
+
+#. Name
+#: tde-settings-information.directory:4
+msgid "Device Informations"
+msgstr "Información del dispositivo"
+
+#. Name
+#: tde-settings-looknfeel.directory:4
+msgid "Appearance & Themes"
+msgstr "Aspecto y temas"
+
+#. Name
+#: tde-settings-network.directory:4
+msgid "Internet & Network"
+msgstr "Internet y Red"
+
+#. Name
+#. Comment
+#: tde-settings-peripherals.directory:4 tde-utilities-peripherals.directory:4
+#: tde-utilities-peripherals.directory:6
+msgid "Peripherals"
+msgstr "Periféricos"
+
+#. Name
+#: tde-settings-power.directory:4
+msgid "Power Control"
+msgstr "Control de energía"
+
+#. Name
+#: tde-settings-security.directory:4
+msgid "Security & Privacy"
+msgstr "Seguridad y privacidad"
+
+#. Name
+#: tde-settings-sound.directory:4
+msgid "Sound & Multimedia"
+msgstr "Sonidos y multimedia"
+
+#. Name
+#: tde-settings-system.directory:4
+msgid "System Administration"
+msgstr "Administración y sistema"
+
+#. Name
+#: tde-settings-webbrowsing.directory:4
+msgid "Web Browser"
+msgstr "Navegador Web"
+
+#. Name
+#: tde-settings.directory:4
+msgid "Settings-Modules"
+msgstr "Módulos de preferencias"
+
+#. Name
+#: tde-settingsmenu.directory:4
+msgid "Settings"
+msgstr "Configuración"
+
+#. Name
+#: tde-system-screensavers.directory:4
+msgid "Screen Savers"
+msgstr "Protectores de pantalla"
+
+#. Comment
+#: tde-system-screensavers.directory:8
+msgid "Screen saver demos"
+msgstr "Demostraciones del protector de pantalla"
+
+#. Name
+#: tde-system-su.directory:5
+msgid "SuperUser"
+msgstr "Administrador (SuperUser)"
+
+#. Name
+#: tde-system.directory:4
+msgid "System"
+msgstr "Sistema"
+
+#. Name
+#: tde-unknown.directory:4
+msgid "Lost & Found"
+msgstr "Objetos perdidos"
+
+#. Name
+#. Comment
+#: tde-utilities-file.directory:4 tde-utilities-file.directory:6
+msgid "File"
+msgstr "Archivo"
+
+#. Name
+#: tde-utilities-xutils.directory:4
+msgid "X-Utilities"
+msgstr "Utilidades-X"
+
+#. Comment
+#: tde-utilities-xutils.directory:6
+msgid "X Window Utilities"
+msgstr "Utilidades X Window"
+
+#. Name
+#. Comment
+#: tde-utilities.directory:4 tde-utilities.directory:6
+msgid "Utilities"
+msgstr "Utilidades"
diff --git a/translations/desktop_files/applnk-directories/ka.po b/translations/desktop_files/applnk-directories/ka.po
index 924ec059a..51ccf755a 100644
--- a/translations/desktop_files/applnk-directories/ka.po
+++ b/translations/desktop_files/applnk-directories/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: .directory:2
@@ -38,27 +39,27 @@ msgstr "ვებ პრ�გრ�მირებ�"
 #: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
 #: kde-utilities.directory:4
 msgid "KDE"
-msgstr ""
+msgstr "KDE"
 
 #. Name
 #: kde-editors.directory:4 tde-editors.directory:4
 msgid "Editors"
-msgstr "რედ�ქტ�რი"
+msgstr "რედ�ქტ�რები"
 
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "ენები"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "მ�თემ�ტიკ�"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "სხვ�დ�სხვ�"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -68,12 +69,12 @@ msgstr "მეცნიერებ�"
 #. Name
 #: kde-games-arcade.directory:4 tde-games-arcade.directory:4
 msgid "Arcade"
-msgstr ""
+msgstr "�რკ�დ�"
 
 #. Name
 #: kde-games-board.directory:4 tde-games-board.directory:4
 msgid "Board Games"
-msgstr "მ�გიდის თ�მ�შები"
+msgstr "ს�მ�გიდ� თ�მ�შები"
 
 #. Name
 #: kde-games-card.directory:4 tde-games-card.directory:4
@@ -101,21 +102,21 @@ msgstr "ს�თ�მ�შ�ები"
 #: tde-utilities-accessibility.directory:4
 #: tde-utilities-accessibility.directory:6
 msgid "Accessibility"
-msgstr "სპეცი�ლური შეს�ძლბლ�ბები"
+msgstr "წვდ�მ�დ�ბ�"
 
 #. Name
 #. Comment
 #: kde-utilities-desktop.directory:4 tde-settings-desktop.directory:4
 #: tde-utilities-desktop.directory:4 tde-utilities-desktop.directory:6
 msgid "Desktop"
-msgstr "ს�მუშ�� დ�ფ�"
+msgstr "ს�მუშ�� მ�გიდ�"
 
 #. Name
 #. Comment
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "პერს. ინფ�რმ�ციის მმ�რთველი"
 
 #. Name
 #: tde-development-translation.directory:4
@@ -125,7 +126,7 @@ msgstr "თ�რგმნ�"
 #. Name
 #: tde-development.directory:4
 msgid "Development"
-msgstr "გ�ნვით�რებ�"
+msgstr "პრ�გრ�მირებ�"
 
 #. Name
 #: tde-edutainment.directory:4
@@ -134,9 +135,8 @@ msgstr "ს�სწ�ვლ�"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Rogue ტიპის თ�მ�შები"
+msgstr "ლ�გიკური თ�მ�შები"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -166,12 +166,12 @@ msgstr "ინტერნეტი"
 #. Name
 #: tde-main.directory:5
 msgid "TDE Menu"
-msgstr "TDE მენიუ"
+msgstr "TDE-ის მენიუ"
 
 #. Name
 #: tde-more.directory:5
 msgid "More Applications"
-msgstr "დ�მ�ტებითი პრ�გრ�მები"
+msgstr "მეტი პრ�გრ�მ�"
 
 #. Name
 #: tde-multimedia.directory:4
@@ -182,7 +182,7 @@ msgstr "მულტიმედი�"
 #. Comment
 #: tde-office-pim.directory:4 tde-office-pim.directory:6
 msgid "Personal Information Management"
-msgstr ""
+msgstr "პირ�დი ინფ�რმ�ციის მ�რთვ�"
 
 #. Name
 #: tde-office.directory:4
@@ -192,22 +192,22 @@ msgstr "�ფისი"
 #. Name
 #: tde-settings-accessibility.directory:4
 msgid "Regional & Accessibility"
-msgstr "რეგი�ნ�ლური დ� სეპცი�ლური შეს�ძლებლ�ბები"
+msgstr "რეგი�ნ�ლური დ� წვდ�მ�დ�ბ�"
 
 #. Name
 #: tde-settings-components.directory:4
 msgid "TDE Components"
-msgstr "TDE კ�მპ�ნენტები"
+msgstr "TDE-ის კ�მპ�ნენტები"
 
 #. Name
 #: tde-settings-hardware.directory:4
 msgid "Hardware"
-msgstr "მ�წყ�ბილ�ბები"
+msgstr "�პ�რ�ტურ�"
 
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "მ�წყ�ბილ�ბის ინფ�რმ�ცი�"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -224,7 +224,7 @@ msgstr "ქსელი დ� ინტერნეტი"
 #: tde-settings-peripherals.directory:4 tde-utilities-peripherals.directory:4
 #: tde-utilities-peripherals.directory:6
 msgid "Peripherals"
-msgstr "პერიფერიული"
+msgstr "პერიფერი�"
 
 #. Name
 #: tde-settings-power.directory:4
@@ -234,17 +234,17 @@ msgstr "კვების კ�ნტრ�ლი"
 #. Name
 #: tde-settings-security.directory:4
 msgid "Security & Privacy"
-msgstr "დ�ცვ� დ� კ�ნფიდენცი�ლურ�ბ�"
+msgstr "დ�ცვ� დ� კ�ნფიდენცი�ლ�ბ�"
 
 #. Name
 #: tde-settings-sound.directory:4
 msgid "Sound & Multimedia"
-msgstr "ხმ� დ� მეულტიმედი�"
+msgstr "ხმ� დ� მულტიმედი�"
 
 #. Name
 #: tde-settings-system.directory:4
 msgid "System Administration"
-msgstr "სისტემის �დმინისტრირებ�"
+msgstr "სისტემის �დმინისტრ�ცი�"
 
 #. Name
 #: tde-settings-webbrowsing.directory:4
@@ -259,22 +259,22 @@ msgstr "მ�დულები"
 #. Name
 #: tde-settingsmenu.directory:4
 msgid "Settings"
-msgstr "პ�რ�მეტრები"
+msgstr "მ�რგებ�"
 
 #. Name
 #: tde-system-screensavers.directory:4
 msgid "Screen Savers"
-msgstr ""
+msgstr "ეკრ�ნის დ�მცველები"
 
 #. Comment
 #: tde-system-screensavers.directory:8
 msgid "Screen saver demos"
-msgstr ""
+msgstr "ეკრ�ნის დ�მცველის მინი�ტურები"
 
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "ზემ�მხმ�რებელი"
 
 #. Name
 #: tde-system.directory:4
@@ -284,7 +284,7 @@ msgstr "სისტემ�"
 #. Name
 #: tde-unknown.directory:4
 msgid "Lost & Found"
-msgstr ""
+msgstr "დ�კ�რგული დ� ნ�პ�ვნი"
 
 #. Name
 #. Comment
@@ -300,10 +300,10 @@ msgstr "X-ხელს�წყ�ები"
 #. Comment
 #: tde-utilities-xutils.directory:6
 msgid "X Window Utilities"
-msgstr "X Window–ს ხელს�წყ�ები"
+msgstr "X Window–ის ხელს�წყ�ები"
 
 #. Name
 #. Comment
 #: tde-utilities.directory:4 tde-utilities.directory:6
 msgid "Utilities"
-msgstr "ხელს�წყ�ები"
+msgstr "პრ�გრ�მები"
diff --git a/translations/desktop_files/applnk-directories/nl.po b/translations/desktop_files/applnk-directories/nl.po
index 1790136d6..cecb9ec2c 100644
--- a/translations/desktop_files/applnk-directories/nl.po
+++ b/translations/desktop_files/applnk-directories/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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-01-10 22:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/applnk-directories/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: .directory:2
@@ -38,27 +39,27 @@ msgstr "Webontwikkeling"
 #: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
 #: kde-utilities.directory:4
 msgid "KDE"
-msgstr ""
+msgstr "TDE"
 
 #. Name
 #: kde-editors.directory:4 tde-editors.directory:4
 msgid "Editors"
-msgstr ""
+msgstr "Bewerkers"
 
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Talen"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Wiskunde"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversen"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -68,7 +69,7 @@ msgstr "Wetenschap"
 #. Name
 #: kde-games-arcade.directory:4 tde-games-arcade.directory:4
 msgid "Arcade"
-msgstr ""
+msgstr "Arcade"
 
 #. Name
 #: kde-games-board.directory:4 tde-games-board.directory:4
@@ -83,12 +84,12 @@ msgstr "Kaartspellen"
 #. Name
 #: kde-games-kids.directory:4 tde-games-kids.directory:4
 msgid "Games for Kids"
-msgstr "spelletjes voor kinderen"
+msgstr "Spelletjes voor kinderen"
 
 #. Name
 #: kde-games-strategy.directory:4 tde-games-strategy.directory:4
 msgid "Tactics & Strategy"
-msgstr "Tactiek en Strategie"
+msgstr "Tactiek en strategie"
 
 #. Name
 #: kde-toys.directory:4 tde-toys.directory:4
@@ -115,7 +116,7 @@ msgstr "Bureaublad"
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr "Persoonlijke Informatie Management"
+msgstr "Persoonlijk informatiebeheer"
 
 #. Name
 #: tde-development-translation.directory:4
@@ -134,9 +135,8 @@ msgstr "Educatief"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Rogue-achtige spellen"
+msgstr "Logische spellen"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -146,7 +146,7 @@ msgstr "Rogue-achtige spellen"
 #. Name
 #: tde-games.directory:4
 msgid "Games"
-msgstr "Amusement"
+msgstr "Games"
 
 #. Name
 #: tde-graphics.directory:4
@@ -156,13 +156,12 @@ msgstr "Grafisch"
 #. Name
 #: tde-internet-terminal.directory:4 tde-system-terminal.directory:4
 msgid "Terminal Applications"
-msgstr "Terminal-toepassingen"
+msgstr "Terminalprogramma's"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
-msgstr "Internet en netwerk"
+msgstr "Internet"
 
 #. Name
 #: tde-main.directory:5
@@ -176,20 +175,19 @@ msgstr "Meer programma's"
 
 #. Name
 #: tde-multimedia.directory:4
-#, fuzzy
 msgid "Multimedia"
-msgstr "Geluid en multimedia"
+msgstr "Multimedia"
 
 #. Name
 #. Comment
 #: tde-office-pim.directory:4 tde-office-pim.directory:6
 msgid "Personal Information Management"
-msgstr "Persoonlijke Informatie Management"
+msgstr "Persoonlijk informatiebeheer"
 
 #. Name
 #: tde-office.directory:4
 msgid "Office"
-msgstr "Kantoortoepassingen"
+msgstr "Kantoor"
 
 #. Name
 #: tde-settings-accessibility.directory:4
@@ -199,17 +197,17 @@ msgstr "Regio en toegankelijkheid"
 #. Name
 #: tde-settings-components.directory:4
 msgid "TDE Components"
-msgstr "TDE-componenten"
+msgstr "TDE-onderdelen"
 
 #. Name
 #: tde-settings-hardware.directory:4
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "Apparaatinformatie"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -256,7 +254,7 @@ msgstr "Webbrowser"
 #. Name
 #: tde-settings.directory:4
 msgid "Settings-Modules"
-msgstr "Configuratiemodules"
+msgstr "Instellingsmodules"
 
 #. Name
 #: tde-settingsmenu.directory:4
@@ -276,7 +274,7 @@ msgstr "Schermbeveiligingdemo's"
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "SuperUser"
 
 #. Name
 #: tde-system.directory:4
diff --git a/translations/desktop_files/applnk-directories/ru.po b/translations/desktop_files/applnk-directories/ru.po
index f1735c604..0ea88b2f1 100644
--- a/translations/desktop_files/applnk-directories/ru.po
+++ b/translations/desktop_files/applnk-directories/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: 2023-12-07 21:14+0000\n"
+"PO-Revision-Date: 2024-04-30 23:00+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/applnk-directories/ru/>\n"
@@ -193,7 +193,7 @@ msgstr "Офи�"
 #. Name
 #: tde-settings-accessibility.directory:4
 msgid "Regional & Accessibility"
-msgstr "Региональные и �пециальные возможно�ти"
+msgstr "Региональные и �пец. возможно�ти"
 
 #. Name
 #: tde-settings-components.directory:4
diff --git a/translations/desktop_files/applnk-directories/sv.po b/translations/desktop_files/applnk-directories/sv.po
index 584bb4449..5180d563e 100644
--- a/translations/desktop_files/applnk-directories/sv.po
+++ b/translations/desktop_files/applnk-directories/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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-06-09 03:01+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: .directory:2
@@ -38,27 +39,27 @@ msgstr "Webbutveckling"
 #: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
 #: kde-utilities.directory:4
 msgid "KDE"
-msgstr ""
+msgstr "KDE"
 
 #. Name
 #: kde-editors.directory:4 tde-editors.directory:4
 msgid "Editors"
-msgstr "Editorer"
+msgstr "Redigerare"
 
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Språk"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematik"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Övrigt"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -134,9 +135,8 @@ msgstr "Utbildning"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Spel som liknar Rogue"
+msgstr "Logikspel"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -160,9 +160,8 @@ msgstr "Terminalprogram"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
-msgstr "Internet och nätverk"
+msgstr "Internet"
 
 #. Name
 #: tde-main.directory:5
@@ -176,9 +175,8 @@ msgstr "Fler program"
 
 #. Name
 #: tde-multimedia.directory:4
-#, fuzzy
 msgid "Multimedia"
-msgstr "Ljud och multimedia"
+msgstr "Multimedia"
 
 #. Name
 #. Comment
@@ -209,7 +207,7 @@ msgstr "HÃ¥rdvara"
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "Enhetsinformation"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -276,12 +274,12 @@ msgstr "Demonstration av skärmsläckare"
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "Superanvändare"
 
 #. Name
 #: tde-system.directory:4
 msgid "System"
-msgstr ""
+msgstr "System"
 
 #. Name
 #: tde-unknown.directory:4
diff --git a/translations/desktop_files/applnk-directories/zh_CN.po b/translations/desktop_files/applnk-directories/zh_CN.po
index 521081cdb..0b2d972f6 100644
--- a/translations/desktop_files/applnk-directories/zh_CN.po
+++ b/translations/desktop_files/applnk-directories/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# G-Src <diceea@foxmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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: 2024-06-03 20:24+0000\n"
+"Last-Translator: G-Src <diceea@foxmail.com>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/applnk-directories/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.17\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +39,7 @@ msgstr "Web 开�"
 #: kde-science.directory:5 kde-settingsmenu.directory:4 kde-system.directory:4
 #: kde-utilities.directory:4
 msgid "KDE"
-msgstr ""
+msgstr "KDE"
 
 #. Name
 #: kde-editors.directory:4 tde-editors.directory:4
@@ -48,17 +49,17 @@ msgstr "编辑器"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "语言"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "æ•°å­¦"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "�项"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -134,9 +135,8 @@ msgstr "寓教于�"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "�作剧游�"
+msgstr "逻辑游�"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -160,7 +160,6 @@ msgstr "终端应用程�"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
 msgstr "Internet 和网络"
 
@@ -208,7 +207,7 @@ msgstr "硬件"
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "设备信�"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -275,7 +274,7 @@ msgstr "�幕�护程�演示"
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "超级用户"
 
 #. Name
 #: tde-system.directory:4
diff --git a/translations/desktop_files/drkonqi-presets/es_AR.po b/translations/desktop_files/drkonqi-presets/es_AR.po
new file mode 100644
index 000000000..1f5739477
--- /dev/null
+++ b/translations/desktop_files/drkonqi-presets/es_AR.po
@@ -0,0 +1,182 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 03:59+0200\n"
+"PO-Revision-Date: 2024-11-19 14:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/drkonqi-presets/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: developerrc:2
+#, fuzzy
+msgid "Developer"
+msgstr "Desarrollador"
+
+#. Comment
+#: developerrc:3
+#, fuzzy
+msgid "Settings preferred for developers"
+msgstr "Preferencias preferidas por los desarrolladores"
+
+#. Name
+#: developerrc:13
+#, c-format
+msgid ""
+"The application %progname (%appname), pid %pid, crashed and caused the "
+"signal %signum (%signame)."
+msgstr ""
+"El programa %progname (%appname), con número de proceso %pid,  falló y "
+"provocó la señal %signum (%signame)."
+
+#. Name
+#: developerrc:17
+msgid "You might want to fix your program. Take a look at the backtrace tab."
+msgstr "Quizás quieras reparar tu programa. Observá la solapa 'Traza inversa'."
+
+#. Name
+#: developerrc:20 enduserrc:20
+#, fuzzy
+msgid "SIGILL"
+msgstr "SIGILL"
+
+#. Comment
+#: developerrc:21
+#, fuzzy
+msgid "Illegal instruction."
+msgstr "Instrucción ilegal."
+
+#. Name
+#: developerrc:24 enduserrc:24
+#, fuzzy
+msgid "SIGABRT"
+msgstr "SIGABRT"
+
+#. Comment
+#: developerrc:25
+#, fuzzy
+msgid "Aborted."
+msgstr "Cancelado."
+
+#. Name
+#: developerrc:28 enduserrc:28
+#, fuzzy
+msgid "SIGFPE"
+msgstr "SIGFPE"
+
+#. Comment
+#: developerrc:29
+#, fuzzy
+msgid "Floating point exception."
+msgstr "Excepción de coma flotante."
+
+#. Name
+#: developerrc:32 enduserrc:32
+#, fuzzy
+msgid "SIGSEGV"
+msgstr "SIGSEGV"
+
+#. Comment
+#: developerrc:33
+#, fuzzy
+msgid "Invalid memory reference."
+msgstr "Referencia a memoria inválida."
+
+#. Name
+#: developerrc:36 enduserrc:36
+#, fuzzy
+msgid "Unknown"
+msgstr "Desconocido"
+
+#. Comment
+#: developerrc:37
+#, fuzzy
+msgid "This signal is unknown."
+msgstr "Señal desconocida."
+
+#. Name
+#: enduserrc:2
+#, fuzzy
+msgid "End user"
+msgstr "Usuario final"
+
+#. Comment
+#: enduserrc:3
+#, fuzzy
+msgid "Settings preferred for end users"
+msgstr "Preferencias preferidas por los usuarios finales"
+
+#. Name
+#: enduserrc:13
+#, c-format
+msgid ""
+"The application %progname (%appname) crashed and caused the signal %signum "
+"(%signame)."
+msgstr ""
+"El programa %progname (%appname) falló y provocó la señal %signum (%signame)."
+
+#. Name
+#: enduserrc:17
+msgid ""
+"You might want to send a bug report for this application. Check if it is "
+"listed on http://bugs.trinitydesktop.org, otherwise mail the author. Please "
+"include as much information as possible, maybe the original documents. If "
+"you have a way to reproduce the error, include this also."
+msgstr ""
+"Puede que quieras enviar un informe de fallos de éste programa. Por favor, "
+"comprobá si aparece en http://bugs.trinitydesktop.org, si no, enviá un "
+"mensaje al autor. Por favor, incluí tanta información como puedas, tal vez "
+"incluso los documentos originales. Si hay una forma de reproducir el error, "
+"incluila también."
+
+#. Comment
+#: enduserrc:21
+msgid ""
+"An application mostly receives the SIGILL signal due to a bug in the "
+"application. The application was asked to save its documents."
+msgstr ""
+"Generalmente un programa recibe la señal SIGILL debido a un fallo en el "
+"programa. Se ha pedido al programa que guarde tus documentos."
+
+#. Comment
+#: enduserrc:25
+msgid ""
+"An application terminates with a SIGABRT signal when it detects an internal "
+"inconsistency caused by a bug in the program."
+msgstr ""
+"Un programa finaliza con la señal SIGABRT cuando detecta una inconsistencia "
+"interna debida a un fallo en la programación."
+
+#. Comment
+#: enduserrc:29
+msgid ""
+"An application mostly receives the SIGFPE signal due to a bug in the "
+"application. The application was asked to save its documents."
+msgstr ""
+"Generalmente un programa recibe la señal SIGFPE debido a un fallo en el "
+"programa. Se ha pedido al programa que guarde tus documentos."
+
+#. Comment
+#: enduserrc:33
+msgid ""
+"An application mostly receives the SIGSEGV signal due to a bug in the "
+"application. The application was asked to save its documents."
+msgstr ""
+"Generalmente un prgorama recibe la señal SIGSEGV debido a un fallo en el "
+"programa. Se ha pedido al programa que guarde tus documentos."
+
+#. Comment
+#: enduserrc:37
+msgid "Sorry, I do not know this signal."
+msgstr "Lo sentimos, se desconoce esta señal."
diff --git a/translations/desktop_files/drkonqi-presets/ka.po b/translations/desktop_files/drkonqi-presets/ka.po
index 5309edc57..ba72b49e2 100644
--- a/translations/desktop_files/drkonqi-presets/ka.po
+++ b/translations/desktop_files/drkonqi-presets/ka.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 03:59+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: developerrc:2
 msgid "Developer"
-msgstr "შემმუშ�ვებელი"
+msgstr "პრ�გრ�მისტი"
 
 #. Comment
 #: developerrc:3
 msgid "Settings preferred for developers"
-msgstr "პ�რ�მეტრები გ�ნმვით�რებელთ�თვის"
+msgstr "პ�რ�მეტრები პრ�გრ�მისტებისთვის"
 
 #. Name
 #: developerrc:13
@@ -33,29 +34,29 @@ msgid ""
 "The application %progname (%appname), pid %pid, crashed and caused the "
 "signal %signum (%signame)."
 msgstr ""
-"პრ�გრ�მ�ს %progname (%appname) pid %pid....,დ� გ�მ�იწვი� შემდეგი სიგნ�ლი "
-"%signum (%signame)."
+"პრ�გრ�მ�ს %progname (%appname) pid %pid �ვ�რიულ�დ დ�სრულდ� დ� გ�მ�იწვი� "
+"შემდეგი სიგნ�ლი %signum (%signame)."
 
 #. Name
 #: developerrc:17
 msgid "You might want to fix your program. Take a look at the backtrace tab."
 msgstr ""
-"თქვენ �ლბ�თ გნებ�ვტ თქვენი პრ�გრ�მის შეკეთებ�.დ�ხედეთ  backtrace–ის დ�ფ�ს."
+"თქვენ �ლბ�თ გნებ�ვთ თქვენი პრ�გრ�მის შეკეთებ�. შეხედეთ უკუტრეისის ჩ�ნ�რთს."
 
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
 msgid "Illegal instruction."
-msgstr "�რ�სწ�რი ინსტრუქცი�."
+msgstr "დ�უშვებელი ინსტრუქცი�."
 
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -65,22 +66,22 @@ msgstr "შეწყვეტილი�."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
 msgid "Floating point exception."
-msgstr ""
+msgstr "მცურ�ვმძიმი�ნი �პერ�ციის გ�მ�ნ�კლისი."
 
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
 msgid "Invalid memory reference."
-msgstr "წვდ�მ� მეხსიერების �კრძ�ლულ ნ�წილში."
+msgstr "�რ�სწ�რი მეხსიერების მიმ�რთვ�."
 
 #. Name
 #: developerrc:36 enduserrc:36
@@ -90,7 +91,7 @@ msgstr "უცნ�ბი"
 #. Comment
 #: developerrc:37
 msgid "This signal is unknown."
-msgstr "უცნ�ბი სიგნ�ლი"
+msgstr "ეს უცნ�ბი სიგნ�ლი�."
 
 #. Name
 #: enduserrc:2
@@ -100,7 +101,7 @@ msgstr "ს�ბ�ლ�� მ�მხმ�რებელი"
 #. Comment
 #: enduserrc:3
 msgid "Settings preferred for end users"
-msgstr "პ�რ�მეტრები, ს�ბ�ლ� მ�მხმ�რებლის�თვის"
+msgstr "პ�რ�მეტრები ს�ბ�ლ� მ�მხმ�რებლის�თვის"
 
 #. Name
 #: enduserrc:13
@@ -109,7 +110,7 @@ msgid ""
 "The application %progname (%appname) crashed and caused the signal %signum "
 "(%signame)."
 msgstr ""
-"პრ�გრ�მ� %progname (%appname) მ�ხდ� ფ�ტ�ლური შეცდ�მ�, რ�მელმ�ც გ�მ�იწვი� "
+"პრ�გრ�მ�ში %progname (%appname) მ�ხდ� ფ�ტ�ლური შეცდ�მ�, რ�მელმ�ც გ�მ�იწვი� "
 "სიგნ�ლი %signum (%signame)."
 
 #. Name
@@ -133,7 +134,7 @@ msgid ""
 "application. The application was asked to save its documents."
 msgstr ""
 "პრ�გრ�მ� იღებს SIGILL სიგნ�ლს პრ�გრ�მ�ში �რსებული შეცდ�მის გ�მ�. ყველ� "
-"დ�კუმენტი შენ�ხული იქნებ�"
+"დ�კუმენტი შენ�ხული იქნებ�."
 
 #. Comment
 #: enduserrc:25
@@ -142,7 +143,7 @@ msgid ""
 "inconsistency caused by a bug in the program."
 msgstr ""
 "პრ�გრ�მ� შეწყდ� SIGABRT სიგნ�ლით, რ�დეს�ც მ�ნ შე�მჩნი� შიდ� �რ�მდგრ�დ�ბ� "
-"რ�მელიც პრ�გრ�მის ბზიკმ� გ�მ�იწვი�."
+"რ�მელიც პრ�გრ�მის შეცდ�მ�მ გ�მ�იწვი�."
 
 #. Comment
 #: enduserrc:29
@@ -151,7 +152,7 @@ msgid ""
 "application. The application was asked to save its documents."
 msgstr ""
 "პრ�გრ�მ� იღებს SIGFPE სიგნ�ლს პრ�გრ�მ�ში �რსებული შეცდ�მის გ�მ�. ყველ� "
-"დ�კუმენტი შენ�ხული იქნებ�"
+"დ�კუმენტი შენ�ხული იქნებ�."
 
 #. Comment
 #: enduserrc:33
@@ -159,10 +160,10 @@ msgid ""
 "An application mostly receives the SIGSEGV signal due to a bug in the "
 "application. The application was asked to save its documents."
 msgstr ""
-"პრ�გრ�მ� იღებს  SIGSEGV სიგნ�ლს პრ�გრ�მ�ში �რსებული შეცდ�მის გ�მ�. ყველ� "
-"დ�კუმენტი შენ�ხული იქნებ�"
+"პრ�გრ�მ� იღებს SIGSEGV სიგნ�ლს პრ�გრ�მ�ში �რსებული შეცდ�მის გ�მ�. ყველ� "
+"დ�კუმენტი შენ�ხული იქნებ�."
 
 #. Comment
 #: enduserrc:37
 msgid "Sorry, I do not know this signal."
-msgstr "ს�მწუხ�რ�დ �მ სიგნ�ლის შეს�ხებ �რ�ფერი� ცნ�ბილი"
+msgstr "ს�მწუხ�რ�დ �მ სიგნ�ლის შეს�ხებ �რ�ფერი� ცნ�ბილი."
diff --git a/translations/desktop_files/drkonqi-presets/nl.po b/translations/desktop_files/drkonqi-presets/nl.po
index fbe6f4574..476593aa1 100644
--- a/translations/desktop_files/drkonqi-presets/nl.po
+++ b/translations/desktop_files/drkonqi-presets/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 03:59+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-01-12 12:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/drkonqi-presets/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: developerrc:2
@@ -41,12 +42,13 @@ msgstr ""
 #: developerrc:17
 msgid "You might want to fix your program. Take a look at the backtrace tab."
 msgstr ""
-"U wilt vast uw programma herstellen. Kijk even onder de tab 'backtrace'."
+"U wilt vast uw programma herstellen. Kijk hiervoor op het tabblad "
+"‘backtrace’."
 
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -56,7 +58,7 @@ msgstr "Illegale instructie."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -66,17 +68,17 @@ msgstr "Geannuleerd."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
 msgid "Floating point exception."
-msgstr "Drijvende-komma-uitzondering."
+msgstr "Drijvende kommauitzondering."
 
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
@@ -121,11 +123,12 @@ msgid ""
 "include as much information as possible, maybe the original documents. If "
 "you have a way to reproduce the error, include this also."
 msgstr ""
-"U wilt misschien een bugrapport voor dit programma versturen. Controleer of "
-"de fout die u hebt gevonden al bekend is bij http://bugs.trinitydesktop.org. "
-"Zo neen, neem dan contact op met de auteur van het programma. Sluit zoveel "
-"mogelijk informatie toe, eventueel inclusief de originele documenten. Als u "
-"een manier weet waarop u de fout kunt reproduceren, sluit die dan ook in."
+"Zou u misschien een bugmelding voor dit programma willen versturen? "
+"Controleer of de fout die u heeft gevonden al bekend is op https://"
+"bugs.trinitydesktop.org. Zo niet, neem dan contact op met de maker van het "
+"programma. Sluit zoveel mogelijk informatie bij, eventueel inclusief de "
+"oorspronkelijke documenten. Als u weet waarop u de fout nogmaals kunt "
+"triggeren, voeg die dan ook toe."
 
 #. Comment
 #: enduserrc:21
@@ -142,7 +145,7 @@ msgid ""
 "An application terminates with a SIGABRT signal when it detects an internal "
 "inconsistency caused by a bug in the program."
 msgstr ""
-"Een programma eindigt met een SIGABRT-signaal wanneer het een interne "
+"Een programma eindigt met een SIGABRT-signaal als het een interne "
 "inconsistentie detecteert, veroorzaakt door een fout in het programma."
 
 #. Comment
diff --git a/translations/desktop_files/drkonqi-presets/ru.po b/translations/desktop_files/drkonqi-presets/ru.po
index 96af366d0..e4c87d38d 100644
--- a/translations/desktop_files/drkonqi-presets/ru.po
+++ b/translations/desktop_files/drkonqi-presets/ru.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 03:59+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: 2024-04-06 08:44+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: developerrc:2
@@ -33,7 +36,7 @@ msgid ""
 "The application %progname (%appname), pid %pid, crashed and caused the "
 "signal %signum (%signame)."
 msgstr ""
-"В приложении %progname (%appname) � id проце��а %pid произошёл фатальный "
+"В приложении %progname (%appname) � ИД проце��а %pid произошёл фатальный "
 "�бой, вызвавший �игнал %signum (%signame)."
 
 #. Name
@@ -44,7 +47,7 @@ msgstr "Возможно, вы захотите иÑ�править програÐ
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -54,7 +57,7 @@ msgstr "�едопу�тима� ин�трукци�."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -64,7 +67,7 @@ msgstr "Прервано."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -74,7 +77,7 @@ msgstr "ИÑ�ключительнаÑ� Ñ�итуациÑ� при вычиÑ�лениÐ
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
@@ -89,7 +92,7 @@ msgstr "�еизве�тный"
 #. Comment
 #: developerrc:37
 msgid "This signal is unknown."
-msgstr "�еизве�тный �игнал"
+msgstr "�еизве�тный �игнал."
 
 #. Name
 #: enduserrc:2
diff --git a/translations/desktop_files/drkonqi-presets/sv.po b/translations/desktop_files/drkonqi-presets/sv.po
index b0874bceb..53178756c 100644
--- a/translations/desktop_files/drkonqi-presets/sv.po
+++ b/translations/desktop_files/drkonqi-presets/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 03:59+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-06-09 03:01+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: developerrc:2
@@ -45,7 +46,7 @@ msgstr ""
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -55,7 +56,7 @@ msgstr "Ogiltig instruktion."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -65,7 +66,7 @@ msgstr "Misslyckades."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -75,7 +76,7 @@ msgstr "Flyttalsundantag."
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
diff --git a/translations/desktop_files/drkonqi-presets/zh_CN.po b/translations/desktop_files/drkonqi-presets/zh_CN.po
index c1416a6a7..f98b38f18 100644
--- a/translations/desktop_files/drkonqi-presets/zh_CN.po
+++ b/translations/desktop_files/drkonqi-presets/zh_CN.po
@@ -1,20 +1,21 @@
 # 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-06-19 03:59+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-12 05:21+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified Han script) <https://mirror.git."
+"trinitydesktop.org/weblate/projects/tdebase/drkonqi-presets/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
 #: developerrc:2
@@ -116,10 +117,10 @@ msgid ""
 "include as much information as possible, maybe the original documents. If "
 "you have a way to reproduce the error, include this also."
 msgstr ""
-"您�能想�为此程���错误报告。请检查该错误是�已�在 http://bugs."
-"trinitydesktop.org 列出�了。如果尚未列出�的�，就需��系作者。请尽�能�供"
-"详细的信�，比如当时程�使用的文档。如果您有办法�现错误，请�时�供这样的方"
-"法。"
+"您�能想给该程���错误报告。请先去看看该错误是�已�在 http://"
+"bugs.trinitydesktop.org �现了。如果没有的�，就得�系作者了。请您尽�能�供"
+"详细的信�，例如当时程�使用的文档。如果您有办法�现bug的�，请�时�供bug的"
+"�现方法。"
 
 #. Comment
 #: enduserrc:21
diff --git a/translations/desktop_files/kappfinder-data/el.po b/translations/desktop_files/kappfinder-data/el.po
index 318daa4de..1035db49c 100644
--- a/translations/desktop_files/kappfinder-data/el.po
+++ b/translations/desktop_files/kappfinder-data/el.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# "blu.256" <mavridisf@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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-04-24 12:44+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kappfinder-data/el/>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Development/Forte.desktop:2
 msgid "Forte"
-msgstr ""
+msgstr "Forte"
 
 #. GenericName
 #: Development/Forte.desktop:3
@@ -39,7 +40,7 @@ msgstr "Π�οβολέας εγγ�άφων"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -48,9 +49,8 @@ msgstr "Αποσφαλματωτής εμφάνισης δεδομένων"
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Σχεδιαστής διασυνδέσεων"
+msgstr "Σχεδιαστής Qt"
 
 #. GenericName
 #: Development/designer.desktop:3
@@ -59,9 +59,8 @@ msgstr "Σχεδιαστής διασυνδέσεων"
 
 #. Name
 #: Development/dlgedit.desktop:2
-#, fuzzy
 msgid "Qt DlgEdit"
-msgstr "Επεξε�γαστής διαλόγων"
+msgstr "Επεξε�γαστής διαλόγων Qt"
 
 #. GenericName
 #: Development/dlgedit.desktop:3
@@ -71,23 +70,22 @@ msgstr "Επεξε�γαστής διαλόγων"
 #. Name
 #: Development/eclipse.desktop:3
 msgid "Eclipse"
-msgstr ""
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
 msgid "Eclipse IDE"
-msgstr ""
+msgstr "Eclipse IDE"
 
 #. Name
 #: Development/fdesign.desktop:2
-#, fuzzy
 msgid "FormDesigner"
 msgstr "Σχεδιαστής διασυνδέσεων"
 
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -97,7 +95,7 @@ msgstr "J2ME σετ ε�γαλείων"
 #. Name
 #: Development/linguist.desktop:2
 msgid "Qt Linguist"
-msgstr ""
+msgstr "Μεταφ�αστής Qt"
 
 #. GenericName
 #: Development/linguist.desktop:3
@@ -107,7 +105,7 @@ msgstr "Ε�γαλείο μεταφ�άσεων"
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -117,7 +115,7 @@ msgstr "Π�οσομοιωτής Palm/Wireless"
 #. Name
 #: Development/sced.desktop:2
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
@@ -127,7 +125,7 @@ msgstr "Μοντελοποιητής σκηνών"
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
 msgid "ClanBomber"
-msgstr ""
+msgstr "ClanBomber"
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -143,7 +141,7 @@ msgstr "Παιχνίδι arcade"
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
 msgid "Frozen Bubble"
-msgstr ""
+msgstr "Frozen Bubble"
 
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
@@ -153,7 +151,7 @@ msgstr "Παιχνίδι πα�όμοιο με το Tetris"
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -163,27 +161,27 @@ msgstr "Παιχνίδι Nibbles του GNOME"
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
 msgid "Gnobots II"
-msgstr ""
+msgstr "Gnobots II"
 
 #. Name
 #: Games/Arcade/Mures.desktop:2
 msgid "Mures"
-msgstr ""
+msgstr "Mures"
 
 #. Name
 #: Games/Arcade/SuperMethaneBrothers.desktop:2
 msgid "Super Methane Brothers"
-msgstr ""
+msgstr "Σο�πε� Μεθαναδέφια"
 
 #. Name
 #: Games/Arcade/Trophy.desktop:2
 msgid "Trophy"
-msgstr ""
+msgstr "Β�αβείο"
 
 #. Name
 #: Games/Arcade/TuxRacer.desktop:2
 msgid "TuxRacer"
-msgstr ""
+msgstr "TuxRacer"
 
 #. GenericName
 #: Games/Arcade/TuxRacer.desktop:3
@@ -193,17 +191,17 @@ msgstr "Παιχνίδι αγώνων ταχ�τητας"
 #. Name
 #: Games/Arcade/XKobo.desktop:2
 msgid "XKobo"
-msgstr ""
+msgstr "XKobo"
 
 #. Name
 #: Games/Arcade/XSoldier.desktop:2
 msgid "XSoldier"
-msgstr ""
+msgstr "XSoldier"
 
 #. Name
 #: Games/Arcade/alephone-nogl.desktop:2
 msgid "Alephone"
-msgstr ""
+msgstr "Alephone"
 
 #. Comment
 #: Games/Arcade/alephone-nogl.desktop:3
@@ -226,12 +224,12 @@ msgstr ""
 #. Name
 #: Games/Arcade/battalion.desktop:2
 msgid "Batallion"
-msgstr ""
+msgstr "Στ�άτευμα"
 
 #. Name
 #: Games/Arcade/battleball.desktop:2
 msgid "Battleball"
-msgstr ""
+msgstr "Πολεμοσφαί�ιση"
 
 #. GenericName
 #: Games/Arcade/battleball.desktop:3
@@ -241,12 +239,12 @@ msgstr "Παιχνίδι με μπάλα"
 #. Name
 #: Games/Arcade/cxhextris.desktop:2
 msgid "cxhextris"
-msgstr ""
+msgstr "cxHextris"
 
 #. Name
 #: Games/Arcade/rocksndiamonds.desktop:2
 msgid "Rocks n Diamonds"
-msgstr ""
+msgstr "Πέτ�ες και Διαμάντια"
 
 #. GenericName
 #: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
@@ -256,12 +254,12 @@ msgstr "Παιχνίδι τακτικής"
 #. Name
 #: Games/Arcade/scavenger.desktop:2
 msgid "Scavenger"
-msgstr ""
+msgstr "Κυνηγός"
 
 #. Name
 #: Games/Board/Gataxx.desktop:2
 msgid "Gataxx"
-msgstr ""
+msgstr "Gataxx"
 
 #. Name
 #: Games/Board/Gchess.desktop:2
@@ -271,13 +269,12 @@ msgstr "GNOME Σκάκι"
 #. Name
 #: Games/Board/Glines.desktop:2
 msgid "Glines"
-msgstr ""
+msgstr "GLines"
 
 #. Name
 #: Games/Board/Gmahjongg.desktop:2
-#, fuzzy
 msgid "GNOME Mahjongg"
-msgstr "GNOME �ά�κες"
+msgstr "GNOME Μαντζόγκ"
 
 #. GenericName
 #: Games/Board/Gmahjongg.desktop:3
@@ -297,12 +294,12 @@ msgstr "Παιχνίδι λογικής"
 #. Name
 #: Games/Board/Gnotravex.desktop:2
 msgid "Gnotravex"
-msgstr ""
+msgstr "Gnotravex"
 
 #. Name
 #: Games/Board/Gnotski.desktop:2
 msgid "Gnotski"
-msgstr ""
+msgstr "Gnotski"
 
 #. GenericName
 #: Games/Board/Gnotski.desktop:3
@@ -317,7 +314,7 @@ msgstr "GNOME Πέτ�ες"
 #. Name
 #: Games/Board/Iagno.desktop:2
 msgid "Iagno"
-msgstr ""
+msgstr "GNOME Ρεβέ�σι"
 
 #. GenericName
 #: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
@@ -333,13 +330,12 @@ msgstr "Ίδιο GNOME"
 #. Name
 #: Games/Board/Xgammon.desktop:2
 msgid "Xgammon"
-msgstr ""
+msgstr "XGammon"
 
 #. Name
 #: Games/Board/xboard.desktop:2
-#, fuzzy
 msgid "Xboard"
-msgstr "Π�όχει�ο του X"
+msgstr "XBoard"
 
 #. GenericName
 #: Games/Board/xboard.desktop:3
@@ -349,7 +345,7 @@ msgstr "Παιχνίδι σκάκι"
 #. Name
 #: Games/Card/AisleRiot.desktop:2
 msgid "AisleRiot"
-msgstr ""
+msgstr "AisleRiot"
 
 #. GenericName
 #: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
@@ -365,23 +361,22 @@ msgstr "Κυψέλες"
 #. Name
 #: Games/Card/PySol.desktop:2
 msgid "PySol"
-msgstr ""
+msgstr "PySol"
 
 #. Name
 #: Games/Card/XPat2.desktop:2
 msgid "XPat 2"
-msgstr ""
+msgstr "XPat 2"
 
 #. Name
 #: Games/Clanbomber.desktop:2
 msgid "Clanbomber"
-msgstr ""
+msgstr "Clanbomber"
 
 #. Name
 #: Games/Emulators/cmail.desktop:2
-#, fuzzy
 msgid "ChessMail"
-msgstr "Παιχνίδι σκάκι"
+msgstr "Ταχυδ�ομικό σκάκι"
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -391,7 +386,7 @@ msgstr "Email για το Chess"
 #. Name
 #: Games/Emulators/qmamecat.desktop:2
 msgid "Qmamecat"
-msgstr ""
+msgstr "Qmamecat"
 
 #. GenericName
 #: Games/Emulators/qmamecat.desktop:3
@@ -401,7 +396,7 @@ msgstr "Π�οσομοιωτής arcade"
 #. Name
 #: Games/GTali.desktop:2
 msgid "GTali"
-msgstr ""
+msgstr "GTali"
 
 #. GenericName
 #: Games/GTali.desktop:3
@@ -411,7 +406,7 @@ msgstr "Παιχνίδι ζα�ιών"
 #. Name
 #: Games/Roguelikes/angband.desktop:2
 msgid "Angband"
-msgstr ""
+msgstr "Άνγκμπαντ"
 
 #. Comment
 #: Games/Roguelikes/angband.desktop:3
@@ -421,7 +416,7 @@ msgstr "Καταδυθείτε στο Angband και νικήστε τον Morgo
 #. Name
 #: Games/Roguelikes/moria.desktop:2
 msgid "Moria"
-msgstr ""
+msgstr "Η Μό�ια"
 
 #. Comment
 #: Games/Roguelikes/moria.desktop:3
@@ -431,7 +426,7 @@ msgstr "Καταδυθείτε στο Moria και νικήστε τον Balrog"
 #. Name
 #: Games/Roguelikes/nethack.desktop:2
 msgid "NetHack"
-msgstr ""
+msgstr "NetHack"
 
 #. GenericName
 #: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
@@ -441,7 +436,7 @@ msgstr "Παιχνίδι αναζήτησης"
 #. Name
 #: Games/Roguelikes/rogue.desktop:2
 msgid "Rogue"
-msgstr ""
+msgstr "Rogue"
 
 #. GenericName
 #: Games/Roguelikes/rogue.desktop:3
@@ -451,12 +446,12 @@ msgstr "Το αυθεντικό"
 #. Name
 #: Games/Roguelikes/tome.desktop:2
 msgid "ToME"
-msgstr ""
+msgstr "ToME"
 
 #. Name
 #: Games/Roguelikes/zangband.desktop:2
 msgid "ZAngband"
-msgstr ""
+msgstr "ZAngband"
 
 #. GenericName
 #: Games/Roguelikes/zangband.desktop:3
@@ -466,7 +461,7 @@ msgstr "�ικήστε τον Serpent of Chaos"
 #. Name
 #: Games/TacticStrategy/freeciv.desktop:3
 msgid "Freeciv"
-msgstr ""
+msgstr "FreeCiv"
 
 #. GenericName
 #: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
@@ -486,7 +481,7 @@ msgstr "Ένας εξυπη�ετητής για το Free Civ"
 #. Name
 #: Games/TacticStrategy/xscorch.desktop:3
 msgid "XScorch"
-msgstr ""
+msgstr "XScorch"
 
 #. Comment
 #: Games/TacticStrategy/xscorch.desktop:4
@@ -496,12 +491,12 @@ msgstr "Ελε�θε�α διαθέσιμος κλώνος του Scorched Earth
 #. Name
 #: Games/Toys/xeyes.desktop:2
 msgid "X Eyes"
-msgstr ""
+msgstr "Χ Μάτια"
 
 #. Name
 #: Games/Toys/xpinguin.desktop:2
 msgid "Tux"
-msgstr ""
+msgstr "Τουξ ο Πιγκουίνος"
 
 #. GenericName
 #: Games/Toys/xpinguin.desktop:3
@@ -511,7 +506,7 @@ msgstr "Η μασκότ του Linux"
 #. Name
 #: Games/defendguin.desktop:3
 msgid "Defendguin"
-msgstr ""
+msgstr "Άμυνα Πιγκουίνων"
 
 #. GenericName
 #: Games/defendguin.desktop:4
@@ -521,17 +516,17 @@ msgstr "Παιχνίδι"
 #. Name
 #: Games/penguin-command.desktop:3
 msgid "Penguin Command"
-msgstr ""
+msgstr "Η Πιγκουινοομάδα"
 
 #. Name
 #: Games/xshipwars.desktop:3
 msgid "XShipWars"
-msgstr ""
+msgstr "XShipWars"
 
 #. Name
 #: Graphics/ElectricEyes.desktop:2
 msgid "Electric Eyes"
-msgstr ""
+msgstr "Ηλεκτ�ικοί οφθαλμοί"
 
 #. GenericName
 #: Graphics/ElectricEyes.desktop:3
@@ -541,7 +536,7 @@ msgstr "Π�οβολέας εικόνων"
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "GPhoto"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -561,7 +556,7 @@ msgstr "Επεξε�γαστής εικονιδίων του GNOME"
 #. Name
 #: Graphics/Gqview.desktop:2
 msgid "Gqview"
-msgstr ""
+msgstr "Gqview"
 
 #. GenericName
 #: Graphics/Gqview.desktop:3
@@ -571,7 +566,7 @@ msgstr "Π�οβολέας εικόνων"
 #. Name
 #: Graphics/Sketch.desktop:2
 msgid "Sketch"
-msgstr ""
+msgstr "Σκετς"
 
 #. GenericName
 #: Graphics/Sketch.desktop:3
@@ -581,7 +576,7 @@ msgstr "Π�όγ�αμμα ζωγ�αφικής βασισμένης σε δια
 #. Name
 #: Graphics/Xpcd.desktop:2
 msgid "Xpcd"
-msgstr ""
+msgstr "Xpcd"
 
 #. GenericName
 #: Graphics/Xpcd.desktop:3
@@ -591,7 +586,7 @@ msgstr "Ε�γαλεία PhotoCD"
 #. Name
 #: Graphics/Xwpick.desktop:2
 msgid "Xwpick"
-msgstr ""
+msgstr "Xwpick"
 
 #. GenericName
 #: Graphics/Xwpick.desktop:3
@@ -601,7 +596,7 @@ msgstr "Π�όγ�αμμα σ�λληψης οθόνης"
 #. Name
 #: Graphics/bitmap.desktop:2
 msgid "X Bitmap"
-msgstr ""
+msgstr "X Bitmap"
 
 #. GenericName
 #: Graphics/bitmap.desktop:3
@@ -611,7 +606,7 @@ msgstr "Δημιου�γός bitmap"
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Blender"
 
 #. GenericName
 #: Graphics/blender.desktop:3
@@ -621,7 +616,7 @@ msgstr "3D Μοντελοποιητής/Αποτυπωτής"
 #. Name
 #: Graphics/ghostview.desktop:2
 msgid "GhostView"
-msgstr ""
+msgstr "GhostView"
 
 #. GenericName
 #: Graphics/ghostview.desktop:3
@@ -631,7 +626,7 @@ msgstr "Π�οβολέας PostScript"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "GIMP"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -641,7 +636,7 @@ msgstr "Π�όγ�αμμα επεξε�γασίας εικόνας"
 #. Name
 #: Graphics/gv.desktop:2
 msgid "GV"
-msgstr ""
+msgstr "GV"
 
 #. GenericName
 #: Graphics/gv.desktop:3
@@ -651,7 +646,7 @@ msgstr "Π�οβολέας Postscript"
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "Inkscape"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -661,12 +656,12 @@ msgstr "Διανυσματική ζωγ�αφική"
 #. Name
 #: Graphics/sodipodi.desktop:2
 msgid "Sodipodi"
-msgstr ""
+msgstr "Sodipodi"
 
 #. Name
 #: Graphics/tgif.desktop:2
 msgid "TGif"
-msgstr ""
+msgstr "TGif"
 
 #. GenericName
 #: Graphics/tgif.desktop:3 Graphics/xfig.desktop:3
@@ -676,7 +671,7 @@ msgstr "Π�όγ�αμμα ζωγ�αφικής"
 #. Name
 #: Graphics/xdvi.desktop:2
 msgid "X DVI"
-msgstr ""
+msgstr "X DVI"
 
 #. GenericName
 #: Graphics/xdvi.desktop:3
@@ -686,12 +681,12 @@ msgstr "Π�οβολέας DVI"
 #. Name
 #: Graphics/xfig.desktop:2
 msgid "Xfig"
-msgstr ""
+msgstr "Xfig"
 
 #. Name
 #: Graphics/xpaint.desktop:2
 msgid "X Paint"
-msgstr ""
+msgstr "X Ζωγ�αφική"
 
 #. GenericName
 #: Graphics/xpaint.desktop:3
@@ -701,7 +696,7 @@ msgstr "Π�όγ�αμμα ζωγ�αφικής"
 #. Name
 #: Graphics/xv.desktop:2
 msgid "XV"
-msgstr ""
+msgstr "XV"
 
 #. GenericName
 #: Graphics/xv.desktop:3
@@ -711,7 +706,7 @@ msgstr "Π�οβολέας εικόνων"
 #. Name
 #: Internet/BlueFish.desktop:2
 msgid "BlueFish"
-msgstr ""
+msgstr "BlueFish"
 
 #. GenericName
 #: Internet/BlueFish.desktop:3
@@ -721,7 +716,7 @@ msgstr "Επεξε�γαστής HTML"
 #. Name
 #: Internet/Dpsftp.desktop:2
 msgid "Dpsftp"
-msgstr ""
+msgstr "Dpsftp"
 
 #. GenericName
 #: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3 Internet/xftp.desktop:3
@@ -731,7 +726,7 @@ msgstr "Πε�ιηγητής FTP"
 #. Name
 #: Internet/DrakSync.desktop:2
 msgid "DrakSync"
-msgstr ""
+msgstr "DrakSync"
 
 #. GenericName
 #: Internet/DrakSync.desktop:3
@@ -741,7 +736,7 @@ msgstr "Ε�γαλείο συγχ�ονισμο� φακέλων"
 #. Name
 #: Internet/Evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -764,7 +759,6 @@ msgstr "Ειδοποίηση για mail"
 
 #. Name
 #: Internet/Fetchmailconf.desktop:2
-#, fuzzy
 msgid "Fetchmailconf"
 msgstr "Ρ�θμιση του Fetchmail"
 
@@ -776,7 +770,7 @@ msgstr "Ρ�θμιση του Fetchmail"
 #. Name
 #: Internet/Gabber.desktop:2
 msgid "Gabber"
-msgstr ""
+msgstr "Gabber"
 
 #. GenericName
 #: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
@@ -786,7 +780,7 @@ msgstr "Στιγμιαίος αποστολέας"
 #. Name
 #: Internet/Galeon.desktop:2
 msgid "Galeon"
-msgstr ""
+msgstr "Galeon"
 
 #. GenericName
 #: Internet/Galeon.desktop:3 Internet/Terminal/Links.desktop:3
@@ -800,9 +794,8 @@ msgstr "Πε�ιηγητής ιστο�"
 
 #. Name
 #: Internet/GnomeICU.desktop:2
-#, fuzzy
 msgid "GNOMEICU"
-msgstr "GNOME Σκάκι"
+msgstr "GNOMEICU"
 
 #. GenericName
 #: Internet/GnomeICU.desktop:3 Internet/licq.desktop:3
@@ -811,14 +804,13 @@ msgstr "ICQ αποστολέας"
 
 #. Name
 #: Internet/Netscapemessenger.desktop:2
-#, fuzzy
 msgid "Netscape Messenger"
-msgstr "Στιγμιαίος αποστολέας"
+msgstr "Στιγμιαίος αποστολέας Netscape"
 
 #. Name
 #: Internet/Nmapfe.desktop:2
 msgid "Nmapfe"
-msgstr ""
+msgstr "Nmapfe"
 
 #. GenericName
 #: Internet/Nmapfe.desktop:3
@@ -828,7 +820,7 @@ msgstr "Σα�ωτής θυ�ών"
 #. Name
 #: Internet/Pan.desktop:2
 msgid "Pan"
-msgstr ""
+msgstr "Pan"
 
 #. GenericName
 #: Internet/Pan.desktop:3 Internet/knews.desktop:3
@@ -838,33 +830,33 @@ msgstr "Αναγνώστης νέων Usenet"
 #. Name
 #: Internet/Sylpheed.desktop:2
 msgid "Sylpheed"
-msgstr ""
+msgstr "Sylpheed"
 
 #. Name
 #: Internet/Terminal/Links.desktop:2
 msgid "Links"
-msgstr ""
+msgstr "Links"
 
 #. Name
 #: Internet/Terminal/Lynx.desktop:2
 msgid "Lynx"
-msgstr ""
+msgstr "Lynx"
 
 #. Name
 #: Internet/Terminal/btdownloadcurses.desktop:2
 msgid "BitTorrent Python Curses GUI"
-msgstr ""
+msgstr "Πε�ιβάλλον γ�αμμής εντολών BitTorrent"
 
 #. GenericName
 #: Internet/Terminal/btdownloadcurses.desktop:3
 #: Internet/btdownloadgui.desktop:3
 msgid "BitTorrent GUI"
-msgstr ""
+msgstr "Γ�αφικό πε�ιβάλλον BitTorrent"
 
 #. Name
 #: Internet/Terminal/lftp.desktop:2
 msgid "Lftp"
-msgstr ""
+msgstr "LFTP"
 
 #. GenericName
 #: Internet/Terminal/lftp.desktop:3 Internet/Terminal/ncftp.desktop:3
@@ -874,22 +866,22 @@ msgstr "Πελάτης FTP"
 #. Name
 #: Internet/Terminal/mutt.desktop:2
 msgid "Mutt"
-msgstr ""
+msgstr "Mutt"
 
 #. Name
 #: Internet/Terminal/ncftp.desktop:2
 msgid "NcFTP"
-msgstr ""
+msgstr "NcFTP"
 
 #. Name
 #: Internet/Terminal/pine.desktop:2
 msgid "Pine"
-msgstr ""
+msgstr "Pine"
 
 #. Name
 #: Internet/Terminal/silc.desktop:2
 msgid "Silc"
-msgstr ""
+msgstr "Silc"
 
 #. GenericName
 #: Internet/Terminal/silc.desktop:3
@@ -899,7 +891,7 @@ msgstr "Πελάτης SILC"
 #. Name
 #: Internet/Terminal/slrn.desktop:2
 msgid "Slrn"
-msgstr ""
+msgstr "Slrn"
 
 #. GenericName
 #: Internet/Terminal/slrn.desktop:3
@@ -909,32 +901,32 @@ msgstr "Αναγνώστης νέων"
 #. Name
 #: Internet/Terminal/w3m.desktop:2
 msgid "w3m"
-msgstr ""
+msgstr "w3m"
 
 #. Name
 #: Internet/arena.desktop:2
 msgid "Arena"
-msgstr ""
+msgstr "Α�ένα"
 
 #. Name
 #: Internet/balsa.desktop:2
 msgid "Balsa"
-msgstr ""
+msgstr "Balsa"
 
 #. Name
 #: Internet/btdownloadgui.desktop:2
 msgid "BitTorrent Python wxGTK GUI"
-msgstr ""
+msgstr "Γ�αφικό πε�ιβάλλον BitTorrent (wxGTK)"
 
 #. Name
 #: Internet/coolmail.desktop:2
 msgid "Coolmail"
-msgstr ""
+msgstr "Coolmail"
 
 #. Name
 #: Internet/dc_gui.desktop:2
 msgid "DCTC GUI"
-msgstr ""
+msgstr "Γ�αφικό πε�ιβάλλον DCTC"
 
 #. GenericName
 #: Internet/dc_gui.desktop:3
@@ -944,22 +936,22 @@ msgstr "Κλώνος απευθείας σ�νδεσης(DCC)"
 #. Name
 #: Internet/ed2k_gui.desktop:2
 msgid "eDonkey2000 GTK+ Core Controller"
-msgstr ""
+msgstr "Κ��ιος ελεγκτής eDonkey 2000 (GTK+)"
 
 #. GenericName
 #: Internet/ed2k_gui.desktop:3
 msgid "eDonkey2000 GUI"
-msgstr ""
+msgstr "Γ�αφικό πε�ιβάλλον eDonkey 2000"
 
 #. Name
 #: Internet/epiphany.desktop:2
 msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany"
 
 #. Name
 #: Internet/ethereal.desktop:2
 msgid "Ethereal"
-msgstr ""
+msgstr "Ethereal"
 
 #. GenericName
 #: Internet/ethereal.desktop:3 Internet/wireshark.desktop:3
@@ -969,17 +961,17 @@ msgstr "Αναλυτής δικτ�ων"
 #. Name
 #: Internet/gFTP.desktop:2
 msgid "gFTP"
-msgstr ""
+msgstr "gFTP"
 
 #. Name
 #: Internet/gaim.desktop:2
 msgid "Gaim"
-msgstr ""
+msgstr "Gaim"
 
 #. Name
 #: Internet/gnomemeeting.desktop:2
 msgid "GnomeMeeting"
-msgstr ""
+msgstr "Συσκέψεις GNOME"
 
 #. GenericName
 #: Internet/gnomemeeting.desktop:3
@@ -988,15 +980,13 @@ msgstr "Διάσκεψη μέσω βίντεο"
 
 #. Name
 #: Internet/gnometalk.desktop:2
-#, fuzzy
 msgid "GNOME Talk"
-msgstr "Καταγ�αφέας χ�όνου GNOME"
+msgstr "GNOME Talk"
 
 #. Name
 #: Internet/gtelnet.desktop:2
-#, fuzzy
 msgid "GNOME Telnet"
-msgstr "GNOME �ά�κες"
+msgstr "GNOME Telnet"
 
 #. GenericName
 #: Internet/gtelnet.desktop:3
@@ -1006,7 +996,7 @@ msgstr "Ε�γαλείο απομακ�υσμένης π�όσβασης"
 #. Name
 #: Internet/ickle.desktop:2
 msgid "ickle"
-msgstr ""
+msgstr "ickle"
 
 #. GenericName
 #: Internet/ickle.desktop:3
@@ -1021,27 +1011,27 @@ msgstr "Αναζήτηση στο διαδίκτυο πε�ί Java"
 #. Name
 #: Internet/knews.desktop:2
 msgid "KNews"
-msgstr ""
+msgstr "Ειδήσεις KNews"
 
 #. Name
 #: Internet/licq.desktop:2
 msgid "Licq"
-msgstr ""
+msgstr "LICQ"
 
 #. Name
 #: Internet/mldonkey_gui.desktop:2
 msgid "MLDonkey GTK+ Core Controller"
-msgstr ""
+msgstr "Κ��ιος ελεγκτής MLDonkey (GTK+)"
 
 #. GenericName
 #: Internet/mldonkey_gui.desktop:3
 msgid "MLDonkey GUI"
-msgstr ""
+msgstr "Γ�αφικό πε�ιβάλλον MLDonkey"
 
 #. Name
 #: Internet/mozilla-firefox.desktop:2
 msgid "Firefox"
-msgstr ""
+msgstr "Firefox"
 
 #. Name
 #: Internet/mozilla-thunderbird.desktop:2
@@ -1051,38 +1041,37 @@ msgstr "Mozilla Thunderbird "
 #. Name
 #: Internet/mozilla.desktop:2
 msgid "Mozilla"
-msgstr ""
+msgstr "Mozilla"
 
 #. Name
 #: Internet/netscape.desktop:2
 msgid "Netscape"
-msgstr ""
+msgstr "Netscape"
 
 #. Name
 #: Internet/netscape6.desktop:2
 msgid "Netscape6"
-msgstr ""
+msgstr "Netscape 6"
 
 #. Name
 #: Internet/opera.desktop:2
 msgid "Opera"
-msgstr ""
+msgstr "Όπε�α"
 
 #. Name
 #: Internet/wireshark.desktop:2
 msgid "Wireshark"
-msgstr ""
+msgstr "Wireshark"
 
 #. Name
 #: Internet/xbiff.desktop:2
 msgid "X Biff"
-msgstr ""
+msgstr "X Biff"
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "Πελάτης συζήτησης IRC"
+msgstr "XChat"
 
 #. GenericName
 #: Internet/xchat.desktop:3
@@ -1092,17 +1081,17 @@ msgstr "Πελάτης συζήτησης IRC"
 #. Name
 #: Internet/xfmail.desktop:2
 msgid "XFMail"
-msgstr ""
+msgstr "XFMail"
 
 #. Name
 #: Internet/xftp.desktop:2
 msgid "X FTP"
-msgstr ""
+msgstr "X FTP"
 
 #. Name
 #: Multimedia/Aumix.desktop:2
 msgid "Aumix"
-msgstr ""
+msgstr "Aumix"
 
 #. GenericName
 #: Multimedia/Aumix.desktop:3
@@ -1112,7 +1101,7 @@ msgstr "Μείκτης ήχου"
 #. Name
 #: Multimedia/Grip.desktop:2
 msgid "Grip"
-msgstr ""
+msgstr "Grip"
 
 #. GenericName
 #: Multimedia/Grip.desktop:3
@@ -1127,7 +1116,7 @@ msgstr "Πλη�οφο�ίες MP3"
 #. Name
 #: Multimedia/XMovie.desktop:2
 msgid "XMovie"
-msgstr ""
+msgstr "XMovie"
 
 #. GenericName
 #: Multimedia/XMovie.desktop:3 Multimedia/mplayer.desktop:3
@@ -1139,7 +1128,7 @@ msgstr "Αναπα�αγωγέας βίντεο"
 #. Name
 #: Multimedia/alevt.desktop:2
 msgid "AleVT"
-msgstr ""
+msgstr "AleVT"
 
 #. GenericName
 #: Multimedia/alevt.desktop:3
@@ -1149,7 +1138,7 @@ msgstr "Π�οβολέας VideoText"
 #. Name
 #: Multimedia/alsamixergui.desktop:2
 msgid "AlsaMixerGui"
-msgstr ""
+msgstr "Γ�αφικός μίκτης ALSA"
 
 #. GenericName
 #: Multimedia/alsamixergui.desktop:3
@@ -1159,7 +1148,7 @@ msgstr "Ρ�θμιση μίκτη Alsa"
 #. Name
 #: Multimedia/audacity.desktop:2
 msgid "Audacity"
-msgstr ""
+msgstr "Audacity"
 
 #. GenericName
 #: Multimedia/audacity.desktop:3 Multimedia/rezound.desktop:3
@@ -1170,7 +1159,7 @@ msgstr "Επεξε�γαστής ήχου"
 #. Name
 #: Multimedia/aviplay.desktop:2
 msgid "Aviplay"
-msgstr ""
+msgstr "Αναπα�αγωγέας AVI"
 
 #. GenericName
 #: Multimedia/aviplay.desktop:3
@@ -1180,7 +1169,7 @@ msgstr "Αναπα�αγωγέας βίντεο AVI"
 #. Name
 #: Multimedia/bcast2000.desktop:2
 msgid "Broadcast 2000"
-msgstr ""
+msgstr "Εκπομπή 2000"
 
 #. GenericName
 #: Multimedia/bcast2000.desktop:3
@@ -1190,7 +1179,7 @@ msgstr "IDE Ήχου και Βίντεο"
 #. Name
 #: Multimedia/enjoympeg.desktop:2
 msgid "EnjoyMPEG"
-msgstr ""
+msgstr "EnjoyMPEG"
 
 #. GenericName
 #: Multimedia/enjoympeg.desktop:3 Multimedia/gtv.desktop:3
@@ -1200,12 +1189,12 @@ msgstr "Αναπα�αγωγέας MPEG"
 #. Name
 #: Multimedia/gtv.desktop:2
 msgid "GTV"
-msgstr ""
+msgstr "GTV"
 
 #. Name
 #: Multimedia/jazz.desktop:2
 msgid "Jazz"
-msgstr ""
+msgstr "Jazz"
 
 #. GenericName
 #: Multimedia/jazz.desktop:3
@@ -1214,19 +1203,18 @@ msgstr "Επεξε�γαστής ήχου"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "Αναπα�αγωγέας MPEG"
+msgstr "MPlayer"
 
 #. Name
 #: Multimedia/mtv.desktop:2
 msgid "MpegTV"
-msgstr ""
+msgstr "MpegTV"
 
 #. Name
 #: Multimedia/ogle.desktop:2
 msgid "Ogle"
-msgstr ""
+msgstr "Ogle"
 
 #. GenericName
 #: Multimedia/ogle.desktop:3
@@ -1235,9 +1223,8 @@ msgstr "Αναπα�αγωγέας DVD"
 
 #. Name
 #: Multimedia/oqtplayer.desktop:2
-#, fuzzy
 msgid "OQTPlayer"
-msgstr "Αναπα�αγωγέας DVD"
+msgstr "OQTPlayer"
 
 #. GenericName
 #: Multimedia/oqtplayer.desktop:3
@@ -1246,19 +1233,18 @@ msgstr "Αναπα�αγωγέας βίντεο MOV"
 
 #. Name
 #: Multimedia/realplayer.desktop:2
-#, fuzzy
 msgid "RealPlayer"
-msgstr "Αναπα�αγωγέας βίντεο"
+msgstr "Αναπα�αγωγέας Real"
 
 #. Name
 #: Multimedia/rezound.desktop:2
 msgid "reZound"
-msgstr ""
+msgstr "reZound"
 
 #. Name
 #: Multimedia/slab.desktop:2
 msgid "Slab"
-msgstr ""
+msgstr "Slab"
 
 #. GenericName
 #: Multimedia/slab.desktop:3
@@ -1268,12 +1254,12 @@ msgstr "Εγγ�αφέας ήχου"
 #. Name
 #: Multimedia/sweep.desktop:2
 msgid "Sweep"
-msgstr ""
+msgstr "Sweep"
 
 #. Name
 #: Multimedia/xawtv.desktop:2
 msgid "XawTV"
-msgstr ""
+msgstr "XawTV"
 
 #. GenericName
 #: Multimedia/xawtv.desktop:3
@@ -1283,7 +1269,7 @@ msgstr "Δείτε TV!"
 #. Name
 #: Multimedia/xcam.desktop:2
 msgid "XCam"
-msgstr ""
+msgstr "XCam"
 
 #. GenericName
 #: Multimedia/xcam.desktop:3
@@ -1293,7 +1279,7 @@ msgstr "Π�όγ�αμμα για κάμε�ες"
 #. Name
 #: Multimedia/xine.desktop:2
 msgid "Xine"
-msgstr ""
+msgstr "Xine"
 
 #. Name
 #: Multimedia/xmms-enqueue.desktop:2
@@ -1308,7 +1294,7 @@ msgstr "Ε�γαλείο λίστας αναπα�αγωγής"
 #. Name
 #: Multimedia/xmms.desktop:2
 msgid "XMMS"
-msgstr ""
+msgstr "XMMS"
 
 #. GenericName
 #: Multimedia/xmms.desktop:3
@@ -1318,7 +1304,7 @@ msgstr "Αναπα�αγωγέας πολυμέσων"
 #. Name
 #: Office/Applix.desktop:2
 msgid "Applix"
-msgstr ""
+msgstr "Applix"
 
 #. GenericName
 #: Office/Applix.desktop:3
@@ -1328,7 +1314,7 @@ msgstr "Σουίτα γ�αφείου"
 #. Name
 #: Office/Dia.desktop:2
 msgid "Dia"
-msgstr ""
+msgstr "Dia"
 
 #. GenericName
 #: Office/Dia.desktop:3 Office/Guppi.desktop:3
@@ -1337,9 +1323,8 @@ msgstr "Π�όγ�αμμα για διαγ�άμματα"
 
 #. Name
 #: Office/Gnome-Cal.desktop:2
-#, fuzzy
 msgid "GNOME-Cal"
-msgstr "GNOME Σκάκι"
+msgstr "Ημε�ολόγιο GNOME"
 
 #. GenericName
 #: Office/Gnome-Cal.desktop:3
@@ -1349,7 +1334,7 @@ msgstr "Π�οσωπικό ημε�ολόγιο"
 #. Name
 #: Office/Gnome-Card.desktop:2
 msgid "GNOME-Card"
-msgstr ""
+msgstr "Κα�τοθήκη GNOME"
 
 #. GenericName
 #: Office/Gnome-Card.desktop:3
@@ -1364,7 +1349,7 @@ msgstr "Καταγ�αφέας χ�όνου GNOME"
 #. Name
 #: Office/Gnumeric.desktop:2
 msgid "Gnumeric"
-msgstr ""
+msgstr "Gnumeric"
 
 #. GenericName
 #: Office/Gnumeric.desktop:3 Office/XsLite.desktop:3
@@ -1374,12 +1359,12 @@ msgstr "Λογιστικό φ�λλο"
 #. Name
 #: Office/Guppi.desktop:2
 msgid "Guppi"
-msgstr ""
+msgstr "Guppi"
 
 #. Name
 #: Office/Ical.desktop:2
 msgid "Ical"
-msgstr ""
+msgstr "iCal"
 
 #. GenericName
 #: Office/Ical.desktop:3
@@ -1389,7 +1374,7 @@ msgstr "Π�όγ�αμμα ημε�ολογίου"
 #. Name
 #: Office/WordPerfect.desktop:2
 msgid "WordPerfect"
-msgstr ""
+msgstr "WordPerfect"
 
 #. GenericName
 #: Office/WordPerfect.desktop:3 Office/WordPerfect2000.desktop:3
@@ -1400,12 +1385,12 @@ msgstr "Επεξε�γαστής κειμένου"
 #. Name
 #: Office/WordPerfect2000.desktop:2
 msgid "WordPerfect 2000"
-msgstr ""
+msgstr "WordPerfect 2000"
 
 #. Name
 #: Office/XAcc.desktop:2
 msgid "xacc"
-msgstr ""
+msgstr "XAcc"
 
 #. GenericName
 #: Office/XAcc.desktop:3
@@ -1415,17 +1400,17 @@ msgstr "Ε�γαλείο π�οσωπικών οικονομικών"
 #. Name
 #: Office/XsLite.desktop:2
 msgid "XsLite"
-msgstr ""
+msgstr "XsLite"
 
 #. Name
 #: Office/abiword.desktop:2
 msgid "AbiWord"
-msgstr ""
+msgstr "AbiWord"
 
 #. Name
 #: Office/acroread.desktop:2
 msgid "Acrobat Reader"
-msgstr ""
+msgstr "Π�οβολέας Acrobat"
 
 #. GenericName
 #: Office/acroread.desktop:3 Office/xpdf.desktop:3
@@ -1435,7 +1420,7 @@ msgstr "Π�οβολέας PDF"
 #. Name
 #: Office/gnucash.desktop:2
 msgid "GnuCash"
-msgstr ""
+msgstr "GnuCash"
 
 #. GenericName
 #: Office/gnucash.desktop:3
@@ -1445,12 +1430,12 @@ msgstr "Διαχει�ιστής οικονομικών"
 #. Name
 #: Office/lyx.desktop:2
 msgid "LyX"
-msgstr ""
+msgstr "LyX"
 
 #. Name
 #: Office/mrproject.desktop:2
 msgid "MrProject"
-msgstr ""
+msgstr "MrProject"
 
 #. GenericName
 #: Office/mrproject.desktop:3
@@ -1465,7 +1450,7 @@ msgstr "Netscape Βιβλίο διευθ�νσεων"
 #. Name
 #: Office/plan.desktop:2
 msgid "Plan"
-msgstr ""
+msgstr "Plan"
 
 #. GenericName
 #: Office/plan.desktop:3
@@ -1474,9 +1459,8 @@ msgstr "Διαχει�ιστής ημε�ολογίου"
 
 #. Name
 #: Office/pybliographic.desktop:2
-#, fuzzy
 msgid "Pybliographic"
-msgstr "Βιβλιογ�αφική βάση δεδομένων"
+msgstr "Pybliographic"
 
 #. GenericName
 #: Office/pybliographic.desktop:3
@@ -1486,7 +1470,7 @@ msgstr "Βιβλιογ�αφική βάση δεδομένων"
 #. Name
 #: Office/scribus.desktop:2
 msgid "Scribus"
-msgstr ""
+msgstr "Scribus"
 
 #. GenericName
 #: Office/scribus.desktop:3
@@ -1496,7 +1480,7 @@ msgstr "Επιτ�απέζια τυπογ�αφία"
 #. Name
 #: Office/xpdf.desktop:2
 msgid "X PDF"
-msgstr ""
+msgstr "XPDF"
 
 #. Name
 #: System/Terminal/aterm.desktop:2
@@ -1511,7 +1495,7 @@ msgstr "Π�όγ�αμμα τε�ματικο�"
 #. Name
 #: System/Terminal/procinfo.desktop:2
 msgid "Procinfo"
-msgstr ""
+msgstr "Πλη�οφο�ίες διε�γασιών"
 
 #. GenericName
 #: System/Terminal/procinfo.desktop:3
@@ -1521,7 +1505,7 @@ msgstr "ΠληÏ�οφοÏ�ίες για τις διεÏ�γασίες του συσÏ
 #. Name
 #: System/Terminal/rxvt.desktop:2
 msgid "RXVT"
-msgstr ""
+msgstr "RXVT"
 
 #. GenericName
 #: System/Terminal/rxvt.desktop:3
@@ -1531,7 +1515,7 @@ msgstr "Το δικό μας εκτεταμένο εικονικό τεÏ�ματÎ
 #. Name
 #: System/Terminal/vmstat.desktop:2
 msgid "Vmstat"
-msgstr ""
+msgstr "Πλη�οφο�ίες μνήμης"
 
 #. GenericName
 #: System/Terminal/vmstat.desktop:3
@@ -1551,7 +1535,7 @@ msgstr "Πελάτης WTS"
 #. Name
 #: System/editres.desktop:2
 msgid "EditXRes"
-msgstr ""
+msgstr "Επεξε�γαστής πό�ων X"
 
 #. GenericName
 #: System/editres.desktop:3
@@ -1566,7 +1550,7 @@ msgstr "SAM διαχεί�ιση-συστήματος"
 #. Name
 #: System/wine.desktop:2
 msgid "Wine"
-msgstr ""
+msgstr "Wine"
 
 #. GenericName
 #: System/wine.desktop:3
@@ -1576,7 +1560,7 @@ msgstr "Εκτέλεση π�ογ�αμμάτων Windows"
 #. Name
 #: System/xosview.desktop:2
 msgid "X osview"
-msgstr ""
+msgstr "XOSView"
 
 #. GenericName
 #: System/xosview.desktop:3
@@ -1586,7 +1570,7 @@ msgstr "Επόπτης συστήματος"
 #. Name
 #: Utilities/Editors/emacs.desktop:2
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
 #. GenericName
 #: Utilities/Editors/emacs.desktop:3 Utilities/Editors/gedit.desktop:3
@@ -1599,34 +1583,33 @@ msgstr "Επεξε�γαστής κειμένου"
 
 #. Name
 #: Utilities/Editors/gedit.desktop:2
-#, fuzzy
 msgid "gEdit"
-msgstr "X Επεξε�γαστής"
+msgstr "gEdit"
 
 #. Name
 #: Utilities/Editors/gvim.desktop:2
 msgid "Vi IMproved"
-msgstr ""
+msgstr "VIM"
 
 #. Name
 #: Utilities/Editors/lemacs.desktop:2
 msgid "Lucid Emacs"
-msgstr ""
+msgstr "Lucid Emacs"
 
 #. Name
 #: Utilities/Editors/nano.desktop:2
 msgid "Nano"
-msgstr ""
+msgstr "Nano"
 
 #. Name
 #: Utilities/Editors/nedit.desktop:2
 msgid "Nedit"
-msgstr ""
+msgstr "Nedit"
 
 #. Name
 #: Utilities/Editors/pico.desktop:2
 msgid "Pico"
-msgstr ""
+msgstr "Pico"
 
 #. Name
 #: Utilities/Editors/xedit.desktop:2
@@ -1636,12 +1619,12 @@ msgstr "X Επεξε�γαστής"
 #. Name
 #: Utilities/Editors/xemacs.desktop:2
 msgid "X Emacs"
-msgstr ""
+msgstr "XEmacs"
 
 #. Name
 #: Utilities/GKrellM.desktop:2
 msgid "GKrellM"
-msgstr ""
+msgstr "GKrellM"
 
 #. GenericName
 #: Utilities/GKrellM.desktop:3
@@ -1650,9 +1633,8 @@ msgstr "Επόπτες GNU Krell"
 
 #. Name
 #: Utilities/GnomeWho.desktop:2
-#, fuzzy
 msgid "GNOME Who"
-msgstr "GNOME Σκάκι"
+msgstr "GNOME Who"
 
 #. GenericName
 #: Utilities/GnomeWho.desktop:3
@@ -1672,7 +1654,7 @@ msgstr "Π�οβολέας α�χείων καταγ�αφής"
 #. Name
 #: Utilities/XUtilities/Xkill.desktop:2
 msgid "X Kill"
-msgstr ""
+msgstr "X Kill"
 
 #. GenericName
 #: Utilities/XUtilities/Xkill.desktop:3
@@ -1681,9 +1663,8 @@ msgstr "Ε�γαλείο τε�ματισμο� πα�αθ��ων"
 
 #. Name
 #: Utilities/XUtilities/Xrefresh.desktop:2
-#, fuzzy
 msgid "X Refresh"
-msgstr "Ανανέωση οθόνης"
+msgstr "X Refresh"
 
 #. GenericName
 #: Utilities/XUtilities/Xrefresh.desktop:3
@@ -1693,7 +1674,7 @@ msgstr "Ανανέωση οθόνης"
 #. Name
 #: Utilities/XUtilities/Xtraceroute.desktop:2
 msgid "X Traceroute"
-msgstr ""
+msgstr "X Traceroute"
 
 #. GenericName
 #: Utilities/XUtilities/Xtraceroute.desktop:3
@@ -1703,7 +1684,7 @@ msgstr "Ε�γαλείο δικτ�ου"
 #. Name
 #: Utilities/XUtilities/xcalc.desktop:2
 msgid "X Calc"
-msgstr ""
+msgstr "X Calc"
 
 #. GenericName
 #: Utilities/XUtilities/xcalc.desktop:3 Utilities/calctool.desktop:3
@@ -1743,7 +1724,7 @@ msgstr "Π�οβολέας μηνυμάτων κονσόλας"
 #. Name
 #: Utilities/XUtilities/xload.desktop:2
 msgid "X Load"
-msgstr ""
+msgstr "X Load"
 
 #. GenericName
 #: Utilities/XUtilities/xload.desktop:3
@@ -1752,9 +1733,8 @@ msgstr "Καταγ�άφει το φό�το του συστήματος"
 
 #. Name
 #: Utilities/XUtilities/xmag.desktop:2
-#, fuzzy
 msgid "X Magnifier"
-msgstr "Μεγέθυνση επιφάνειας ε�γασίας"
+msgstr "X Magnifier"
 
 #. GenericName
 #: Utilities/XUtilities/xmag.desktop:3
@@ -1774,7 +1754,7 @@ msgstr "Α�ιθμομηχανή"
 #. Name
 #: Utilities/e-notes.desktop:2
 msgid "E-Notes"
-msgstr ""
+msgstr "E-Notes"
 
 #. GenericName
 #: Utilities/e-notes.desktop:3
@@ -1783,14 +1763,13 @@ msgstr "Π�οσωπικές σημειώσεις"
 
 #. Name
 #: Utilities/oclock.desktop:2
-#, fuzzy
 msgid "OClock"
-msgstr "Ρολόι"
+msgstr "OClock"
 
 #. Name
 #: Utilities/xgnokii.desktop:2
 msgid "X-Gnokii"
-msgstr ""
+msgstr "X-Gnokii"
 
 #. GenericName
 #: Utilities/xgnokii.desktop:3
diff --git a/translations/desktop_files/kappfinder-data/es.po b/translations/desktop_files/kappfinder-data/es.po
index 1ab7487c3..3bd49f73b 100644
--- a/translations/desktop_files/kappfinder-data/es.po
+++ b/translations/desktop_files/kappfinder-data/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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-03-15 15:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Development/Forte.desktop:2
@@ -87,7 +88,7 @@ msgstr "Diseñador Qt"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -107,7 +108,7 @@ msgstr "Herramienta de traducción"
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -117,7 +118,7 @@ msgstr "Emulador Palm/Inalámbrico"
 #. Name
 #: Development/sced.desktop:2
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
@@ -127,7 +128,7 @@ msgstr "Modelador de escenas"
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
 msgid "ClanBomber"
-msgstr ""
+msgstr "ClanBomber"
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -148,12 +149,12 @@ msgstr "Burbuja congelada"
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
 msgid "Tetris-Like Game"
-msgstr "Juego tipo Tetris"
+msgstr "Tetris-Like Game"
 
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -163,12 +164,12 @@ msgstr "Juego GNOME de Nibbles"
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
 msgid "Gnobots II"
-msgstr ""
+msgstr "Gnobots II"
 
 #. Name
 #: Games/Arcade/Mures.desktop:2
 msgid "Mures"
-msgstr ""
+msgstr "Mures"
 
 #. Name
 #: Games/Arcade/SuperMethaneBrothers.desktop:2
diff --git a/translations/desktop_files/kappfinder-data/es_AR.po b/translations/desktop_files/kappfinder-data/es_AR.po
new file mode 100644
index 000000000..c2caf0e26
--- /dev/null
+++ b/translations/desktop_files/kappfinder-data/es_AR.po
@@ -0,0 +1,1778 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2025-03-15 15:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kappfinder-data/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: Development/Forte.desktop:2
+msgid "Forte"
+msgstr "Forte"
+
+#. GenericName
+#: Development/Forte.desktop:3
+msgid "Java IDE"
+msgstr "IDE (entorno integrado de desarrollo) para Java"
+
+#. Name
+#: Development/assistant.desktop:2
+msgid "Qt Assistant"
+msgstr "Asistente Qt"
+
+#. GenericName
+#: Development/assistant.desktop:3
+msgid "Document Browser"
+msgstr "Navegador de documentos"
+
+#. Name
+#: Development/ddd.desktop:2
+msgid "DDD"
+msgstr "DDD"
+
+#. GenericName
+#: Development/ddd.desktop:3
+msgid "Data Display Debugger"
+msgstr "Depurador visual de datos ('Data Display Debugger')"
+
+#. Name
+#: Development/designer.desktop:2
+msgid "Qt Designer"
+msgstr "Diseñador Qt"
+
+#. GenericName
+#: Development/designer.desktop:3
+msgid "Interface Designer"
+msgstr "Diseñador de interfaces"
+
+#. Name
+#: Development/dlgedit.desktop:2
+msgid "Qt DlgEdit"
+msgstr "Qt DlgEdit"
+
+#. GenericName
+#: Development/dlgedit.desktop:3
+msgid "Dialog Editor"
+msgstr "Editor de diálogos"
+
+#. Name
+#: Development/eclipse.desktop:3
+msgid "Eclipse"
+msgstr "Eclipse"
+
+#. GenericName
+#: Development/eclipse.desktop:4
+msgid "Eclipse IDE"
+msgstr "Entorno de desarrollo integrado Eclipse"
+
+#. Name
+#: Development/fdesign.desktop:2
+msgid "FormDesigner"
+msgstr "FormDesigner"
+
+#. Name
+#: Development/j2mewtk.desktop:2
+msgid "J2ME"
+msgstr "J2ME"
+
+#. GenericName
+#: Development/j2mewtk.desktop:3
+msgid "J2ME Toolkit"
+msgstr "Juego de herramientas J2ME"
+
+#. Name
+#: Development/linguist.desktop:2
+msgid "Qt Linguist"
+msgstr "Lingüista Qt"
+
+#. GenericName
+#: Development/linguist.desktop:3
+msgid "Translation Tool"
+msgstr "Herramienta de traducción"
+
+#. Name
+#: Development/pose.desktop:2
+msgid "Pose"
+msgstr "Pose"
+
+#. GenericName
+#: Development/pose.desktop:3
+msgid "Palm/Wireless Emulator"
+msgstr "Emulador Palm/Inalámbrico"
+
+#. Name
+#: Development/sced.desktop:2
+msgid "Sced"
+msgstr "Sced"
+
+#. GenericName
+#: Development/sced.desktop:3
+msgid "Scene Modeler"
+msgstr "Modelador de escenas"
+
+#. Name
+#: Games/Arcade/ClanBomber.desktop:2
+msgid "ClanBomber"
+msgstr "ClanBomber"
+
+#. GenericName
+#: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
+#: Games/Arcade/Mures.desktop:3 Games/Arcade/SuperMethaneBrothers.desktop:3
+#: Games/Arcade/Trophy.desktop:3 Games/Arcade/XKobo.desktop:3
+#: Games/Arcade/XSoldier.desktop:3 Games/Arcade/battalion.desktop:3
+#: Games/Arcade/cxhextris.desktop:3 Games/Arcade/scavenger.desktop:3
+#: Games/Board/Gataxx.desktop:3 Games/Board/Gnotravex.desktop:3
+#: Games/penguin-command.desktop:4
+msgid "Arcade Game"
+msgstr "Juego de Arcade"
+
+#. Name
+#: Games/Arcade/FrozenBubble.desktop:2
+msgid "Frozen Bubble"
+msgstr "Burbuja congelada"
+
+#. GenericName
+#: Games/Arcade/FrozenBubble.desktop:3
+msgid "Tetris-Like Game"
+msgstr "Tetris-Like Game"
+
+#. Name
+#: Games/Arcade/Gnibbles.desktop:2
+msgid "Gnibbles"
+msgstr "Gnibbles"
+
+#. GenericName
+#: Games/Arcade/Gnibbles.desktop:3
+msgid "GNOME Nibbles Game"
+msgstr "Juego GNOME de Nibbles"
+
+#. Name
+#: Games/Arcade/GnobotsII.desktop:2
+msgid "Gnobots II"
+msgstr "Gnobots II"
+
+#. Name
+#: Games/Arcade/Mures.desktop:2
+msgid "Mures"
+msgstr "Mures"
+
+#. Name
+#: Games/Arcade/SuperMethaneBrothers.desktop:2
+msgid "Super Methane Brothers"
+msgstr "Los hermanos super metano"
+
+#. Name
+#: Games/Arcade/Trophy.desktop:2
+msgid "Trophy"
+msgstr "Trophy"
+
+#. Name
+#: Games/Arcade/TuxRacer.desktop:2
+msgid "TuxRacer"
+msgstr ""
+
+#. GenericName
+#: Games/Arcade/TuxRacer.desktop:3
+msgid "Racing Game"
+msgstr "Juego de carreras"
+
+#. Name
+#: Games/Arcade/XKobo.desktop:2
+msgid "XKobo"
+msgstr "XKobo"
+
+#. Name
+#: Games/Arcade/XSoldier.desktop:2
+msgid "XSoldier"
+msgstr "XSoldier"
+
+#. Name
+#: Games/Arcade/alephone-nogl.desktop:2
+msgid "Alephone"
+msgstr "Alephone"
+
+#. Comment
+#: Games/Arcade/alephone-nogl.desktop:3
+msgid "An open source version of Marathon Infinity for SDL"
+msgstr "Una versión de código abierto de Marathon Infinity para SDL"
+
+#. Name
+#: Games/Arcade/alephone.desktop:2
+msgid "Alephone - No OpenGL"
+msgstr "Alephone - No OpenGL"
+
+#. Comment
+#: Games/Arcade/alephone.desktop:3
+msgid ""
+"An open source version of Marathon Infinity for SDL that has Open GL disabled"
+msgstr ""
+"Una versión de código abierto de Marathon Infinity para SDL que tiene "
+"desactivado Open GL"
+
+#. Name
+#: Games/Arcade/battalion.desktop:2
+msgid "Batallion"
+msgstr "Batallion"
+
+#. Name
+#: Games/Arcade/battleball.desktop:2
+msgid "Battleball"
+msgstr "Battleball"
+
+#. GenericName
+#: Games/Arcade/battleball.desktop:3
+msgid "Ball Game"
+msgstr "Juego de bocha"
+
+#. Name
+#: Games/Arcade/cxhextris.desktop:2
+msgid "cxhextris"
+msgstr "cxhextris"
+
+#. Name
+#: Games/Arcade/rocksndiamonds.desktop:2
+msgid "Rocks n Diamonds"
+msgstr "Rocas y diamantes"
+
+#. GenericName
+#: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
+msgid "Tactical Game"
+msgstr "Juego de táctica"
+
+#. Name
+#: Games/Arcade/scavenger.desktop:2
+msgid "Scavenger"
+msgstr "Scavenger"
+
+#. Name
+#: Games/Board/Gataxx.desktop:2
+msgid "Gataxx"
+msgstr "Gataxx"
+
+#. Name
+#: Games/Board/Gchess.desktop:2
+msgid "GNOME Chess"
+msgstr "Ajedrez de GNOME"
+
+#. Name
+#: Games/Board/Glines.desktop:2
+msgid "Glines"
+msgstr "Glines"
+
+#. Name
+#: Games/Board/Gmahjongg.desktop:2
+msgid "GNOME Mahjongg"
+msgstr "Mahjongg de GNOME"
+
+#. GenericName
+#: Games/Board/Gmahjongg.desktop:3
+msgid "Tile Game"
+msgstr "Juego de baldosas"
+
+#. Name
+#: Games/Board/Gmines.desktop:2
+msgid "GNOME Mines"
+msgstr "Minas de GNOME"
+
+#. GenericName
+#: Games/Board/Gmines.desktop:3
+msgid "Logic Game"
+msgstr "Juego de lógica"
+
+#. Name
+#: Games/Board/Gnotravex.desktop:2
+msgid "Gnotravex"
+msgstr "Gnotravex"
+
+#. Name
+#: Games/Board/Gnotski.desktop:2
+msgid "Gnotski"
+msgstr "Gnotski"
+
+#. GenericName
+#: Games/Board/Gnotski.desktop:3
+msgid "GNOME Klotski Game"
+msgstr "Juego GNOME Klotski"
+
+#. Name
+#: Games/Board/Gstones.desktop:2
+msgid "GNOME Stones"
+msgstr "Piedras de GNOME"
+
+#. Name
+#: Games/Board/Iagno.desktop:2
+msgid "Iagno"
+msgstr "Iagno"
+
+#. GenericName
+#: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
+#: Games/Board/Xgammon.desktop:3
+msgid "Board Game"
+msgstr "Juego de tablero"
+
+#. Name
+#: Games/Board/SameGnome.desktop:2
+msgid "Same GNOME"
+msgstr "Lo mismo de GNOME"
+
+#. Name
+#: Games/Board/Xgammon.desktop:2
+msgid "Xgammon"
+msgstr "Xgammon"
+
+#. Name
+#: Games/Board/xboard.desktop:2
+msgid "Xboard"
+msgstr "Xboard"
+
+#. GenericName
+#: Games/Board/xboard.desktop:3
+msgid "Chess Game"
+msgstr "Juego de ajedrez"
+
+#. Name
+#: Games/Card/AisleRiot.desktop:2
+msgid "AisleRiot"
+msgstr "AisleRiot"
+
+#. GenericName
+#: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
+#: Games/Card/PySol.desktop:3 Games/Card/XPat2.desktop:3
+msgid "Card Game"
+msgstr "Juego de cartas"
+
+#. Name
+#: Games/Card/FreeCell.desktop:2
+msgid "FreeCell"
+msgstr "FreeCell"
+
+#. Name
+#: Games/Card/PySol.desktop:2
+msgid "PySol"
+msgstr "PySol"
+
+#. Name
+#: Games/Card/XPat2.desktop:2
+msgid "XPat 2"
+msgstr "XPat 2"
+
+#. Name
+#: Games/Clanbomber.desktop:2
+msgid "Clanbomber"
+msgstr "Clanbomber"
+
+#. Name
+#: Games/Emulators/cmail.desktop:2
+msgid "ChessMail"
+msgstr "ChessMail"
+
+#. GenericName
+#: Games/Emulators/cmail.desktop:3
+msgid "Email for Chess"
+msgstr "Mail para ajedrez"
+
+#. Name
+#: Games/Emulators/qmamecat.desktop:2
+msgid "Qmamecat"
+msgstr "Qmamecat"
+
+#. GenericName
+#: Games/Emulators/qmamecat.desktop:3
+msgid "Arcade Emulator"
+msgstr "Emulador de Arcade"
+
+#. Name
+#: Games/GTali.desktop:2
+msgid "GTali"
+msgstr "GTali"
+
+#. GenericName
+#: Games/GTali.desktop:3
+msgid "Dice Game"
+msgstr "Juego de dados"
+
+#. Name
+#: Games/Roguelikes/angband.desktop:2
+msgid "Angband"
+msgstr "Angband"
+
+#. Comment
+#: Games/Roguelikes/angband.desktop:3
+msgid "Dive into Angband and defeat Morgoth"
+msgstr "Sumergite en Angband y derrotá a Morgoth"
+
+#. Name
+#: Games/Roguelikes/moria.desktop:2
+msgid "Moria"
+msgstr "Moria"
+
+#. Comment
+#: Games/Roguelikes/moria.desktop:3
+msgid "Dive into Moria and defeat the Balrog"
+msgstr "Sumergite en Moria y derrotá a Balrog"
+
+#. Name
+#: Games/Roguelikes/nethack.desktop:2
+msgid "NetHack"
+msgstr "NetHack"
+
+#. GenericName
+#: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
+msgid "Quest Game"
+msgstr "Juego de búsqueda"
+
+#. Name
+#: Games/Roguelikes/rogue.desktop:2
+msgid "Rogue"
+msgstr "Rogue"
+
+#. GenericName
+#: Games/Roguelikes/rogue.desktop:3
+msgid "The Original"
+msgstr "El original"
+
+#. Name
+#: Games/Roguelikes/tome.desktop:2
+msgid "ToME"
+msgstr "ToME"
+
+#. Name
+#: Games/Roguelikes/zangband.desktop:2
+msgid "ZAngband"
+msgstr "ZAngband"
+
+#. GenericName
+#: Games/Roguelikes/zangband.desktop:3
+msgid "Defeat the Serpent of Chaos"
+msgstr "Derrotá a la serpiente del caos"
+
+#. Name
+#: Games/TacticStrategy/freeciv.desktop:3
+msgid "Freeciv"
+msgstr "Freeciv"
+
+#. GenericName
+#: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
+msgid "Strategy Game"
+msgstr "Juego de estrategia"
+
+#. Name
+#: Games/TacticStrategy/freecivserver.desktop:3
+msgid "FreeCiv Server"
+msgstr "Servidor FreeCiv"
+
+#. Comment
+#: Games/TacticStrategy/freecivserver.desktop:4
+msgid "A server for Free Civ"
+msgstr "Un servidor para Free Civ"
+
+#. Name
+#: Games/TacticStrategy/xscorch.desktop:3
+msgid "XScorch"
+msgstr "XScorch"
+
+#. Comment
+#: Games/TacticStrategy/xscorch.desktop:4
+msgid "A free Scorched Earth clone for UNIX and X"
+msgstr "Un clon libre para Unix y X de Scorched Earth"
+
+#. Name
+#: Games/Toys/xeyes.desktop:2
+msgid "X Eyes"
+msgstr "Ojos de X"
+
+#. Name
+#: Games/Toys/xpinguin.desktop:2
+msgid "Tux"
+msgstr "Tux"
+
+#. GenericName
+#: Games/Toys/xpinguin.desktop:3
+msgid "Linux Mascot"
+msgstr "Mascota de Linux"
+
+#. Name
+#: Games/defendguin.desktop:3
+msgid "Defendguin"
+msgstr "Defendguin"
+
+#. GenericName
+#: Games/defendguin.desktop:4
+msgid "Game"
+msgstr "Juego"
+
+#. Name
+#: Games/penguin-command.desktop:3
+msgid "Penguin Command"
+msgstr "Comando Pinguino"
+
+#. Name
+#: Games/xshipwars.desktop:3
+msgid "XShipWars"
+msgstr "XShipWars"
+
+#. Name
+#: Graphics/ElectricEyes.desktop:2
+msgid "Electric Eyes"
+msgstr "Ojos eléctricos"
+
+#. GenericName
+#: Graphics/ElectricEyes.desktop:3
+msgid "Image Viewer"
+msgstr "Visor de imágenes"
+
+#. Name
+#: Graphics/GPhoto.desktop:2
+msgid "GPhoto"
+msgstr "GPhoto"
+
+#. GenericName
+#: Graphics/GPhoto.desktop:3
+msgid "Digital Camera Program"
+msgstr "Gestor de cámaras digitales"
+
+#. Name
+#: Graphics/GnomeColorSelector.desktop:2
+msgid "GNOME Color Selector"
+msgstr "Selector de colores de GNOME"
+
+#. Name
+#: Graphics/GnomeIconEditor.desktop:2
+msgid "GNOME Icon Editor"
+msgstr "Editor de iconos de GNOME"
+
+#. Name
+#: Graphics/Gqview.desktop:2
+msgid "Gqview"
+msgstr "Gqview"
+
+#. GenericName
+#: Graphics/Gqview.desktop:3
+msgid "Image Browser"
+msgstr "Navegador de imágenes"
+
+#. Name
+#: Graphics/Sketch.desktop:2
+msgid "Sketch"
+msgstr "Sketch"
+
+#. GenericName
+#: Graphics/Sketch.desktop:3
+msgid "Vector-based Drawing Program"
+msgstr "Programa de dibujo vectorial"
+
+#. Name
+#: Graphics/Xpcd.desktop:2
+msgid "Xpcd"
+msgstr "Xpcd"
+
+#. GenericName
+#: Graphics/Xpcd.desktop:3
+msgid "PhotoCD Tools"
+msgstr "Herramientas de PhotoCD"
+
+#. Name
+#: Graphics/Xwpick.desktop:2
+msgid "Xwpick"
+msgstr "Xwpick"
+
+#. GenericName
+#: Graphics/Xwpick.desktop:3
+msgid "Screen Capture Program"
+msgstr "Programa de Screenshot"
+
+#. Name
+#: Graphics/bitmap.desktop:2
+msgid "X Bitmap"
+msgstr "Mapa de bits de X"
+
+#. GenericName
+#: Graphics/bitmap.desktop:3
+msgid "Bitmap Creator"
+msgstr "Creador de mapas de bits"
+
+#. Name
+#: Graphics/blender.desktop:2
+msgid "Blender"
+msgstr "Blender"
+
+#. GenericName
+#: Graphics/blender.desktop:3
+msgid "3D Modeler/Renderer"
+msgstr "Modelador de escenas 3D"
+
+#. Name
+#: Graphics/ghostview.desktop:2
+msgid "GhostView"
+msgstr "GhostView"
+
+#. GenericName
+#: Graphics/ghostview.desktop:3
+msgid "PostScript Viewer"
+msgstr "Visor de PostScript"
+
+#. Name
+#: Graphics/gimp.desktop:2
+msgid "Gimp"
+msgstr "GIMP"
+
+#. GenericName
+#: Graphics/gimp.desktop:3
+msgid "Image Manipulation Program"
+msgstr "Programa de manipulación de imágenes"
+
+#. Name
+#: Graphics/gv.desktop:2
+msgid "GV"
+msgstr "GV"
+
+#. GenericName
+#: Graphics/gv.desktop:3
+msgid "Postscript Viewer"
+msgstr "Visor de documentos PostScript"
+
+#. Name
+#: Graphics/inkscape.desktop:2
+msgid "Inkscape"
+msgstr "Inkscape"
+
+#. GenericName
+#: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
+msgid "Vector Drawing"
+msgstr "Dibujo vectorial"
+
+#. Name
+#: Graphics/sodipodi.desktop:2
+msgid "Sodipodi"
+msgstr "Sodipodi"
+
+#. Name
+#: Graphics/tgif.desktop:2
+msgid "TGif"
+msgstr "TGif"
+
+#. GenericName
+#: Graphics/tgif.desktop:3 Graphics/xfig.desktop:3
+msgid "Drawing Program"
+msgstr "Programa de dibujo"
+
+#. Name
+#: Graphics/xdvi.desktop:2
+msgid "X DVI"
+msgstr "XDVI"
+
+#. GenericName
+#: Graphics/xdvi.desktop:3
+msgid "DVI Viewer"
+msgstr "Visor de documentos DVI"
+
+#. Name
+#: Graphics/xfig.desktop:2
+msgid "Xfig"
+msgstr "Xfig"
+
+#. Name
+#: Graphics/xpaint.desktop:2
+msgid "X Paint"
+msgstr "XPaint"
+
+#. GenericName
+#: Graphics/xpaint.desktop:3
+msgid "Paint Program"
+msgstr "Programa de pintura"
+
+#. Name
+#: Graphics/xv.desktop:2
+msgid "XV"
+msgstr "XV"
+
+#. GenericName
+#: Graphics/xv.desktop:3
+msgid "Picture Viewer"
+msgstr "Visor de imágenes"
+
+#. Name
+#: Internet/BlueFish.desktop:2
+msgid "BlueFish"
+msgstr "BlueFish"
+
+#. GenericName
+#: Internet/BlueFish.desktop:3
+msgid "HTML Editor"
+msgstr "Editor HTML"
+
+#. Name
+#: Internet/Dpsftp.desktop:2
+msgid "Dpsftp"
+msgstr "Dpsftp"
+
+#. GenericName
+#: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3 Internet/xftp.desktop:3
+msgid "FTP Browser"
+msgstr "Navegador FTP"
+
+#. Name
+#: Internet/DrakSync.desktop:2
+msgid "DrakSync"
+msgstr "DrakSync"
+
+#. GenericName
+#: Internet/DrakSync.desktop:3
+msgid "Folder Synchronization"
+msgstr "Sincronizador de carpetas"
+
+#. Name
+#: Internet/Evolution.desktop:2
+msgid "Evolution"
+msgstr "Evolution"
+
+#. GenericName
+#: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
+#: Internet/Sylpheed.desktop:3 Internet/Terminal/mutt.desktop:3
+#: Internet/Terminal/pine.desktop:3 Internet/balsa.desktop:3
+#: Internet/mozilla-thunderbird.desktop:3 Internet/xfmail.desktop:3
+msgid "Mail Client"
+msgstr "Cliente de mail"
+
+#. Name
+#: Internet/Faces.desktop:2
+msgid "Faces"
+msgstr "Caras"
+
+#. GenericName
+#: Internet/Faces.desktop:3 Internet/coolmail.desktop:3
+#: Internet/xbiff.desktop:3
+msgid "Mail Alert"
+msgstr "Alerta de mail"
+
+#. Name
+#: Internet/Fetchmailconf.desktop:2
+msgid "Fetchmailconf"
+msgstr "Fetchmailconf"
+
+#. GenericName
+#: Internet/Fetchmailconf.desktop:3
+msgid "Fetchmail Configuration"
+msgstr "Configuración de Fetchmail"
+
+#. Name
+#: Internet/Gabber.desktop:2
+msgid "Gabber"
+msgstr "Gabber"
+
+#. GenericName
+#: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
+msgid "Instant Messenger"
+msgstr "Mensajería instantánea"
+
+#. Name
+#: Internet/Galeon.desktop:2
+msgid "Galeon"
+msgstr "Galeon"
+
+#. GenericName
+#: Internet/Galeon.desktop:3 Internet/Terminal/Links.desktop:3
+#: Internet/Terminal/Lynx.desktop:3 Internet/Terminal/w3m.desktop:3
+#: Internet/arena.desktop:3 Internet/epiphany.desktop:3
+#: Internet/mozilla-firefox.desktop:3 Internet/mozilla.desktop:3
+#: Internet/netscape.desktop:3 Internet/netscape6.desktop:3
+#: Internet/opera.desktop:3
+msgid "Web Browser"
+msgstr "Navegador web"
+
+#. Name
+#: Internet/GnomeICU.desktop:2
+msgid "GNOMEICU"
+msgstr "GNOMEICU"
+
+#. GenericName
+#: Internet/GnomeICU.desktop:3 Internet/licq.desktop:3
+msgid "ICQ Messenger"
+msgstr "Mensajería instantánea ICQ"
+
+#. Name
+#: Internet/Netscapemessenger.desktop:2
+msgid "Netscape Messenger"
+msgstr "Netscape Messenger"
+
+#. Name
+#: Internet/Nmapfe.desktop:2
+msgid "Nmapfe"
+msgstr "Nmapfe"
+
+#. GenericName
+#: Internet/Nmapfe.desktop:3
+msgid "Port Scanner"
+msgstr "Explorador de puertos"
+
+#. Name
+#: Internet/Pan.desktop:2
+msgid "Pan"
+msgstr "Pan"
+
+#. GenericName
+#: Internet/Pan.desktop:3 Internet/knews.desktop:3
+msgid "Usenet News Reader"
+msgstr "Lector de noticias de Usenet"
+
+#. Name
+#: Internet/Sylpheed.desktop:2
+msgid "Sylpheed"
+msgstr "Sylpheed"
+
+#. Name
+#: Internet/Terminal/Links.desktop:2
+msgid "Links"
+msgstr "Enlaces"
+
+#. Name
+#: Internet/Terminal/Lynx.desktop:2
+msgid "Lynx"
+msgstr "Lynx"
+
+#. Name
+#: Internet/Terminal/btdownloadcurses.desktop:2
+msgid "BitTorrent Python Curses GUI"
+msgstr "Interfaz gráfica de usuario de BitTorrent Python Curses"
+
+#. GenericName
+#: Internet/Terminal/btdownloadcurses.desktop:3
+#: Internet/btdownloadgui.desktop:3
+msgid "BitTorrent GUI"
+msgstr "BitTorrent GUI"
+
+#. Name
+#: Internet/Terminal/lftp.desktop:2
+msgid "Lftp"
+msgstr "Lftp"
+
+#. GenericName
+#: Internet/Terminal/lftp.desktop:3 Internet/Terminal/ncftp.desktop:3
+msgid "FTP Client"
+msgstr "Cliente FTP"
+
+#. Name
+#: Internet/Terminal/mutt.desktop:2
+msgid "Mutt"
+msgstr "Mutt"
+
+#. Name
+#: Internet/Terminal/ncftp.desktop:2
+msgid "NcFTP"
+msgstr "NcFTP"
+
+#. Name
+#: Internet/Terminal/pine.desktop:2
+msgid "Pine"
+msgstr "PINE"
+
+#. Name
+#: Internet/Terminal/silc.desktop:2
+msgid "Silc"
+msgstr "Silc"
+
+#. GenericName
+#: Internet/Terminal/silc.desktop:3
+msgid "SILC Client"
+msgstr "Cliente SILC"
+
+#. Name
+#: Internet/Terminal/slrn.desktop:2
+msgid "Slrn"
+msgstr "Slrn"
+
+#. GenericName
+#: Internet/Terminal/slrn.desktop:3
+msgid "News Reader"
+msgstr "Lector de noticias"
+
+#. Name
+#: Internet/Terminal/w3m.desktop:2
+msgid "w3m"
+msgstr "w3m"
+
+#. Name
+#: Internet/arena.desktop:2
+msgid "Arena"
+msgstr "Arena"
+
+#. Name
+#: Internet/balsa.desktop:2
+msgid "Balsa"
+msgstr "Balsa"
+
+#. Name
+#: Internet/btdownloadgui.desktop:2
+msgid "BitTorrent Python wxGTK GUI"
+msgstr "Interfaz gráfica de usuario wxGTK de BitTorrent Python"
+
+#. Name
+#: Internet/coolmail.desktop:2
+msgid "Coolmail"
+msgstr "Coolmail"
+
+#. Name
+#: Internet/dc_gui.desktop:2
+msgid "DCTC GUI"
+msgstr "Interfaz GUI DCTC"
+
+#. GenericName
+#: Internet/dc_gui.desktop:3
+msgid "Direct Connect Clone"
+msgstr "Clon de Direct Connect"
+
+#. Name
+#: Internet/ed2k_gui.desktop:2
+msgid "eDonkey2000 GTK+ Core Controller"
+msgstr "Controlador central eDonkey2000 GTK+"
+
+#. GenericName
+#: Internet/ed2k_gui.desktop:3
+msgid "eDonkey2000 GUI"
+msgstr "GUI eDonkey2000"
+
+#. Name
+#: Internet/epiphany.desktop:2
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#. Name
+#: Internet/ethereal.desktop:2
+msgid "Ethereal"
+msgstr "Ethereal"
+
+#. GenericName
+#: Internet/ethereal.desktop:3 Internet/wireshark.desktop:3
+msgid "Network Analyzer"
+msgstr "Analizador de redes"
+
+#. Name
+#: Internet/gFTP.desktop:2
+msgid "gFTP"
+msgstr "gFTP"
+
+#. Name
+#: Internet/gaim.desktop:2
+msgid "Gaim"
+msgstr "Gaim"
+
+#. Name
+#: Internet/gnomemeeting.desktop:2
+msgid "GnomeMeeting"
+msgstr "GnomeMeeting"
+
+#. GenericName
+#: Internet/gnomemeeting.desktop:3
+msgid "Video Conferencing"
+msgstr "Video conferencia"
+
+#. Name
+#: Internet/gnometalk.desktop:2
+msgid "GNOME Talk"
+msgstr "GNOME Talk"
+
+#. Name
+#: Internet/gtelnet.desktop:2
+msgid "GNOME Telnet"
+msgstr "GNOME Telnet"
+
+#. GenericName
+#: Internet/gtelnet.desktop:3
+msgid "Remote Access"
+msgstr "Acceso remoto"
+
+#. Name
+#: Internet/ickle.desktop:2
+msgid "ickle"
+msgstr "ickle"
+
+#. GenericName
+#: Internet/ickle.desktop:3
+msgid "ICQ2000 Chat"
+msgstr "Cliente ICQ2000"
+
+#. Name
+#: Internet/javaws.desktop:2
+msgid "Java Web Start"
+msgstr "Web Start Java"
+
+#. Name
+#: Internet/knews.desktop:2
+msgid "KNews"
+msgstr "KNews"
+
+#. Name
+#: Internet/licq.desktop:2
+msgid "Licq"
+msgstr "Licq"
+
+#. Name
+#: Internet/mldonkey_gui.desktop:2
+msgid "MLDonkey GTK+ Core Controller"
+msgstr "Controlador central MLDonkey GTK+"
+
+#. GenericName
+#: Internet/mldonkey_gui.desktop:3
+msgid "MLDonkey GUI"
+msgstr "MLDonkey GUI"
+
+#. Name
+#: Internet/mozilla-firefox.desktop:2
+msgid "Firefox"
+msgstr "Firefox"
+
+#. Name
+#: Internet/mozilla-thunderbird.desktop:2
+msgid "Thunderbird"
+msgstr "Thunderbird"
+
+#. Name
+#: Internet/mozilla.desktop:2
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#. Name
+#: Internet/netscape.desktop:2
+msgid "Netscape"
+msgstr "Netscape"
+
+#. Name
+#: Internet/netscape6.desktop:2
+msgid "Netscape6"
+msgstr "Netscape6"
+
+#. Name
+#: Internet/opera.desktop:2
+msgid "Opera"
+msgstr "Opera"
+
+#. Name
+#: Internet/wireshark.desktop:2
+msgid "Wireshark"
+msgstr "Wireshark"
+
+#. Name
+#: Internet/xbiff.desktop:2
+msgid "X Biff"
+msgstr "Biff para X"
+
+#. Name
+#: Internet/xchat.desktop:2
+msgid "XChat"
+msgstr "XChat"
+
+#. GenericName
+#: Internet/xchat.desktop:3
+msgid "IRC Chat"
+msgstr "Cliente IRC"
+
+#. Name
+#: Internet/xfmail.desktop:2
+msgid "XFMail"
+msgstr "XFMail"
+
+#. Name
+#: Internet/xftp.desktop:2
+msgid "X FTP"
+msgstr "FTP para X"
+
+#. Name
+#: Multimedia/Aumix.desktop:2
+msgid "Aumix"
+msgstr "Aumix"
+
+#. GenericName
+#: Multimedia/Aumix.desktop:3
+msgid "Audio Mixer"
+msgstr "Mezclador audio"
+
+#. Name
+#: Multimedia/Grip.desktop:2
+msgid "Grip"
+msgstr "Grip"
+
+#. GenericName
+#: Multimedia/Grip.desktop:3
+msgid "CD Player/Ripper"
+msgstr "Reproductor/Rippeador de CD"
+
+#. Name
+#: Multimedia/MP3info.desktop:2
+msgid "MP3 Info"
+msgstr "Información de MP3"
+
+#. Name
+#: Multimedia/XMovie.desktop:2
+msgid "XMovie"
+msgstr "XMovie"
+
+#. GenericName
+#: Multimedia/XMovie.desktop:3 Multimedia/mplayer.desktop:3
+#: Multimedia/mtv.desktop:3 Multimedia/realplayer.desktop:3
+#: Multimedia/xine.desktop:3
+msgid "Video Player"
+msgstr "Reproductor de video"
+
+#. Name
+#: Multimedia/alevt.desktop:2
+msgid "AleVT"
+msgstr "AleVT"
+
+#. GenericName
+#: Multimedia/alevt.desktop:3
+msgid "VideoText Viewer"
+msgstr "Visor de teletexto"
+
+#. Name
+#: Multimedia/alsamixergui.desktop:2
+msgid "AlsaMixerGui"
+msgstr "AlsaMixerGui"
+
+#. GenericName
+#: Multimedia/alsamixergui.desktop:3
+msgid "Alsa Mixer Frontend"
+msgstr "Entorno de mezclador de Alsa"
+
+#. Name
+#: Multimedia/audacity.desktop:2
+msgid "Audacity"
+msgstr "Audacity"
+
+#. GenericName
+#: Multimedia/audacity.desktop:3 Multimedia/rezound.desktop:3
+#: Multimedia/sweep.desktop:3
+msgid "Audio Editor"
+msgstr "Editor de audio"
+
+#. Name
+#: Multimedia/aviplay.desktop:2
+msgid "Aviplay"
+msgstr "Aviplay"
+
+#. GenericName
+#: Multimedia/aviplay.desktop:3
+msgid "AVI Video Player"
+msgstr "Reproductor de vídeo AVI"
+
+#. Name
+#: Multimedia/bcast2000.desktop:2
+msgid "Broadcast 2000"
+msgstr "Broadcast 2000"
+
+#. GenericName
+#: Multimedia/bcast2000.desktop:3
+msgid "Audio and Video IDE"
+msgstr "IDE de audio y video"
+
+#. Name
+#: Multimedia/enjoympeg.desktop:2
+msgid "EnjoyMPEG"
+msgstr "EnjoyMPEG"
+
+#. GenericName
+#: Multimedia/enjoympeg.desktop:3 Multimedia/gtv.desktop:3
+msgid "MPEG Player"
+msgstr "Reproductor MPEG"
+
+#. Name
+#: Multimedia/gtv.desktop:2
+msgid "GTV"
+msgstr "GTV"
+
+#. Name
+#: Multimedia/jazz.desktop:2
+msgid "Jazz"
+msgstr "Jazz"
+
+#. GenericName
+#: Multimedia/jazz.desktop:3
+msgid "Sound Processor"
+msgstr "Procesador de sonidos"
+
+#. Name
+#: Multimedia/mplayer.desktop:2
+msgid "MPlayer"
+msgstr "MPlayer"
+
+#. Name
+#: Multimedia/mtv.desktop:2
+msgid "MpegTV"
+msgstr "MpegTV"
+
+#. Name
+#: Multimedia/ogle.desktop:2
+msgid "Ogle"
+msgstr "Ogle"
+
+#. GenericName
+#: Multimedia/ogle.desktop:3
+msgid "DVD Player"
+msgstr "Reproductor de DVDs"
+
+#. Name
+#: Multimedia/oqtplayer.desktop:2
+msgid "OQTPlayer"
+msgstr "OQTPlayer"
+
+#. GenericName
+#: Multimedia/oqtplayer.desktop:3
+msgid "MOV Video Player"
+msgstr "Reproductor de vídeo MOV"
+
+#. Name
+#: Multimedia/realplayer.desktop:2
+msgid "RealPlayer"
+msgstr "RealPlayer"
+
+#. Name
+#: Multimedia/rezound.desktop:2
+msgid "reZound"
+msgstr "reZound"
+
+#. Name
+#: Multimedia/slab.desktop:2
+msgid "Slab"
+msgstr "Slab"
+
+#. GenericName
+#: Multimedia/slab.desktop:3
+msgid "Audio Recorder"
+msgstr "Grabador de audio"
+
+#. Name
+#: Multimedia/sweep.desktop:2
+msgid "Sweep"
+msgstr "Sweep"
+
+#. Name
+#: Multimedia/xawtv.desktop:2
+msgid "XawTV"
+msgstr "XawTV"
+
+#. GenericName
+#: Multimedia/xawtv.desktop:3
+msgid "Watch TV!"
+msgstr "¡Mirá la televisión!"
+
+#. Name
+#: Multimedia/xcam.desktop:2
+msgid "XCam"
+msgstr "XCam"
+
+#. GenericName
+#: Multimedia/xcam.desktop:3
+msgid "Camera Program"
+msgstr "Programa de cámara"
+
+#. Name
+#: Multimedia/xine.desktop:2
+msgid "Xine"
+msgstr "Xine"
+
+#. Name
+#: Multimedia/xmms-enqueue.desktop:2
+msgid "Enqueue in XMMS"
+msgstr "Encolar en XMMS"
+
+#. GenericName
+#: Multimedia/xmms-enqueue.desktop:3
+msgid "Playlist Tool"
+msgstr "Herramienta de lista de reproducción"
+
+#. Name
+#: Multimedia/xmms.desktop:2
+msgid "XMMS"
+msgstr "XMMS"
+
+#. GenericName
+#: Multimedia/xmms.desktop:3
+msgid "Multimedia Player"
+msgstr "Reproductor multimedia"
+
+#. Name
+#: Office/Applix.desktop:2
+msgid "Applix"
+msgstr "Applix"
+
+#. GenericName
+#: Office/Applix.desktop:3
+msgid "Office Suite"
+msgstr "Suite de ofimática"
+
+#. Name
+#: Office/Dia.desktop:2
+msgid "Dia"
+msgstr "Dia"
+
+#. GenericName
+#: Office/Dia.desktop:3 Office/Guppi.desktop:3
+msgid "Program for Diagrams"
+msgstr "Generador de diagramas"
+
+#. Name
+#: Office/Gnome-Cal.desktop:2
+msgid "GNOME-Cal"
+msgstr "GNOME-Cal"
+
+#. GenericName
+#: Office/Gnome-Cal.desktop:3
+msgid "Personal Calendar"
+msgstr "Calendario personal"
+
+#. Name
+#: Office/Gnome-Card.desktop:2
+msgid "GNOME-Card"
+msgstr "GNOME-Card"
+
+#. GenericName
+#: Office/Gnome-Card.desktop:3
+msgid "Contact Manager"
+msgstr "Gestor de contactos"
+
+#. Name
+#: Office/GnomeTimeTracker.desktop:2
+msgid "GNOME Time Tracker"
+msgstr "Rastreador de tiempo de GNOME"
+
+#. Name
+#: Office/Gnumeric.desktop:2
+msgid "Gnumeric"
+msgstr "Gnumeric"
+
+#. GenericName
+#: Office/Gnumeric.desktop:3 Office/XsLite.desktop:3
+msgid "Spread Sheet"
+msgstr "Hoja de cálculo"
+
+#. Name
+#: Office/Guppi.desktop:2
+msgid "Guppi"
+msgstr "Guppi"
+
+#. Name
+#: Office/Ical.desktop:2
+msgid "Ical"
+msgstr "Ical"
+
+#. GenericName
+#: Office/Ical.desktop:3
+msgid "Calendar Program"
+msgstr "Programa de calendarios"
+
+#. Name
+#: Office/WordPerfect.desktop:2
+msgid "WordPerfect"
+msgstr "WordPerfect"
+
+#. GenericName
+#: Office/WordPerfect.desktop:3 Office/WordPerfect2000.desktop:3
+#: Office/abiword.desktop:3 Office/lyx.desktop:3
+msgid "Word Processor"
+msgstr "Procesador de textos"
+
+#. Name
+#: Office/WordPerfect2000.desktop:2
+msgid "WordPerfect 2000"
+msgstr "WordPerfect 2000"
+
+#. Name
+#: Office/XAcc.desktop:2
+msgid "xacc"
+msgstr "Xacc"
+
+#. GenericName
+#: Office/XAcc.desktop:3
+msgid "Personal Accounting Tool"
+msgstr "Herramienta de contabilidad personal"
+
+#. Name
+#: Office/XsLite.desktop:2
+msgid "XsLite"
+msgstr "XsLite"
+
+#. Name
+#: Office/abiword.desktop:2
+msgid "AbiWord"
+msgstr "AbiWord"
+
+#. Name
+#: Office/acroread.desktop:2
+msgid "Acrobat Reader"
+msgstr "Acrobat Reader"
+
+#. GenericName
+#: Office/acroread.desktop:3 Office/xpdf.desktop:3
+msgid "PDF Viewer"
+msgstr "Visor de documentos PDF"
+
+#. Name
+#: Office/gnucash.desktop:2
+msgid "GnuCash"
+msgstr "GnuCash"
+
+#. GenericName
+#: Office/gnucash.desktop:3
+msgid "Finance Manager"
+msgstr "Gestor de finanzas"
+
+#. Name
+#: Office/lyx.desktop:2
+msgid "LyX"
+msgstr "LyX"
+
+#. Name
+#: Office/mrproject.desktop:2
+msgid "MrProject"
+msgstr "MrProject"
+
+#. GenericName
+#: Office/mrproject.desktop:3
+msgid "Project Manager"
+msgstr "Gestor de proyectos"
+
+#. Name
+#: Office/netscapeaddressbook.desktop:2
+msgid "Netscape Addressbook"
+msgstr "Netscape Adressbook"
+
+#. Name
+#: Office/plan.desktop:2
+msgid "Plan"
+msgstr "Plan"
+
+#. GenericName
+#: Office/plan.desktop:3
+msgid "Calendar Manager"
+msgstr "Gestor de calendarios"
+
+#. Name
+#: Office/pybliographic.desktop:2
+msgid "Pybliographic"
+msgstr "Pybliographic"
+
+#. GenericName
+#: Office/pybliographic.desktop:3
+msgid "Bibliographic Database"
+msgstr "Base de datos bibliográfica"
+
+#. Name
+#: Office/scribus.desktop:2
+msgid "Scribus"
+msgstr "Scribus"
+
+#. GenericName
+#: Office/scribus.desktop:3
+msgid "Desktop Publishing"
+msgstr "Diseño editorial"
+
+#. Name
+#: Office/xpdf.desktop:2
+msgid "X PDF"
+msgstr "PDF para X"
+
+#. Name
+#: System/Terminal/aterm.desktop:2
+msgid "Terminal"
+msgstr "Terminal"
+
+#. GenericName
+#: System/Terminal/aterm.desktop:3 Utilities/XUtilities/xterm.desktop:3
+msgid "Terminal Program"
+msgstr "Programa de terminal"
+
+#. Name
+#: System/Terminal/procinfo.desktop:2
+msgid "Procinfo"
+msgstr "Procinfo"
+
+#. GenericName
+#: System/Terminal/procinfo.desktop:3
+msgid "System Process Information"
+msgstr "Información sobre procesos del sistema"
+
+#. Name
+#: System/Terminal/rxvt.desktop:2
+msgid "RXVT"
+msgstr "RXVT"
+
+#. GenericName
+#: System/Terminal/rxvt.desktop:3
+msgid "ouR eXtended Virtual Terminal"
+msgstr "Nuestro terminal virtual extendido"
+
+#. Name
+#: System/Terminal/vmstat.desktop:2
+msgid "Vmstat"
+msgstr "Vmstat"
+
+#. GenericName
+#: System/Terminal/vmstat.desktop:3
+msgid "Virtual Memory Statistics"
+msgstr "Estadísticas de memoria virtual"
+
+#. Name
+#: System/citrix_ica.desktop:2
+msgid "Citrix ICA Client"
+msgstr "Cliente Citrix ICA"
+
+#. GenericName
+#: System/citrix_ica.desktop:3
+msgid "WTS Client"
+msgstr "Cliente WTS"
+
+#. Name
+#: System/editres.desktop:2
+msgid "EditXRes"
+msgstr "EditXRes"
+
+#. GenericName
+#: System/editres.desktop:3
+msgid "X Resource Editor"
+msgstr "Editor X de recursos"
+
+#. Name
+#: System/sam.desktop:2
+msgid "SAM System-Administration"
+msgstr "Administración del sistema SAM"
+
+#. Name
+#: System/wine.desktop:2
+msgid "Wine"
+msgstr "Wine"
+
+#. GenericName
+#: System/wine.desktop:3
+msgid "Run Windows Programs"
+msgstr "Ejecución de programas de Windows"
+
+#. Name
+#: System/xosview.desktop:2
+msgid "X osview"
+msgstr "Xosview"
+
+#. GenericName
+#: System/xosview.desktop:3
+msgid "System Monitor"
+msgstr "Monitor del sistema"
+
+#. Name
+#: Utilities/Editors/emacs.desktop:2
+msgid "Emacs"
+msgstr "GNU Emacs"
+
+#. GenericName
+#: Utilities/Editors/emacs.desktop:3 Utilities/Editors/gedit.desktop:3
+#: Utilities/Editors/gvim.desktop:3 Utilities/Editors/lemacs.desktop:3
+#: Utilities/Editors/nano.desktop:3 Utilities/Editors/nedit.desktop:3
+#: Utilities/Editors/pico.desktop:3 Utilities/Editors/xedit.desktop:3
+#: Utilities/Editors/xemacs.desktop:3
+msgid "Text Editor"
+msgstr "Editor de texto"
+
+#. Name
+#: Utilities/Editors/gedit.desktop:2
+msgid "gEdit"
+msgstr "gEdit"
+
+#. Name
+#: Utilities/Editors/gvim.desktop:2
+msgid "Vi IMproved"
+msgstr "Vi IMproved"
+
+#. Name
+#: Utilities/Editors/lemacs.desktop:2
+msgid "Lucid Emacs"
+msgstr "Lucid Emacs"
+
+#. Name
+#: Utilities/Editors/nano.desktop:2
+msgid "Nano"
+msgstr "Nano"
+
+#. Name
+#: Utilities/Editors/nedit.desktop:2
+msgid "Nedit"
+msgstr "Nedit"
+
+#. Name
+#: Utilities/Editors/pico.desktop:2
+msgid "Pico"
+msgstr "Pico"
+
+#. Name
+#: Utilities/Editors/xedit.desktop:2
+msgid "X Editor"
+msgstr "Editor de X"
+
+#. Name
+#: Utilities/Editors/xemacs.desktop:2
+msgid "X Emacs"
+msgstr "XEmacs"
+
+#. Name
+#: Utilities/GKrellM.desktop:2
+msgid "GKrellM"
+msgstr "GKrellM"
+
+#. GenericName
+#: Utilities/GKrellM.desktop:3
+msgid "GNU Krell Monitors"
+msgstr "Monitores Krell GNU"
+
+#. Name
+#: Utilities/GnomeWho.desktop:2
+msgid "GNOME Who"
+msgstr "GNOME Who"
+
+#. GenericName
+#: Utilities/GnomeWho.desktop:3
+msgid "System Info Tool"
+msgstr "Info del sistema"
+
+#. Name
+#: Utilities/SystemInfo.desktop:2
+msgid "System Info"
+msgstr "Información del sistema"
+
+#. Name
+#: Utilities/SystemLogViewer.desktop:2
+msgid "System Log Viewer"
+msgstr "Visor de registro del sistema"
+
+#. Name
+#: Utilities/XUtilities/Xkill.desktop:2
+msgid "X Kill"
+msgstr "X Kill"
+
+#. GenericName
+#: Utilities/XUtilities/Xkill.desktop:3
+msgid "Window Termination Tool"
+msgstr "Herramienta de terminación de ventana"
+
+#. Name
+#: Utilities/XUtilities/Xrefresh.desktop:2
+msgid "X Refresh"
+msgstr "X Refresh"
+
+#. GenericName
+#: Utilities/XUtilities/Xrefresh.desktop:3
+msgid "Refresh Screen"
+msgstr "Refrescar pantalla"
+
+#. Name
+#: Utilities/XUtilities/Xtraceroute.desktop:2
+msgid "X Traceroute"
+msgstr "X Traceroute"
+
+#. GenericName
+#: Utilities/XUtilities/Xtraceroute.desktop:3
+msgid "Network Tool"
+msgstr "Herramienta de redes"
+
+#. Name
+#: Utilities/XUtilities/xcalc.desktop:2
+msgid "X Calc"
+msgstr "Calculadora de X"
+
+#. GenericName
+#: Utilities/XUtilities/xcalc.desktop:3 Utilities/calctool.desktop:3
+msgid "Calculator"
+msgstr "Calculadora"
+
+#. Name
+#: Utilities/XUtilities/xclipboard.desktop:2
+msgid "X Clipboard"
+msgstr "Portapapeles de X"
+
+#. GenericName
+#: Utilities/XUtilities/xclipboard.desktop:3
+msgid "Clipboard Viewer"
+msgstr "Visor del portapapeles"
+
+#. Name
+#: Utilities/XUtilities/xclock.desktop:2
+msgid "X Clock"
+msgstr "Reloj de X"
+
+#. GenericName
+#: Utilities/XUtilities/xclock.desktop:3 Utilities/oclock.desktop:3
+msgid "Clock"
+msgstr "Reloj"
+
+#. Name
+#: Utilities/XUtilities/xconsole.desktop:2
+msgid "X Console"
+msgstr "Consola X"
+
+#. GenericName
+#: Utilities/XUtilities/xconsole.desktop:3
+msgid "Console Message Viewer"
+msgstr "Visor de mensajes de consola"
+
+#. Name
+#: Utilities/XUtilities/xload.desktop:2
+msgid "X Load"
+msgstr "X Load"
+
+#. GenericName
+#: Utilities/XUtilities/xload.desktop:3
+msgid "Monitors System Load"
+msgstr "Monitoriza la carga del sistema"
+
+#. Name
+#: Utilities/XUtilities/xmag.desktop:2
+msgid "X Magnifier"
+msgstr "Ampliador X"
+
+#. GenericName
+#: Utilities/XUtilities/xmag.desktop:3
+msgid "Desktop Magnifier"
+msgstr "Ampliador del escritorio"
+
+#. Name
+#: Utilities/XUtilities/xterm.desktop:2
+msgid "X Terminal"
+msgstr "Terminal X"
+
+#. Name
+#: Utilities/calctool.desktop:2
+msgid "Calctool"
+msgstr "Calctool"
+
+#. Name
+#: Utilities/e-notes.desktop:2
+msgid "E-Notes"
+msgstr "E-Notes"
+
+#. GenericName
+#: Utilities/e-notes.desktop:3
+msgid "Personal Notes"
+msgstr "Notas personales"
+
+#. Name
+#: Utilities/oclock.desktop:2
+msgid "OClock"
+msgstr "OClock"
+
+#. Name
+#: Utilities/xgnokii.desktop:2
+msgid "X-Gnokii"
+msgstr "X-Gnokii"
+
+#. GenericName
+#: Utilities/xgnokii.desktop:3
+msgid "Mobile Phone Management Tool"
+msgstr "Herramienta de gestión del teléfono celular"
diff --git a/translations/desktop_files/kappfinder-data/ka.po b/translations/desktop_files/kappfinder-data/ka.po
index 7e5e49a8e..fe74bac30 100644
--- a/translations/desktop_files/kappfinder-data/ka.po
+++ b/translations/desktop_files/kappfinder-data/ka.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Development/Forte.desktop:2
 msgid "Forte"
-msgstr ""
+msgstr "ფ�რტე"
 
 #. GenericName
 #: Development/Forte.desktop:3
 msgid "Java IDE"
-msgstr ""
+msgstr "Java IDE"
 
 #. Name
 #: Development/assistant.desktop:2
@@ -39,17 +40,17 @@ msgstr "დ�კუმენტის ბრ�უზერი"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
 msgid "Data Display Debugger"
-msgstr "ეკრ�ნის მ�ნ�ცემთ� შემსწ�რებელი"
+msgstr "ეკრ�ნის მ�ნ�ცემთ� გ�მმ�რთ�ვი"
 
 #. Name
 #: Development/designer.desktop:2
 msgid "Qt Designer"
-msgstr "Qt დიზ�ინერი"
+msgstr "Qt Designer"
 
 #. GenericName
 #: Development/designer.desktop:3
@@ -58,9 +59,8 @@ msgstr "ინტერფეისის დიზ�ინერი"
 
 #. Name
 #: Development/dlgedit.desktop:2
-#, fuzzy
 msgid "Qt DlgEdit"
-msgstr "დი�ლ�გის რედ�ქტ�რი"
+msgstr "Qt-ის დი�ლ�გების რედ�ქტ�რი"
 
 #. GenericName
 #: Development/dlgedit.desktop:3
@@ -70,22 +70,22 @@ msgstr "დი�ლ�გის რედ�ქტ�რი"
 #. Name
 #: Development/eclipse.desktop:3
 msgid "Eclipse"
-msgstr ""
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
 msgid "Eclipse IDE"
-msgstr ""
+msgstr "Eclipse IDE"
 
 #. Name
 #: Development/fdesign.desktop:2
 msgid "FormDesigner"
-msgstr "ფ�რმ�თ� დიზ�ინერი"
+msgstr "ფ�რმების დიზ�ინერი"
 
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -100,12 +100,12 @@ msgstr "Qt ლინგვისტი"
 #. GenericName
 #: Development/linguist.desktop:3
 msgid "Translation Tool"
-msgstr "ს�თ�რგმნი ხელს�წყ�"
+msgstr "თ�რგმ�ნის პრ�გრ�მ�"
 
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -115,17 +115,17 @@ msgstr "Palm/Wireless–ის ემულ�ტ�რი"
 #. Name
 #: Development/sced.desktop:2
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
 msgid "Scene Modeler"
-msgstr ""
+msgstr "სცენების მ�დელერი"
 
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
 msgid "ClanBomber"
-msgstr ""
+msgstr "ClanBomber"
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -136,42 +136,42 @@ msgstr ""
 #: Games/Board/Gataxx.desktop:3 Games/Board/Gnotravex.desktop:3
 #: Games/penguin-command.desktop:4
 msgid "Arcade Game"
-msgstr "Arcade თ�მ�შები"
+msgstr "�რკ�დული თ�მ�შები"
 
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
 msgid "Frozen Bubble"
-msgstr ""
+msgstr "გ�ყინული ბუშტი"
 
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
 msgid "Tetris-Like Game"
-msgstr "თეთრისის მსგ�ვსი თ�მ�შები"
+msgstr "ტეტრისის მსგ�ვსი თ�მ�შები"
 
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
 msgid "GNOME Nibbles Game"
-msgstr "თ�მ�ში GNOME  Nibbles"
+msgstr "თ�მ�ში GNOME Nibbles"
 
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
 msgid "Gnobots II"
-msgstr ""
+msgstr "Gnobots II"
 
 #. Name
 #: Games/Arcade/Mures.desktop:2
 msgid "Mures"
-msgstr ""
+msgstr "Mures"
 
 #. Name
 #: Games/Arcade/SuperMethaneBrothers.desktop:2
 msgid "Super Methane Brothers"
-msgstr ""
+msgstr "სუპერმეთ�ნი ძმები"
 
 #. Name
 #: Games/Arcade/Trophy.desktop:2
@@ -181,32 +181,32 @@ msgstr "ჯილდ�"
 #. Name
 #: Games/Arcade/TuxRacer.desktop:2
 msgid "TuxRacer"
-msgstr "Tux რბ�ლ�"
+msgstr "TuxRacer"
 
 #. GenericName
 #: Games/Arcade/TuxRacer.desktop:3
 msgid "Racing Game"
-msgstr "თ�მ�ში რბ�ლ�"
+msgstr "რბ�ლ�"
 
 #. Name
 #: Games/Arcade/XKobo.desktop:2
 msgid "XKobo"
-msgstr ""
+msgstr "XKobo"
 
 #. Name
 #: Games/Arcade/XSoldier.desktop:2
 msgid "XSoldier"
-msgstr ""
+msgstr "XSoldier"
 
 #. Name
 #: Games/Arcade/alephone-nogl.desktop:2
 msgid "Alephone"
-msgstr ""
+msgstr "Alephone"
 
 #. Comment
 #: Games/Arcade/alephone-nogl.desktop:3
 msgid "An open source version of Marathon Infinity for SDL"
-msgstr "Marathon Infinity–ს ღი� კ�დის ვერსი� SDL–ის�თვის"
+msgstr "Marathon Infinity–ს ღი� კ�დის მქ�ნე ვერსი� SDL–ის�თვის"
 
 #. Name
 #: Games/Arcade/alephone.desktop:2
@@ -229,37 +229,37 @@ msgstr "ბ�ტ�ლი�ნი"
 #. Name
 #: Games/Arcade/battleball.desktop:2
 msgid "Battleball"
-msgstr ""
+msgstr "Battleball"
 
 #. GenericName
 #: Games/Arcade/battleball.desktop:3
 msgid "Ball Game"
-msgstr "თ�მ�შები ბურთით"
+msgstr "თ�მ�ში ბურთით"
 
 #. Name
 #: Games/Arcade/cxhextris.desktop:2
 msgid "cxhextris"
-msgstr ""
+msgstr "cxhextris"
 
 #. Name
 #: Games/Arcade/rocksndiamonds.desktop:2
 msgid "Rocks n Diamonds"
-msgstr ""
+msgstr "ქვები დ� �ლმ�სები"
 
 #. GenericName
 #: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
 msgid "Tactical Game"
-msgstr "ტ�ქტიკური თ�მ�შები"
+msgstr "ტ�ქტიკური თ�მ�ში"
 
 #. Name
 #: Games/Arcade/scavenger.desktop:2
 msgid "Scavenger"
-msgstr ""
+msgstr "Scavenger"
 
 #. Name
 #: Games/Board/Gataxx.desktop:2
 msgid "Gataxx"
-msgstr ""
+msgstr "Gataxx"
 
 #. Name
 #: Games/Board/Gchess.desktop:2
@@ -269,7 +269,7 @@ msgstr "GNOME ჭ�დრ�კი"
 #. Name
 #: Games/Board/Glines.desktop:2
 msgid "Glines"
-msgstr ""
+msgstr "Glines"
 
 #. Name
 #: Games/Board/Gmahjongg.desktop:2
@@ -279,7 +279,7 @@ msgstr "GNOME მ�-ჯ�ნგი"
 #. GenericName
 #: Games/Board/Gmahjongg.desktop:3
 msgid "Tile Game"
-msgstr "თ�მ�შები ფილებით"
+msgstr "თ�მ�ში ფილებით"
 
 #. Name
 #: Games/Board/Gmines.desktop:2
@@ -289,17 +289,17 @@ msgstr "GNOME გ�მნ�ღმვნელი"
 #. GenericName
 #: Games/Board/Gmines.desktop:3
 msgid "Logic Game"
-msgstr "თ�მ�შები ლ�გიკ�ზე "
+msgstr "ლ�გიკური თ�მ�ში"
 
 #. Name
 #: Games/Board/Gnotravex.desktop:2
 msgid "Gnotravex"
-msgstr ""
+msgstr "Gnotravex"
 
 #. Name
 #: Games/Board/Gnotski.desktop:2
 msgid "Gnotski"
-msgstr ""
+msgstr "Gnotski"
 
 #. GenericName
 #: Games/Board/Gnotski.desktop:3
@@ -314,7 +314,7 @@ msgstr "GNOME ქვები"
 #. Name
 #: Games/Board/Iagno.desktop:2
 msgid "Iagno"
-msgstr ""
+msgstr "Iagno"
 
 #. GenericName
 #: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
@@ -325,18 +325,17 @@ msgstr "ს�მ�გიდ� თ�მ�შები"
 #. Name
 #: Games/Board/SameGnome.desktop:2
 msgid "Same GNOME"
-msgstr ""
+msgstr "Same GNOME"
 
 #. Name
 #: Games/Board/Xgammon.desktop:2
 msgid "Xgammon"
-msgstr ""
+msgstr "Xgammon"
 
 #. Name
 #: Games/Board/xboard.desktop:2
-#, fuzzy
 msgid "Xboard"
-msgstr "X გ�ცვლის ბუფერი"
+msgstr "Xboard"
 
 #. GenericName
 #: Games/Board/xboard.desktop:3
@@ -346,39 +345,38 @@ msgstr "ჭ�დრ�კი"
 #. Name
 #: Games/Card/AisleRiot.desktop:2
 msgid "AisleRiot"
-msgstr ""
+msgstr "AisleRiot"
 
 #. GenericName
 #: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
 #: Games/Card/PySol.desktop:3 Games/Card/XPat2.desktop:3
 msgid "Card Game"
-msgstr "თ�მ�შები ბ�ნქ�თი"
+msgstr "ბ�ნქ�ს თ�მ�ში"
 
 #. Name
 #: Games/Card/FreeCell.desktop:2
 msgid "FreeCell"
-msgstr ""
+msgstr "FreeCell"
 
 #. Name
 #: Games/Card/PySol.desktop:2
 msgid "PySol"
-msgstr ""
+msgstr "PySol"
 
 #. Name
 #: Games/Card/XPat2.desktop:2
 msgid "XPat 2"
-msgstr ""
+msgstr "XPat 2"
 
 #. Name
 #: Games/Clanbomber.desktop:2
 msgid "Clanbomber"
-msgstr ""
+msgstr "Clanbomber"
 
 #. Name
 #: Games/Emulators/cmail.desktop:2
-#, fuzzy
 msgid "ChessMail"
-msgstr "ჭ�დრ�კი"
+msgstr "ChessMail"
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -388,27 +386,27 @@ msgstr "ელფ�სტ� ჭ�დრ�კის�თვის"
 #. Name
 #: Games/Emulators/qmamecat.desktop:2
 msgid "Qmamecat"
-msgstr ""
+msgstr "Qmamecat"
 
 #. GenericName
 #: Games/Emulators/qmamecat.desktop:3
 msgid "Arcade Emulator"
-msgstr "ემულ�ტ�რი Arcade თ�მ�შების�თვის"
+msgstr "ემულ�ტ�რი �რკ�დებისთვის"
 
 #. Name
 #: Games/GTali.desktop:2
 msgid "GTali"
-msgstr ""
+msgstr "GTali"
 
 #. GenericName
 #: Games/GTali.desktop:3
 msgid "Dice Game"
-msgstr "თ�მ�შები კ�მ�თელით"
+msgstr "თ�მ�შები კ�მ�თლით"
 
 #. Name
 #: Games/Roguelikes/angband.desktop:2
 msgid "Angband"
-msgstr ""
+msgstr "Angband"
 
 #. Comment
 #: Games/Roguelikes/angband.desktop:3
@@ -428,7 +426,7 @@ msgstr "გ�ემ�რთეთ მ�რი�ში დ� დ��მ�
 #. Name
 #: Games/Roguelikes/nethack.desktop:2
 msgid "NetHack"
-msgstr ""
+msgstr "NetHack"
 
 #. GenericName
 #: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
@@ -438,23 +436,22 @@ msgstr "ს�თ�ვგ�დ�ს�ვლ� თ�მ�შები"
 #. Name
 #: Games/Roguelikes/rogue.desktop:2
 msgid "Rogue"
-msgstr ""
+msgstr "Rogue"
 
 #. GenericName
 #: Games/Roguelikes/rogue.desktop:3
-#, fuzzy
 msgid "The Original"
-msgstr "ტერმინ�ლი"
+msgstr "�რიგინ�ლი"
 
 #. Name
 #: Games/Roguelikes/tome.desktop:2
 msgid "ToME"
-msgstr ""
+msgstr "ToME"
 
 #. Name
 #: Games/Roguelikes/zangband.desktop:2
 msgid "ZAngband"
-msgstr ""
+msgstr "ZAngband"
 
 #. GenericName
 #: Games/Roguelikes/zangband.desktop:3
@@ -464,7 +461,7 @@ msgstr "დ��მ�რხეთ ქ��სის გველი"
 #. Name
 #: Games/TacticStrategy/freeciv.desktop:3
 msgid "Freeciv"
-msgstr ""
+msgstr "Freeciv"
 
 #. GenericName
 #: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
@@ -484,7 +481,7 @@ msgstr "სერვერი FreeCiv–ისთვის"
 #. Name
 #: Games/TacticStrategy/xscorch.desktop:3
 msgid "XScorch"
-msgstr ""
+msgstr "XScorch"
 
 #. Comment
 #: Games/TacticStrategy/xscorch.desktop:4
@@ -494,22 +491,22 @@ msgstr "თáƒ�ვისუფáƒ�ლი კლáƒ�ნი Scorched Earth, UNIX–áƒ
 #. Name
 #: Games/Toys/xeyes.desktop:2
 msgid "X Eyes"
-msgstr ""
+msgstr "X Eyes"
 
 #. Name
 #: Games/Toys/xpinguin.desktop:2
 msgid "Tux"
-msgstr ""
+msgstr "Tux"
 
 #. GenericName
 #: Games/Toys/xpinguin.desktop:3
 msgid "Linux Mascot"
-msgstr ""
+msgstr "Linux-ის თილისმ�"
 
 #. Name
 #: Games/defendguin.desktop:3
 msgid "Defendguin"
-msgstr ""
+msgstr "Defendguin"
 
 #. GenericName
 #: Games/defendguin.desktop:4
@@ -519,17 +516,17 @@ msgstr "თ�მ�ში"
 #. Name
 #: Games/penguin-command.desktop:3
 msgid "Penguin Command"
-msgstr ""
+msgstr "პინგვინის ბრძ�ნებ�"
 
 #. Name
 #: Games/xshipwars.desktop:3
 msgid "XShipWars"
-msgstr ""
+msgstr "XShipWars"
 
 #. Name
 #: Graphics/ElectricEyes.desktop:2
 msgid "Electric Eyes"
-msgstr ""
+msgstr "ელექტრ�თვ�ლები"
 
 #. GenericName
 #: Graphics/ElectricEyes.desktop:3
@@ -539,7 +536,7 @@ msgstr "გáƒ�მáƒ�სáƒ�ხულებების სáƒ�ნáƒ�ხáƒ�ვი á
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "GPhoto"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -559,7 +556,7 @@ msgstr "ხ�ტულების რედ�ქტ�რი GNOME–ში"
 #. Name
 #: Graphics/Gqview.desktop:2
 msgid "Gqview"
-msgstr ""
+msgstr "Gqview"
 
 #. GenericName
 #: Graphics/Gqview.desktop:3
@@ -569,17 +566,17 @@ msgstr "ბრáƒ�უზერი გáƒ�მáƒ�სáƒ�ხულებების á
 #. Name
 #: Graphics/Sketch.desktop:2
 msgid "Sketch"
-msgstr ""
+msgstr "Sketch"
 
 #. GenericName
 #: Graphics/Sketch.desktop:3
 msgid "Vector-based Drawing Program"
-msgstr "პრ�გრ�მ� ვექტ�რული გრ�ფიკის�თვის"
+msgstr "პრ�გრ�მ� ვექტ�რული გრ�ფიკისთვის"
 
 #. Name
 #: Graphics/Xpcd.desktop:2
 msgid "Xpcd"
-msgstr ""
+msgstr "Xpcd"
 
 #. GenericName
 #: Graphics/Xpcd.desktop:3
@@ -589,7 +586,7 @@ msgstr "PhotoCD–ს ხელს�წყ�ები"
 #. Name
 #: Graphics/Xwpick.desktop:2
 msgid "Xwpick"
-msgstr ""
+msgstr "Xwpick"
 
 #. GenericName
 #: Graphics/Xwpick.desktop:3
@@ -599,7 +596,7 @@ msgstr "პრáƒ�გრáƒ�მáƒ� ეკრáƒ�ნის გáƒ�დáƒ�სáƒ�ღეá
 #. Name
 #: Graphics/bitmap.desktop:2
 msgid "X Bitmap"
-msgstr ""
+msgstr "X Bitmap"
 
 #. GenericName
 #: Graphics/bitmap.desktop:3
@@ -609,17 +606,17 @@ msgstr "რáƒ�სტრული გáƒ�მáƒ�სáƒ�ხულებების á
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Blender"
 
 #. GenericName
 #: Graphics/blender.desktop:3
 msgid "3D Modeler/Renderer"
-msgstr "3D მ�დელი�რი/�მს�ხველი"
+msgstr "3D მ�დელი�რი/რენდერერი"
 
 #. Name
 #: Graphics/ghostview.desktop:2
 msgid "GhostView"
-msgstr ""
+msgstr "GhostView"
 
 #. GenericName
 #: Graphics/ghostview.desktop:3
@@ -629,7 +626,7 @@ msgstr "PostScript–ის ს�ნ�ხ�ვი პრ�გრ�მ�"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "Gimp"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -639,7 +636,7 @@ msgstr "გáƒ�მáƒ�სáƒ�ხულებებთáƒ�ნ მუშáƒ�áƒ�ბიáƒ
 #. Name
 #: Graphics/gv.desktop:2
 msgid "GV"
-msgstr ""
+msgstr "GV"
 
 #. GenericName
 #: Graphics/gv.desktop:3
@@ -649,7 +646,7 @@ msgstr "პრ�გრ�მ� Postscript–ის ს�ნ�ხ�ვ�დ
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "Inkscape"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -659,12 +656,12 @@ msgstr "ვექტ�რული გრ�ფიკ�"
 #. Name
 #: Graphics/sodipodi.desktop:2
 msgid "Sodipodi"
-msgstr ""
+msgstr "Sodipodi"
 
 #. Name
 #: Graphics/tgif.desktop:2
 msgid "TGif"
-msgstr ""
+msgstr "TGif"
 
 #. GenericName
 #: Graphics/tgif.desktop:3 Graphics/xfig.desktop:3
@@ -674,22 +671,22 @@ msgstr "ს�ხ�ტ�ვი პრ�გრ�მ�"
 #. Name
 #: Graphics/xdvi.desktop:2
 msgid "X DVI"
-msgstr ""
+msgstr "X DVI"
 
 #. GenericName
 #: Graphics/xdvi.desktop:3
 msgid "DVI Viewer"
-msgstr "პრ�გრ�მ� DVI–ის ს�ნ�ხ�ვდ"
+msgstr "პრ�გრ�მ� DVI–ის ს�ნ�ხ�ვ�დ"
 
 #. Name
 #: Graphics/xfig.desktop:2
 msgid "Xfig"
-msgstr ""
+msgstr "Xfig"
 
 #. Name
 #: Graphics/xpaint.desktop:2
 msgid "X Paint"
-msgstr ""
+msgstr "X Paint"
 
 #. GenericName
 #: Graphics/xpaint.desktop:3
@@ -699,7 +696,7 @@ msgstr "ს�ხ�ტ�ვი პრ�გრ�მ�"
 #. Name
 #: Graphics/xv.desktop:2
 msgid "XV"
-msgstr ""
+msgstr "XV"
 
 #. GenericName
 #: Graphics/xv.desktop:3
@@ -709,7 +706,7 @@ msgstr "გáƒ�მáƒ�სáƒ�ხულებების სáƒ�ნáƒ�ხáƒ�ვი á
 #. Name
 #: Internet/BlueFish.desktop:2
 msgid "BlueFish"
-msgstr ""
+msgstr "BlueFish"
 
 #. GenericName
 #: Internet/BlueFish.desktop:3
@@ -719,7 +716,7 @@ msgstr "HTML რედ�ქტ�რი"
 #. Name
 #: Internet/Dpsftp.desktop:2
 msgid "Dpsftp"
-msgstr ""
+msgstr "Dpsftp"
 
 #. GenericName
 #: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3 Internet/xftp.desktop:3
@@ -729,17 +726,17 @@ msgstr "FTP-ბრ�უზერი"
 #. Name
 #: Internet/DrakSync.desktop:2
 msgid "DrakSync"
-msgstr ""
+msgstr "DrakSync"
 
 #. GenericName
 #: Internet/DrakSync.desktop:3
 msgid "Folder Synchronization"
-msgstr "ს�ქ�ღ�ლდეთ� სინქრ�ნიზებ�"
+msgstr "ს�ქ�ღ�ლდის სინქრ�ნიზებ�"
 
 #. Name
 #: Internet/Evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -747,12 +744,12 @@ msgstr ""
 #: Internet/Terminal/pine.desktop:3 Internet/balsa.desktop:3
 #: Internet/mozilla-thunderbird.desktop:3 Internet/xfmail.desktop:3
 msgid "Mail Client"
-msgstr "ფ�სტ�"
+msgstr "ელფ�სტის კლიენტი"
 
 #. Name
 #: Internet/Faces.desktop:2
 msgid "Faces"
-msgstr ""
+msgstr "Faces"
 
 #. GenericName
 #: Internet/Faces.desktop:3 Internet/coolmail.desktop:3
@@ -762,19 +759,18 @@ msgstr "ფ�სტის გ�ნგ�ში"
 
 #. Name
 #: Internet/Fetchmailconf.desktop:2
-#, fuzzy
 msgid "Fetchmailconf"
-msgstr "fetchmai–ისl  კ�ნფიგურ�ცი�"
+msgstr "fetchmai–ისl მ�რგებ�"
 
 #. GenericName
 #: Internet/Fetchmailconf.desktop:3
 msgid "Fetchmail Configuration"
-msgstr "fetchmai–ისl  კ�ნფიგურ�ცი�"
+msgstr "Fetchmai–ისl მ�რგებ�"
 
 #. Name
 #: Internet/Gabber.desktop:2
 msgid "Gabber"
-msgstr ""
+msgstr "Gabber"
 
 #. GenericName
 #: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
@@ -784,7 +780,7 @@ msgstr "მყისი შეტყ�ბინებ�"
 #. Name
 #: Internet/Galeon.desktop:2
 msgid "Galeon"
-msgstr ""
+msgstr "Galeon"
 
 #. GenericName
 #: Internet/Galeon.desktop:3 Internet/Terminal/Links.desktop:3
@@ -798,14 +794,13 @@ msgstr "ვებ–ბრ�უზერი"
 
 #. Name
 #: Internet/GnomeICU.desktop:2
-#, fuzzy
 msgid "GNOMEICU"
-msgstr "GNOME ჭ�დრ�კი"
+msgstr "GNOMEICU"
 
 #. GenericName
 #: Internet/GnomeICU.desktop:3 Internet/licq.desktop:3
 msgid "ICQ Messenger"
-msgstr "ICQ შემმტყ�ბინებელი"
+msgstr "ICQ"
 
 #. Name
 #: Internet/Netscapemessenger.desktop:2
@@ -815,7 +810,7 @@ msgstr "Netscape შემმტყ�ბინებელი"
 #. Name
 #: Internet/Nmapfe.desktop:2
 msgid "Nmapfe"
-msgstr ""
+msgstr "Nmapfe"
 
 #. GenericName
 #: Internet/Nmapfe.desktop:3
@@ -825,27 +820,27 @@ msgstr "პ�რტების სკ�ნერი"
 #. Name
 #: Internet/Pan.desktop:2
 msgid "Pan"
-msgstr ""
+msgstr "Pan"
 
 #. GenericName
 #: Internet/Pan.desktop:3 Internet/knews.desktop:3
 msgid "Usenet News Reader"
-msgstr "�ხ�ლი�მბების ს�კითხ�ვი პრ�გრ�მ�"
+msgstr "�ხ�ლი �მბების ს�კითხ�ვი პრ�გრ�მ�"
 
 #. Name
 #: Internet/Sylpheed.desktop:2
 msgid "Sylpheed"
-msgstr ""
+msgstr "Sylpheed"
 
 #. Name
 #: Internet/Terminal/Links.desktop:2
 msgid "Links"
-msgstr ""
+msgstr "ბმულები"
 
 #. Name
 #: Internet/Terminal/Lynx.desktop:2
 msgid "Lynx"
-msgstr ""
+msgstr "Lynx"
 
 #. Name
 #: Internet/Terminal/btdownloadcurses.desktop:2
@@ -856,12 +851,12 @@ msgstr "BitTorrent–ის ინტერფეისი python/curses–ზáƒ
 #: Internet/Terminal/btdownloadcurses.desktop:3
 #: Internet/btdownloadgui.desktop:3
 msgid "BitTorrent GUI"
-msgstr "გრ�ფიკული BitTorrent"
+msgstr "BitTorrent-ის გრ�ფიკული ინტერფეისი"
 
 #. Name
 #: Internet/Terminal/lftp.desktop:2
 msgid "Lftp"
-msgstr ""
+msgstr "Lftp"
 
 #. GenericName
 #: Internet/Terminal/lftp.desktop:3 Internet/Terminal/ncftp.desktop:3
@@ -871,73 +866,72 @@ msgstr "FTP კლიენტი"
 #. Name
 #: Internet/Terminal/mutt.desktop:2
 msgid "Mutt"
-msgstr ""
+msgstr "Mutt"
 
 #. Name
 #: Internet/Terminal/ncftp.desktop:2
 msgid "NcFTP"
-msgstr ""
+msgstr "NcFTP"
 
 #. Name
 #: Internet/Terminal/pine.desktop:2
 msgid "Pine"
-msgstr ""
+msgstr "Pine"
 
 #. Name
 #: Internet/Terminal/silc.desktop:2
 msgid "Silc"
-msgstr ""
+msgstr "Silc"
 
 #. GenericName
 #: Internet/Terminal/silc.desktop:3
 msgid "SILC Client"
-msgstr "SILC  კლიენტი"
+msgstr "SILC კლიენტი"
 
 #. Name
 #: Internet/Terminal/slrn.desktop:2
 msgid "Slrn"
-msgstr ""
+msgstr "Slrn"
 
 #. GenericName
 #: Internet/Terminal/slrn.desktop:3
-#, fuzzy
 msgid "News Reader"
-msgstr "�ხ�ლი�მბების ს�კითხ�ვი პრ�გრ�მ�"
+msgstr "�ხ�ლი �მბების ს�კითხ�ვი პრ�გრ�მ�"
 
 #. Name
 #: Internet/Terminal/w3m.desktop:2
 msgid "w3m"
-msgstr ""
+msgstr "w3m"
 
 #. Name
 #: Internet/arena.desktop:2
 msgid "Arena"
-msgstr ""
+msgstr "Arena"
 
 #. Name
 #: Internet/balsa.desktop:2
 msgid "Balsa"
-msgstr ""
+msgstr "Balsa"
 
 #. Name
 #: Internet/btdownloadgui.desktop:2
 msgid "BitTorrent Python wxGTK GUI"
-msgstr "გრ�ფიკული BitTorrent"
+msgstr "Python wxGTK-ზე დ�წერილი გრ�ფიკული ინტერფეისი BitTorrent-სთვის"
 
 #. Name
 #: Internet/coolmail.desktop:2
 msgid "Coolmail"
-msgstr ""
+msgstr "Coolmail"
 
 #. Name
 #: Internet/dc_gui.desktop:2
 msgid "DCTC GUI"
-msgstr ""
+msgstr "DCTC GUI"
 
 #. GenericName
 #: Internet/dc_gui.desktop:3
 msgid "Direct Connect Clone"
-msgstr "კლ�ნი Direct Connect"
+msgstr "Direct Connect-ის კლ�ნი"
 
 #. Name
 #: Internet/ed2k_gui.desktop:2
@@ -947,83 +941,82 @@ msgstr "eDonkey2000 GTK+ ბირთვის კ�ნტრ�ლერი"
 #. GenericName
 #: Internet/ed2k_gui.desktop:3
 msgid "eDonkey2000 GUI"
-msgstr "გრ�ფიკული eDonkey2000"
+msgstr "eDonkey2000-ის გრ�ფიკული ინტერფეისი"
 
 #. Name
 #: Internet/epiphany.desktop:2
 msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany"
 
 #. Name
 #: Internet/ethereal.desktop:2
 msgid "Ethereal"
-msgstr ""
+msgstr "Ethereal"
 
 #. GenericName
 #: Internet/ethereal.desktop:3 Internet/wireshark.desktop:3
 msgid "Network Analyzer"
-msgstr "ქსელის �ნ�ლიზ�ტ�რი"
+msgstr "ქსელის �ნ�ლიზი"
 
 #. Name
 #: Internet/gFTP.desktop:2
 msgid "gFTP"
-msgstr ""
+msgstr "gFTP"
 
 #. Name
 #: Internet/gaim.desktop:2
 msgid "Gaim"
-msgstr ""
+msgstr "Gaim"
 
 #. Name
 #: Internet/gnomemeeting.desktop:2
 msgid "GnomeMeeting"
-msgstr ""
+msgstr "GnomeMeeting"
 
 #. GenericName
 #: Internet/gnomemeeting.desktop:3
 msgid "Video Conferencing"
-msgstr "ვიდე� კ�ნფერენცი�"
+msgstr "ვიდე�კ�ნფერენცი�"
 
 #. Name
 #: Internet/gnometalk.desktop:2
 msgid "GNOME Talk"
-msgstr ""
+msgstr "GNOME Talk"
 
 #. Name
 #: Internet/gtelnet.desktop:2
-#, fuzzy
 msgid "GNOME Telnet"
-msgstr "GNOME გ�მნ�ღმვნელი"
+msgstr "GNOME Telnet"
 
 #. GenericName
 #: Internet/gtelnet.desktop:3
 msgid "Remote Access"
-msgstr "შ�რწვდ�მ�"
+msgstr "დ�შ�რებული წვდ�მ�"
 
 #. Name
 #: Internet/ickle.desktop:2
 msgid "ickle"
-msgstr ""
+msgstr "ickle"
 
 #. GenericName
 #: Internet/ickle.desktop:3
 msgid "ICQ2000 Chat"
-msgstr "ICQ2000 ჩეთი"
+msgstr "ICQ2000"
 
 #. Name
 #: Internet/javaws.desktop:2
 msgid "Java Web Start"
-msgstr "Java ვებ დ�ს�წყისი"
+msgstr "ქსელური Java �პლიკ�ციების გ�შვებ�"
 
 #. Name
 #: Internet/knews.desktop:2
 msgid "KNews"
-msgstr ""
+msgstr "KNews"
 
 #. Name
 #: Internet/licq.desktop:2
 msgid "Licq"
-msgstr ""
+msgstr "Licq"
 
 #. Name
 #: Internet/mldonkey_gui.desktop:2
@@ -1033,74 +1026,72 @@ msgstr "MLDonkey GTK+ ბირთვის კ�ნტრ�ლერი"
 #. GenericName
 #: Internet/mldonkey_gui.desktop:3
 msgid "MLDonkey GUI"
-msgstr "გრ�ფიკული ინტერფეისი MLDonkey"
+msgstr "MLDonkey-ის გრ�ფიკული ინტერფეისი"
 
 #. Name
 #: Internet/mozilla-firefox.desktop:2
 msgid "Firefox"
-msgstr ""
+msgstr "Firefox"
 
 #. Name
 #: Internet/mozilla-thunderbird.desktop:2
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. Name
 #: Internet/mozilla.desktop:2
 msgid "Mozilla"
-msgstr ""
+msgstr "Mozilla"
 
 #. Name
 #: Internet/netscape.desktop:2
-#, fuzzy
 msgid "Netscape"
-msgstr "Netscape შემმტყ�ბინებელი"
+msgstr "Netscape"
 
 #. Name
 #: Internet/netscape6.desktop:2
 msgid "Netscape6"
-msgstr ""
+msgstr "Netscape6"
 
 #. Name
 #: Internet/opera.desktop:2
 msgid "Opera"
-msgstr ""
+msgstr "Opera"
 
 #. Name
 #: Internet/wireshark.desktop:2
 msgid "Wireshark"
-msgstr ""
+msgstr "Wireshark"
 
 #. Name
 #: Internet/xbiff.desktop:2
 msgid "X Biff"
-msgstr ""
+msgstr "X Biff"
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "IRC ჩეთი"
+msgstr "XChat"
 
 #. GenericName
 #: Internet/xchat.desktop:3
 msgid "IRC Chat"
-msgstr "IRC ჩეთი"
+msgstr "IRC ს�უბ�რი"
 
 #. Name
 #: Internet/xfmail.desktop:2
 msgid "XFMail"
-msgstr ""
+msgstr "XFMail"
 
 #. Name
 #: Internet/xftp.desktop:2
 msgid "X FTP"
-msgstr ""
+msgstr "X FTP"
 
 #. Name
 #: Multimedia/Aumix.desktop:2
 msgid "Aumix"
-msgstr ""
+msgstr "Aumix"
 
 #. GenericName
 #: Multimedia/Aumix.desktop:3
@@ -1110,11 +1101,10 @@ msgstr "�უდი� მიქსერი"
 #. Name
 #: Multimedia/Grip.desktop:2
 msgid "Grip"
-msgstr ""
+msgstr "Grip"
 
 #. GenericName
 #: Multimedia/Grip.desktop:3
-#, fuzzy
 msgid "CD Player/Ripper"
 msgstr "DVD დ�მკვრელი"
 
@@ -1126,19 +1116,19 @@ msgstr "MP3 ინფ�რმ�ცი�"
 #. Name
 #: Multimedia/XMovie.desktop:2
 msgid "XMovie"
-msgstr ""
+msgstr "XMovie"
 
 #. GenericName
 #: Multimedia/XMovie.desktop:3 Multimedia/mplayer.desktop:3
 #: Multimedia/mtv.desktop:3 Multimedia/realplayer.desktop:3
 #: Multimedia/xine.desktop:3
 msgid "Video Player"
-msgstr "Видео Player"
+msgstr "ვიდე�დ�მკვრელი"
 
 #. Name
 #: Multimedia/alevt.desktop:2
 msgid "AleVT"
-msgstr ""
+msgstr "AleVT"
 
 #. GenericName
 #: Multimedia/alevt.desktop:3
@@ -1148,59 +1138,58 @@ msgstr "პრ�გრ�მ� VideoText–ის ს�ნ�ხ�ვ�დ"
 #. Name
 #: Multimedia/alsamixergui.desktop:2
 msgid "AlsaMixerGui"
-msgstr ""
+msgstr "AlsaMixerGui"
 
 #. GenericName
 #: Multimedia/alsamixergui.desktop:3
 msgid "Alsa Mixer Frontend"
-msgstr "Alsa მიქსერის ინტერფეისი"
+msgstr "Alsa-ის მიქსერის ინტერფეისი"
 
 #. Name
 #: Multimedia/audacity.desktop:2
 msgid "Audacity"
-msgstr ""
+msgstr "Audacity"
 
 #. GenericName
 #: Multimedia/audacity.desktop:3 Multimedia/rezound.desktop:3
 #: Multimedia/sweep.desktop:3
 msgid "Audio Editor"
-msgstr "�უდი� რედ�ქტ�რი"
+msgstr "�უდი�რედ�ქტ�რი"
 
 #. Name
 #: Multimedia/aviplay.desktop:2
 msgid "Aviplay"
-msgstr ""
+msgstr "Aviplay"
 
 #. GenericName
 #: Multimedia/aviplay.desktop:3
-#, fuzzy
 msgid "AVI Video Player"
-msgstr "MOV ვიდე� დ�მკვრელი"
+msgstr "AVI ვიდე�ების დ�მკვრელი"
 
 #. Name
 #: Multimedia/bcast2000.desktop:2
 msgid "Broadcast 2000"
-msgstr ""
+msgstr "Broadcast 2000"
 
 #. GenericName
 #: Multimedia/bcast2000.desktop:3
 msgid "Audio and Video IDE"
-msgstr "�უიდი� დ� ვიდე� IDE"
+msgstr "�უდი�ს დ� ვიდე�ს IDE"
 
 #. Name
 #: Multimedia/enjoympeg.desktop:2
 msgid "EnjoyMPEG"
-msgstr ""
+msgstr "EnjoyMPEG"
 
 #. GenericName
 #: Multimedia/enjoympeg.desktop:3 Multimedia/gtv.desktop:3
 msgid "MPEG Player"
-msgstr "MPEG დ�მკვრელი"
+msgstr "MPEG ფ�ილების დ�მკვრელი"
 
 #. Name
 #: Multimedia/gtv.desktop:2
 msgid "GTV"
-msgstr ""
+msgstr "GTV"
 
 #. Name
 #: Multimedia/jazz.desktop:2
@@ -1214,51 +1203,48 @@ msgstr "ხმის პრ�ცეს�რი"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "MPEG დ�მკვრელი"
+msgstr "MPlayer"
 
 #. Name
 #: Multimedia/mtv.desktop:2
 msgid "MpegTV"
-msgstr ""
+msgstr "MpegTV"
 
 #. Name
 #: Multimedia/ogle.desktop:2
 msgid "Ogle"
-msgstr ""
+msgstr "Ogle"
 
 #. GenericName
 #: Multimedia/ogle.desktop:3
 msgid "DVD Player"
-msgstr "DVD დ�მკვრელი"
+msgstr "DVD-ის დ�მკვრელი"
 
 #. Name
 #: Multimedia/oqtplayer.desktop:2
-#, fuzzy
 msgid "OQTPlayer"
-msgstr "DVD დ�მკვრელი"
+msgstr "OQTPlayer"
 
 #. GenericName
 #: Multimedia/oqtplayer.desktop:3
 msgid "MOV Video Player"
-msgstr "MOV ვიდე� დ�მკვრელი"
+msgstr "MOV ვიდე�ების დ�მკვრელი"
 
 #. Name
 #: Multimedia/realplayer.desktop:2
-#, fuzzy
 msgid "RealPlayer"
-msgstr "Видео Player"
+msgstr "RealPlayer"
 
 #. Name
 #: Multimedia/rezound.desktop:2
 msgid "reZound"
-msgstr ""
+msgstr "reZound"
 
 #. Name
 #: Multimedia/slab.desktop:2
 msgid "Slab"
-msgstr ""
+msgstr "Slab"
 
 #. GenericName
 #: Multimedia/slab.desktop:3
@@ -1268,22 +1254,22 @@ msgstr "ხმის ჩ�მწერი"
 #. Name
 #: Multimedia/sweep.desktop:2
 msgid "Sweep"
-msgstr ""
+msgstr "Sweep"
 
 #. Name
 #: Multimedia/xawtv.desktop:2
 msgid "XawTV"
-msgstr ""
+msgstr "XawTV"
 
 #. GenericName
 #: Multimedia/xawtv.desktop:3
 msgid "Watch TV!"
-msgstr ""
+msgstr "ტელევიზ�რის ყურებ�!"
 
 #. Name
 #: Multimedia/xcam.desktop:2
 msgid "XCam"
-msgstr ""
+msgstr "XCam"
 
 #. GenericName
 #: Multimedia/xcam.desktop:3
@@ -1293,22 +1279,22 @@ msgstr "კ�მერის პრ�გრ�მ�"
 #. Name
 #: Multimedia/xine.desktop:2
 msgid "Xine"
-msgstr ""
+msgstr "Xine"
 
 #. Name
 #: Multimedia/xmms-enqueue.desktop:2
 msgid "Enqueue in XMMS"
-msgstr "XMMS რიგში ჩ�ყენებ�"
+msgstr "XMMS-ის რიგში ჩ�ყენებ�"
 
 #. GenericName
 #: Multimedia/xmms-enqueue.desktop:3
 msgid "Playlist Tool"
-msgstr "რეპერტუ�რის პულტი"
+msgstr "დ�ს�კრ�ვი სიის პრ�გრ�მ�"
 
 #. Name
 #: Multimedia/xmms.desktop:2
 msgid "XMMS"
-msgstr ""
+msgstr "XMMS"
 
 #. GenericName
 #: Multimedia/xmms.desktop:3
@@ -1318,7 +1304,7 @@ msgstr "მულტიმედი� ცენტრი"
 #. Name
 #: Office/Applix.desktop:2
 msgid "Applix"
-msgstr ""
+msgstr "Applix"
 
 #. GenericName
 #: Office/Applix.desktop:3
@@ -1328,7 +1314,7 @@ msgstr "ს��ფისე პ�კეტი"
 #. Name
 #: Office/Dia.desktop:2
 msgid "Dia"
-msgstr ""
+msgstr "Dia"
 
 #. GenericName
 #: Office/Dia.desktop:3 Office/Guppi.desktop:3
@@ -1337,9 +1323,8 @@ msgstr "დიáƒ�გრáƒ�მებთáƒ�ნ სáƒ�მუშáƒ�áƒ� პრáƒ�გá
 
 #. Name
 #: Office/Gnome-Cal.desktop:2
-#, fuzzy
 msgid "GNOME-Cal"
-msgstr "GNOME ჭ�დრ�კი"
+msgstr "GNOME-Cal"
 
 #. GenericName
 #: Office/Gnome-Cal.desktop:3
@@ -1349,38 +1334,37 @@ msgstr "პერს�ნ�ლური კ�ლენდ�რი"
 #. Name
 #: Office/Gnome-Card.desktop:2
 msgid "GNOME-Card"
-msgstr ""
+msgstr "GNOME-Card"
 
 #. GenericName
 #: Office/Gnome-Card.desktop:3
 msgid "Contact Manager"
-msgstr "კ�ნტ�ქტების მენეჯერი"
+msgstr "კ�ნტ�ქტების მმ�რთველი"
 
 #. Name
 #: Office/GnomeTimeTracker.desktop:2
-#, fuzzy
 msgid "GNOME Time Tracker"
-msgstr "თ�მ�ში GNOME  Nibbles"
+msgstr "GNOME-ის ტ�იმერი"
 
 #. Name
 #: Office/Gnumeric.desktop:2
 msgid "Gnumeric"
-msgstr ""
+msgstr "Gnumeric"
 
 #. GenericName
 #: Office/Gnumeric.desktop:3 Office/XsLite.desktop:3
 msgid "Spread Sheet"
-msgstr "ელექტრ�ნული ცხრილი"
+msgstr "ელცხრილი"
 
 #. Name
 #: Office/Guppi.desktop:2
 msgid "Guppi"
-msgstr ""
+msgstr "Guppi"
 
 #. Name
 #: Office/Ical.desktop:2
 msgid "Ical"
-msgstr ""
+msgstr "Ical"
 
 #. GenericName
 #: Office/Ical.desktop:3
@@ -1390,7 +1374,7 @@ msgstr "კ�ლენდ�რი"
 #. Name
 #: Office/WordPerfect.desktop:2
 msgid "WordPerfect"
-msgstr ""
+msgstr "WordPerfect"
 
 #. GenericName
 #: Office/WordPerfect.desktop:3 Office/WordPerfect2000.desktop:3
@@ -1401,32 +1385,32 @@ msgstr "ტექსტური პრ�ცეს�რი"
 #. Name
 #: Office/WordPerfect2000.desktop:2
 msgid "WordPerfect 2000"
-msgstr ""
+msgstr "WordPerfect 2000"
 
 #. Name
 #: Office/XAcc.desktop:2
 msgid "xacc"
-msgstr ""
+msgstr "xacc"
 
 #. GenericName
 #: Office/XAcc.desktop:3
 msgid "Personal Accounting Tool"
-msgstr "პერს�ნ�ლური ბუღ�ლტერიის ხელს�წყ� "
+msgstr "პირ�დი ბუღ�ლტერიის პრ�გრ�მ�"
 
 #. Name
 #: Office/XsLite.desktop:2
 msgid "XsLite"
-msgstr ""
+msgstr "XsLite"
 
 #. Name
 #: Office/abiword.desktop:2
 msgid "AbiWord"
-msgstr ""
+msgstr "AbiWord"
 
 #. Name
 #: Office/acroread.desktop:2
 msgid "Acrobat Reader"
-msgstr ""
+msgstr "Acrobat Reader"
 
 #. GenericName
 #: Office/acroread.desktop:3 Office/xpdf.desktop:3
@@ -1436,29 +1420,27 @@ msgstr "PDF დ�კუმენტების ს�ნ�ხ�ვი პრ
 #. Name
 #: Office/gnucash.desktop:2
 msgid "GnuCash"
-msgstr ""
+msgstr "GnuCash"
 
 #. GenericName
 #: Office/gnucash.desktop:3
-#, fuzzy
 msgid "Finance Manager"
-msgstr "კ�ნტ�ქტების მენეჯერი"
+msgstr "ფინ�ნსების მმ�რთველი"
 
 #. Name
 #: Office/lyx.desktop:2
 msgid "LyX"
-msgstr ""
+msgstr "LyX"
 
 #. Name
 #: Office/mrproject.desktop:2
 msgid "MrProject"
-msgstr ""
+msgstr "MrProject"
 
 #. GenericName
 #: Office/mrproject.desktop:3
-#, fuzzy
 msgid "Project Manager"
-msgstr "კ�ნტ�ქტების მენეჯერი"
+msgstr "პრ�ექტის მმ�რთველი"
 
 #. Name
 #: Office/netscapeaddressbook.desktop:2
@@ -1468,18 +1450,17 @@ msgstr "Netscape მის�მ�რთების წიგნი"
 #. Name
 #: Office/plan.desktop:2
 msgid "Plan"
-msgstr ""
+msgstr "Plan"
 
 #. GenericName
 #: Office/plan.desktop:3
 msgid "Calendar Manager"
-msgstr "კ�ლენდ�რის მენეჯერი"
+msgstr "კ�ლენდრის მმ�რთველი"
 
 #. Name
 #: Office/pybliographic.desktop:2
-#, fuzzy
 msgid "Pybliographic"
-msgstr "ბიბლი�გრ�ფიული მ�ნ�ცემთ� ბ�ზ�"
+msgstr "პიბლი�გრ�ფიული მ�ნ�ცემთ� ბ�ზ�"
 
 #. GenericName
 #: Office/pybliographic.desktop:3
@@ -1489,7 +1470,7 @@ msgstr "ბიბლიáƒ�გრáƒ�ფიული მáƒ�ნáƒ�ცემთáƒ� á
 #. Name
 #: Office/scribus.desktop:2
 msgid "Scribus"
-msgstr ""
+msgstr "Scribus"
 
 #. GenericName
 #: Office/scribus.desktop:3
@@ -1499,7 +1480,7 @@ msgstr "ს�მ�გიდ� გ�მ�მცემლ�ბ�"
 #. Name
 #: Office/xpdf.desktop:2
 msgid "X PDF"
-msgstr ""
+msgstr "X PDF"
 
 #. Name
 #: System/Terminal/aterm.desktop:2
@@ -1509,12 +1490,12 @@ msgstr "ტერმინ�ლი"
 #. GenericName
 #: System/Terminal/aterm.desktop:3 Utilities/XUtilities/xterm.desktop:3
 msgid "Terminal Program"
-msgstr "პრ�გრ�მ� ტერმინ�ლისთვის"
+msgstr "ტერმინ�ლის პრ�გრ�მ�"
 
 #. Name
 #: System/Terminal/procinfo.desktop:2
 msgid "Procinfo"
-msgstr ""
+msgstr "Procinfo"
 
 #. GenericName
 #: System/Terminal/procinfo.desktop:3
@@ -1524,27 +1505,27 @@ msgstr "ინფáƒ�რმáƒ�ციáƒ� სისტემური პრáƒ�ცá
 #. Name
 #: System/Terminal/rxvt.desktop:2
 msgid "RXVT"
-msgstr ""
+msgstr "RXVT"
 
 #. GenericName
 #: System/Terminal/rxvt.desktop:3
 msgid "ouR eXtended Virtual Terminal"
-msgstr "გეუმჯ�ბესებული ვირტუ�ლური ტერმინ�ლი"
+msgstr "ჩვენი გ�უმჯ�ბესებული ვირტუ�ლური ტერმინ�ლი"
 
 #. Name
 #: System/Terminal/vmstat.desktop:2
 msgid "Vmstat"
-msgstr ""
+msgstr "Vmstat"
 
 #. GenericName
 #: System/Terminal/vmstat.desktop:3
 msgid "Virtual Memory Statistics"
-msgstr "ვირტუ�ლური მეხსიერების სტ�ტისტიკ� "
+msgstr "ვირტუ�ლური მეხსიერების სტ�ტისტიკ�"
 
 #. Name
 #: System/citrix_ica.desktop:2
 msgid "Citrix ICA Client"
-msgstr "Citrix ICA–ს კლიენტი"
+msgstr "Citrix ICA–ის კლიენტი"
 
 #. GenericName
 #: System/citrix_ica.desktop:3
@@ -1554,7 +1535,7 @@ msgstr "WTS კლიენტი"
 #. Name
 #: System/editres.desktop:2
 msgid "EditXRes"
-msgstr ""
+msgstr "EditXRes"
 
 #. GenericName
 #: System/editres.desktop:3
@@ -1564,22 +1545,22 @@ msgstr "X რესურსების რედ�ქტ�რი"
 #. Name
 #: System/sam.desktop:2
 msgid "SAM System-Administration"
-msgstr "SAM–ის სიტემური �დმინისტრირებ�"
+msgstr "SAM–ის სისტემური �დმინისტრირებ�"
 
 #. Name
 #: System/wine.desktop:2
 msgid "Wine"
-msgstr ""
+msgstr "Wine"
 
 #. GenericName
 #: System/wine.desktop:3
 msgid "Run Windows Programs"
-msgstr "Windows–ს პრ�გრ�მების გ�შვებ�"
+msgstr "Windows–ის პრ�გრ�მების გ�შვებ�"
 
 #. Name
 #: System/xosview.desktop:2
 msgid "X osview"
-msgstr "Xosview"
+msgstr "X osview"
 
 #. GenericName
 #: System/xosview.desktop:3
@@ -1589,7 +1570,7 @@ msgstr "სისტემის მ�ნიტ�რი"
 #. Name
 #: Utilities/Editors/emacs.desktop:2
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
 #. GenericName
 #: Utilities/Editors/emacs.desktop:3 Utilities/Editors/gedit.desktop:3
@@ -1602,24 +1583,23 @@ msgstr "ტექსტური რედ�ქტ�რი"
 
 #. Name
 #: Utilities/Editors/gedit.desktop:2
-#, fuzzy
 msgid "gEdit"
-msgstr "X რედ�ქტ�რი"
+msgstr "gEdit"
 
 #. Name
 #: Utilities/Editors/gvim.desktop:2
 msgid "Vi IMproved"
-msgstr ""
+msgstr "გ�უმჯ�ბესებული Vi"
 
 #. Name
 #: Utilities/Editors/lemacs.desktop:2
 msgid "Lucid Emacs"
-msgstr ""
+msgstr "Lucid Emacs"
 
 #. Name
 #: Utilities/Editors/nano.desktop:2
 msgid "Nano"
-msgstr ""
+msgstr "Nano"
 
 #. Name
 #: Utilities/Editors/nedit.desktop:2
@@ -1629,7 +1609,7 @@ msgstr "NEdit"
 #. Name
 #: Utilities/Editors/pico.desktop:2
 msgid "Pico"
-msgstr ""
+msgstr "Pico"
 
 #. Name
 #: Utilities/Editors/xedit.desktop:2
@@ -1639,12 +1619,12 @@ msgstr "X რედ�ქტ�რი"
 #. Name
 #: Utilities/Editors/xemacs.desktop:2
 msgid "X Emacs"
-msgstr ""
+msgstr "X Emacs"
 
 #. Name
 #: Utilities/GKrellM.desktop:2
 msgid "GKrellM"
-msgstr ""
+msgstr "GKrellM"
 
 #. GenericName
 #: Utilities/GKrellM.desktop:3
@@ -1653,29 +1633,28 @@ msgstr "GNU Krell მ�ნიტ�რი"
 
 #. Name
 #: Utilities/GnomeWho.desktop:2
-#, fuzzy
 msgid "GNOME Who"
-msgstr "GNOME ჭ�დრ�კი"
+msgstr "GNOME Who"
 
 #. GenericName
 #: Utilities/GnomeWho.desktop:3
 msgid "System Info Tool"
-msgstr "ხელს�წყ� სისტემის ინფ�რმ�ციის ს�ნ�ხ�ვ�დ "
+msgstr "ხელს�წყ� სისტემის ინფ�რმ�ციის ს�ნ�ხ�ვ�დ"
 
 #. Name
 #: Utilities/SystemInfo.desktop:2
 msgid "System Info"
-msgstr "ინფ�რმ�ცი� სისტემის შეს�ხებ "
+msgstr "ინფ�რმ�ცი� სისტემის შეს�ხებ"
 
 #. Name
 #: Utilities/SystemLogViewer.desktop:2
 msgid "System Log Viewer"
-msgstr "სისტემური ჩ�ნ�წერების ნ�ხვ�"
+msgstr "სისტემური ჟურნ�ლის ნ�ხვ�"
 
 #. Name
 #: Utilities/XUtilities/Xkill.desktop:2
 msgid "X Kill"
-msgstr ""
+msgstr "X Kill"
 
 #. GenericName
 #: Utilities/XUtilities/Xkill.desktop:3
@@ -1684,7 +1663,6 @@ msgstr "ფ�ნჯრის დ�ხურვის ხელს�წყ�"
 
 #. Name
 #: Utilities/XUtilities/Xrefresh.desktop:2
-#, fuzzy
 msgid "X Refresh"
 msgstr "ეკრ�ნის გ�ნ�ხლებ�"
 
@@ -1696,7 +1674,7 @@ msgstr "ეკრ�ნის გ�ნ�ხლებ�"
 #. Name
 #: Utilities/XUtilities/Xtraceroute.desktop:2
 msgid "X Traceroute"
-msgstr ""
+msgstr "X Traceroute"
 
 #. GenericName
 #: Utilities/XUtilities/Xtraceroute.desktop:3
@@ -1706,7 +1684,7 @@ msgstr "ქსელის ხელს�წყ�"
 #. Name
 #: Utilities/XUtilities/xcalc.desktop:2
 msgid "X Calc"
-msgstr ""
+msgstr "X Calc"
 
 #. GenericName
 #: Utilities/XUtilities/xcalc.desktop:3 Utilities/calctool.desktop:3
@@ -1741,17 +1719,17 @@ msgstr "X კ�ნს�ლი"
 #. GenericName
 #: Utilities/XUtilities/xconsole.desktop:3
 msgid "Console Message Viewer"
-msgstr "პრ�გრ�მ� კ�ნს�ლის შეტყ�ბინებ�თ� ს�ნ�ხ�ვ�დ"
+msgstr "პრ�გრ�მ� კ�ნს�ლის შეტყ�ბინებების ს�ნ�ხ�ვ�დ"
 
 #. Name
 #: Utilities/XUtilities/xload.desktop:2
 msgid "X Load"
-msgstr ""
+msgstr "X Load"
 
 #. GenericName
 #: Utilities/XUtilities/xload.desktop:3
 msgid "Monitors System Load"
-msgstr "სისტემის ჩ�ტვირთვის მ�ნიტ�რი "
+msgstr "სისტემის დ�ტვირთვის მ�ნიტ�რი"
 
 #. Name
 #: Utilities/XUtilities/xmag.desktop:2
@@ -1770,14 +1748,13 @@ msgstr "X-ტერმინ�ლი"
 
 #. Name
 #: Utilities/calctool.desktop:2
-#, fuzzy
 msgid "Calctool"
 msgstr "კ�ლკულ�ტ�რი"
 
 #. Name
 #: Utilities/e-notes.desktop:2
 msgid "E-Notes"
-msgstr ""
+msgstr "E-Notes"
 
 #. GenericName
 #: Utilities/e-notes.desktop:3
@@ -1786,16 +1763,15 @@ msgstr "პერს�ნ�ლური ჩ�ნ�წერები"
 
 #. Name
 #: Utilities/oclock.desktop:2
-#, fuzzy
 msgid "OClock"
-msgstr "ს��თი"
+msgstr "OClock"
 
 #. Name
 #: Utilities/xgnokii.desktop:2
 msgid "X-Gnokii"
-msgstr ""
+msgstr "X-Gnokii"
 
 #. GenericName
 #: Utilities/xgnokii.desktop:3
 msgid "Mobile Phone Management Tool"
-msgstr "პრ�გრ�მ� მ�ბილური ტელეფ�ნების�თვის"
+msgstr "პრ�გრ�მ� მ�ბილური ტელეფ�ნისთვის"
diff --git a/translations/desktop_files/kappfinder-data/nl.po b/translations/desktop_files/kappfinder-data/nl.po
index 9470deb34..3668eb1ea 100644
--- a/translations/desktop_files/kappfinder-data/nl.po
+++ b/translations/desktop_files/kappfinder-data/nl.po
@@ -1,30 +1,32 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
+# tteweblate <tteweblate@relst.nl>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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-05-12 13:25+0000\n"
+"Last-Translator: tteweblate <tteweblate@relst.nl>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kappfinder-data/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Development/Forte.desktop:2
 msgid "Forte"
-msgstr ""
+msgstr "Forte."
 
 #. GenericName
 #: Development/Forte.desktop:3
 msgid "Java IDE"
-msgstr ""
+msgstr "Java IDE."
 
 #. Name
 #: Development/assistant.desktop:2
@@ -34,70 +36,67 @@ msgstr "Qt Assistent"
 #. GenericName
 #: Development/assistant.desktop:3
 msgid "Document Browser"
-msgstr "Documentbrowser"
+msgstr "Document browser"
 
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
 msgid "Data Display Debugger"
-msgstr "Data-display-debugger"
+msgstr "Data display debugger"
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Interface-ontwerper"
+msgstr "Qt Ontwerper"
 
 #. GenericName
 #: Development/designer.desktop:3
 msgid "Interface Designer"
-msgstr "Interface-ontwerper"
+msgstr "Interface ontwerper"
 
 #. Name
 #: Development/dlgedit.desktop:2
-#, fuzzy
 msgid "Qt DlgEdit"
-msgstr "Dialoogbewerker"
+msgstr "Qt Dialoog Aanpasser"
 
 #. GenericName
 #: Development/dlgedit.desktop:3
 msgid "Dialog Editor"
-msgstr "Dialoogbewerker"
+msgstr "Dialoog bewerker"
 
 #. Name
 #: Development/eclipse.desktop:3
 msgid "Eclipse"
-msgstr ""
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
 msgid "Eclipse IDE"
-msgstr ""
+msgstr "Eclipse IDE"
 
 #. Name
 #: Development/fdesign.desktop:2
-#, fuzzy
 msgid "FormDesigner"
-msgstr "Interface-ontwerper"
+msgstr "Form Designer"
 
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2 ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
 msgid "J2ME Toolkit"
-msgstr "J2ME-toolkit"
+msgstr "J2ME toolkit"
 
 #. Name
 #: Development/linguist.desktop:2
 msgid "Qt Linguist"
-msgstr "Qt Linquist"
+msgstr "Qt Vertaler"
 
 #. GenericName
 #: Development/linguist.desktop:3
@@ -107,27 +106,27 @@ msgstr "Vertaalprogramma"
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
 msgid "Palm/Wireless Emulator"
-msgstr "Palm/Wireless emulator"
+msgstr "Palm/Draadloos nadoener"
 
 #. Name
 #: Development/sced.desktop:2
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
 msgid "Scene Modeler"
-msgstr "Scene-modeleerprogramma"
+msgstr "Scene modeleerprogramma"
 
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
 msgid "ClanBomber"
-msgstr ""
+msgstr "Clan Bomber"
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -138,22 +137,22 @@ msgstr ""
 #: Games/Board/Gataxx.desktop:3 Games/Board/Gnotravex.desktop:3
 #: Games/penguin-command.desktop:4
 msgid "Arcade Game"
-msgstr "Arcade-spel"
+msgstr "Arcade Spel"
 
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
 msgid "Frozen Bubble"
-msgstr ""
+msgstr "Bevroren Bubbel"
 
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
 msgid "Tetris-Like Game"
-msgstr "Tetris-variant"
+msgstr "Tetris-achtig spel"
 
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Knibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -163,27 +162,27 @@ msgstr "GNOME Nibbles Spel"
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
 msgid "Gnobots II"
-msgstr ""
+msgstr "Gnobots 2"
 
 #. Name
 #: Games/Arcade/Mures.desktop:2
 msgid "Mures"
-msgstr ""
+msgstr "Mures"
 
 #. Name
 #: Games/Arcade/SuperMethaneBrothers.desktop:2
 msgid "Super Methane Brothers"
-msgstr ""
+msgstr "Super Methaan Broeders"
 
 #. Name
 #: Games/Arcade/Trophy.desktop:2
 msgid "Trophy"
-msgstr ""
+msgstr "Trofféé"
 
 #. Name
 #: Games/Arcade/TuxRacer.desktop:2
 msgid "TuxRacer"
-msgstr ""
+msgstr "Pinguin-Racer"
 
 #. GenericName
 #: Games/Arcade/TuxRacer.desktop:3
@@ -193,45 +192,44 @@ msgstr "Racespel"
 #. Name
 #: Games/Arcade/XKobo.desktop:2
 msgid "XKobo"
-msgstr ""
+msgstr "X-Kobo"
 
 #. Name
 #: Games/Arcade/XSoldier.desktop:2
 msgid "XSoldier"
-msgstr ""
+msgstr "X-Soldaat"
 
 #. Name
 #: Games/Arcade/alephone-nogl.desktop:2
 msgid "Alephone"
-msgstr ""
+msgstr "Ale-Telefoon"
 
 #. Comment
 #: Games/Arcade/alephone-nogl.desktop:3
 msgid "An open source version of Marathon Infinity for SDL"
-msgstr "een Open Source-versie van Marathon Infinity voor SDL"
+msgstr "een Open Source versie van Marathon Infinity voor SDL"
 
 #. Name
 #: Games/Arcade/alephone.desktop:2
 msgid "Alephone - No OpenGL"
-msgstr "Alephone - geen OpenGL"
+msgstr "Alephone, geen OpenGL"
 
 #. Comment
 #: Games/Arcade/alephone.desktop:3
 msgid ""
 "An open source version of Marathon Infinity for SDL that has Open GL disabled"
 msgstr ""
-"een Open Source-versie van Marathon Infinity voor SDL, maar dan zonder Open "
-"GL"
+"een Open Source versie van Marathon Infinity voor SDL, maar dan zonder OpenGL"
 
 #. Name
 #: Games/Arcade/battalion.desktop:2
 msgid "Batallion"
-msgstr ""
+msgstr "Troepen"
 
 #. Name
 #: Games/Arcade/battleball.desktop:2
 msgid "Battleball"
-msgstr ""
+msgstr "Gevechts-Ballen"
 
 #. GenericName
 #: Games/Arcade/battleball.desktop:3
@@ -241,12 +239,12 @@ msgstr "Balspel"
 #. Name
 #: Games/Arcade/cxhextris.desktop:2
 msgid "cxhextris"
-msgstr ""
+msgstr "CX-Hetris"
 
 #. Name
 #: Games/Arcade/rocksndiamonds.desktop:2
 msgid "Rocks n Diamonds"
-msgstr ""
+msgstr "Stenen en Diamanten"
 
 #. GenericName
 #: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
@@ -256,27 +254,27 @@ msgstr "Tactisch spel"
 #. Name
 #: Games/Arcade/scavenger.desktop:2
 msgid "Scavenger"
-msgstr ""
+msgstr "Ontdekker"
 
 #. Name
 #: Games/Board/Gataxx.desktop:2
 msgid "Gataxx"
-msgstr ""
+msgstr "Gatax"
 
 #. Name
 #: Games/Board/Gchess.desktop:2
 msgid "GNOME Chess"
-msgstr ""
+msgstr "GNOME Schaken"
 
 #. Name
 #: Games/Board/Glines.desktop:2
 msgid "Glines"
-msgstr ""
+msgstr "G-Lijnen"
 
 #. Name
 #: Games/Board/Gmahjongg.desktop:2
 msgid "GNOME Mahjongg"
-msgstr ""
+msgstr "GNOME Mahjong-spel"
 
 #. GenericName
 #: Games/Board/Gmahjongg.desktop:3
@@ -285,7 +283,6 @@ msgstr "Tegelspel"
 
 #. Name
 #: Games/Board/Gmines.desktop:2
-#, fuzzy
 msgid "GNOME Mines"
 msgstr "GNOME Nibbles Spel"
 
@@ -297,12 +294,12 @@ msgstr "Logisch spel"
 #. Name
 #: Games/Board/Gnotravex.desktop:2
 msgid "Gnotravex"
-msgstr ""
+msgstr "Gno-vatrex"
 
 #. Name
 #: Games/Board/Gnotski.desktop:2
 msgid "Gnotski"
-msgstr ""
+msgstr "Gno-tski"
 
 #. GenericName
 #: Games/Board/Gnotski.desktop:3
@@ -312,12 +309,12 @@ msgstr "GNOME Klotski-spel"
 #. Name
 #: Games/Board/Gstones.desktop:2
 msgid "GNOME Stones"
-msgstr ""
+msgstr "GNOME Stenen"
 
 #. Name
 #: Games/Board/Iagno.desktop:2
 msgid "Iagno"
-msgstr ""
+msgstr "Lango"
 
 #. GenericName
 #: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
@@ -328,17 +325,17 @@ msgstr "Bordspel"
 #. Name
 #: Games/Board/SameGnome.desktop:2
 msgid "Same GNOME"
-msgstr ""
+msgstr "GNOME-hetzelfde-spel"
 
 #. Name
 #: Games/Board/Xgammon.desktop:2
 msgid "Xgammon"
-msgstr ""
+msgstr "X-BackGamomon"
 
 #. Name
 #: Games/Board/xboard.desktop:2
 msgid "Xboard"
-msgstr ""
+msgstr "X-Bord"
 
 #. GenericName
 #: Games/Board/xboard.desktop:3
@@ -348,7 +345,7 @@ msgstr "Schaakspel"
 #. Name
 #: Games/Card/AisleRiot.desktop:2
 msgid "AisleRiot"
-msgstr ""
+msgstr "Eiland-Rellen"
 
 #. GenericName
 #: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
@@ -359,28 +356,27 @@ msgstr "Kaartspel"
 #. Name
 #: Games/Card/FreeCell.desktop:2
 msgid "FreeCell"
-msgstr ""
+msgstr "Vrij-cel"
 
 #. Name
 #: Games/Card/PySol.desktop:2
 msgid "PySol"
-msgstr ""
+msgstr "Python Zon"
 
 #. Name
 #: Games/Card/XPat2.desktop:2
 msgid "XPat 2"
-msgstr ""
+msgstr "XPat Twee"
 
 #. Name
 #: Games/Clanbomber.desktop:2
 msgid "Clanbomber"
-msgstr ""
+msgstr "Groep-Bombardement"
 
 #. Name
 #: Games/Emulators/cmail.desktop:2
-#, fuzzy
 msgid "ChessMail"
-msgstr "Schaakspel"
+msgstr "SchaakBericht"
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -390,7 +386,7 @@ msgstr "E-mail voor Chess"
 #. Name
 #: Games/Emulators/qmamecat.desktop:2
 msgid "Qmamecat"
-msgstr ""
+msgstr "Q MAME Poes"
 
 #. GenericName
 #: Games/Emulators/qmamecat.desktop:3
@@ -400,7 +396,7 @@ msgstr "Arcade-emulatie"
 #. Name
 #: Games/GTali.desktop:2
 msgid "GTali"
-msgstr ""
+msgstr "Gnome Tali"
 
 #. GenericName
 #: Games/GTali.desktop:3
@@ -410,7 +406,7 @@ msgstr "Dobbelspel"
 #. Name
 #: Games/Roguelikes/angband.desktop:2
 msgid "Angband"
-msgstr ""
+msgstr "Ang-band"
 
 #. Comment
 #: Games/Roguelikes/angband.desktop:3
@@ -420,7 +416,7 @@ msgstr "Duik in Angband en versla Morgoth"
 #. Name
 #: Games/Roguelikes/moria.desktop:2
 msgid "Moria"
-msgstr ""
+msgstr "Moria"
 
 #. Comment
 #: Games/Roguelikes/moria.desktop:3
@@ -430,7 +426,7 @@ msgstr "Duik in Moria en versla de Balrog"
 #. Name
 #: Games/Roguelikes/nethack.desktop:2
 msgid "NetHack"
-msgstr ""
+msgstr "Net-Hack"
 
 #. GenericName
 #: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
@@ -440,7 +436,7 @@ msgstr "Tactisch spel"
 #. Name
 #: Games/Roguelikes/rogue.desktop:2
 msgid "Rogue"
-msgstr ""
+msgstr "Schurk"
 
 #. GenericName
 #: Games/Roguelikes/rogue.desktop:3
@@ -450,12 +446,12 @@ msgstr "Het origineel"
 #. Name
 #: Games/Roguelikes/tome.desktop:2
 msgid "ToME"
-msgstr ""
+msgstr "Tome"
 
 #. Name
 #: Games/Roguelikes/zangband.desktop:2
 msgid "ZAngband"
-msgstr ""
+msgstr "Z-Angband"
 
 #. GenericName
 #: Games/Roguelikes/zangband.desktop:3
@@ -465,7 +461,7 @@ msgstr "Versla de Serpent of Chaos"
 #. Name
 #: Games/TacticStrategy/freeciv.desktop:3
 msgid "Freeciv"
-msgstr ""
+msgstr "Vrije Beschaving"
 
 #. GenericName
 #: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
@@ -485,7 +481,7 @@ msgstr "Een server voor Free Civ"
 #. Name
 #: Games/TacticStrategy/xscorch.desktop:3
 msgid "XScorch"
-msgstr ""
+msgstr "X-Scorhch"
 
 #. Comment
 #: Games/TacticStrategy/xscorch.desktop:4
@@ -495,12 +491,12 @@ msgstr "Een gratis kloon van Scorched Earth voor UNIX en X"
 #. Name
 #: Games/Toys/xeyes.desktop:2
 msgid "X Eyes"
-msgstr ""
+msgstr "X Ogen"
 
 #. Name
 #: Games/Toys/xpinguin.desktop:2
 msgid "Tux"
-msgstr ""
+msgstr "Pinguin"
 
 #. GenericName
 #: Games/Toys/xpinguin.desktop:3
@@ -510,7 +506,7 @@ msgstr "Linux-mascotte"
 #. Name
 #: Games/defendguin.desktop:3
 msgid "Defendguin"
-msgstr ""
+msgstr "Verdedigings Pinguin"
 
 #. GenericName
 #: Games/defendguin.desktop:4
@@ -520,17 +516,17 @@ msgstr "Spel"
 #. Name
 #: Games/penguin-command.desktop:3
 msgid "Penguin Command"
-msgstr ""
+msgstr "Pinguin Commando"
 
 #. Name
 #: Games/xshipwars.desktop:3
 msgid "XShipWars"
-msgstr ""
+msgstr "X Oorlogsschepen"
 
 #. Name
 #: Graphics/ElectricEyes.desktop:2
 msgid "Electric Eyes"
-msgstr ""
+msgstr "Elektrische Ogen"
 
 #. GenericName
 #: Graphics/ElectricEyes.desktop:3
@@ -540,7 +536,7 @@ msgstr "Afbeeldingenweergaveprogramma"
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "G-Foto"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -550,17 +546,17 @@ msgstr "Cameraprogramma"
 #. Name
 #: Graphics/GnomeColorSelector.desktop:2
 msgid "GNOME Color Selector"
-msgstr ""
+msgstr "GNOME Kleurenkiezen"
 
 #. Name
 #: Graphics/GnomeIconEditor.desktop:2
 msgid "GNOME Icon Editor"
-msgstr ""
+msgstr "GNOME Pictogrambewerker"
 
 #. Name
 #: Graphics/Gqview.desktop:2
 msgid "Gqview"
-msgstr ""
+msgstr "G-Q bekijken"
 
 #. GenericName
 #: Graphics/Gqview.desktop:3
@@ -570,7 +566,7 @@ msgstr "Afbeeldingenbrowser"
 #. Name
 #: Graphics/Sketch.desktop:2
 msgid "Sketch"
-msgstr ""
+msgstr "Schetsen"
 
 #. GenericName
 #: Graphics/Sketch.desktop:3
@@ -580,7 +576,7 @@ msgstr "Vector-tekenprogramma"
 #. Name
 #: Graphics/Xpcd.desktop:2
 msgid "Xpcd"
-msgstr ""
+msgstr "X-pcd"
 
 #. GenericName
 #: Graphics/Xpcd.desktop:3
@@ -590,7 +586,7 @@ msgstr "Foto-cd hulpprogramma's"
 #. Name
 #: Graphics/Xwpick.desktop:2
 msgid "Xwpick"
-msgstr ""
+msgstr "X-wpick"
 
 #. GenericName
 #: Graphics/Xwpick.desktop:3
@@ -600,7 +596,7 @@ msgstr "Schermafdrukprogramma"
 #. Name
 #: Graphics/bitmap.desktop:2
 msgid "X Bitmap"
-msgstr ""
+msgstr "X-Bitmap"
 
 #. GenericName
 #: Graphics/bitmap.desktop:3
@@ -610,7 +606,7 @@ msgstr "Bitmaps maken"
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Samenvoeger"
 
 #. GenericName
 #: Graphics/blender.desktop:3
@@ -620,7 +616,7 @@ msgstr "3D modeleerprogramma"
 #. Name
 #: Graphics/ghostview.desktop:2
 msgid "GhostView"
-msgstr ""
+msgstr "Spook Bekijker"
 
 #. GenericName
 #: Graphics/ghostview.desktop:3
@@ -630,7 +626,7 @@ msgstr "PostScript-weergaveprogramma"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "PiemelFriemel"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -640,7 +636,7 @@ msgstr "GNU Image Manipulation Program"
 #. Name
 #: Graphics/gv.desktop:2
 msgid "GV"
-msgstr ""
+msgstr "G-V"
 
 #. GenericName
 #: Graphics/gv.desktop:3
@@ -650,7 +646,7 @@ msgstr "PostScript-weergaveprogramma"
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "InkScape"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -660,12 +656,12 @@ msgstr "Vectorafbeelding"
 #. Name
 #: Graphics/sodipodi.desktop:2
 msgid "Sodipodi"
-msgstr ""
+msgstr "SodiPodi"
 
 #. Name
 #: Graphics/tgif.desktop:2
 msgid "TGif"
-msgstr ""
+msgstr "T-GIF"
 
 #. GenericName
 #: Graphics/tgif.desktop:3 Graphics/xfig.desktop:3
@@ -675,7 +671,7 @@ msgstr "Tekenprogramma"
 #. Name
 #: Graphics/xdvi.desktop:2
 msgid "X DVI"
-msgstr ""
+msgstr "X-DVI"
 
 #. GenericName
 #: Graphics/xdvi.desktop:3
@@ -685,12 +681,12 @@ msgstr "DVI-weergaveprogramma"
 #. Name
 #: Graphics/xfig.desktop:2
 msgid "Xfig"
-msgstr ""
+msgstr "X-FIG"
 
 #. Name
 #: Graphics/xpaint.desktop:2
 msgid "X Paint"
-msgstr ""
+msgstr "X-Verven"
 
 #. GenericName
 #: Graphics/xpaint.desktop:3
@@ -700,7 +696,7 @@ msgstr "Tekenprogramma"
 #. Name
 #: Graphics/xv.desktop:2
 msgid "XV"
-msgstr ""
+msgstr "X-V"
 
 #. GenericName
 #: Graphics/xv.desktop:3
@@ -710,7 +706,7 @@ msgstr "Afbeeldingenweergaveprogramma"
 #. Name
 #: Internet/BlueFish.desktop:2
 msgid "BlueFish"
-msgstr ""
+msgstr "Blauwe Vis"
 
 #. GenericName
 #: Internet/BlueFish.desktop:3
@@ -720,7 +716,7 @@ msgstr "HTML-editor"
 #. Name
 #: Internet/Dpsftp.desktop:2
 msgid "Dpsftp"
-msgstr ""
+msgstr "D-SFTP"
 
 #. GenericName
 #: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3 Internet/xftp.desktop:3
@@ -730,7 +726,7 @@ msgstr "FTP-browser"
 #. Name
 #: Internet/DrakSync.desktop:2
 msgid "DrakSync"
-msgstr ""
+msgstr "Drak-Synchroniseren"
 
 #. GenericName
 #: Internet/DrakSync.desktop:3
@@ -739,8 +735,9 @@ msgstr "Mappensynchronisatie"
 
 #. Name
 #: Internet/Evolution.desktop:2
+#, fuzzy
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -753,7 +750,7 @@ msgstr "E-mailclient"
 #. Name
 #: Internet/Faces.desktop:2
 msgid "Faces"
-msgstr ""
+msgstr "Gezichten"
 
 #. GenericName
 #: Internet/Faces.desktop:3 Internet/coolmail.desktop:3
@@ -763,9 +760,8 @@ msgstr "E-mailnotificatie"
 
 #. Name
 #: Internet/Fetchmailconf.desktop:2
-#, fuzzy
 msgid "Fetchmailconf"
-msgstr "Fetchmail instellen"
+msgstr "Fetchmail configuratie"
 
 #. GenericName
 #: Internet/Fetchmailconf.desktop:3
@@ -775,7 +771,7 @@ msgstr "Fetchmail instellen"
 #. Name
 #: Internet/Gabber.desktop:2
 msgid "Gabber"
-msgstr ""
+msgstr "Hardcore"
 
 #. GenericName
 #: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
@@ -785,7 +781,7 @@ msgstr "Instant messenger"
 #. Name
 #: Internet/Galeon.desktop:2
 msgid "Galeon"
-msgstr ""
+msgstr "Kameleon"
 
 #. GenericName
 #: Internet/Galeon.desktop:3 Internet/Terminal/Links.desktop:3
@@ -800,7 +796,7 @@ msgstr "Webbrowser"
 #. Name
 #: Internet/GnomeICU.desktop:2
 msgid "GNOMEICU"
-msgstr ""
+msgstr "GNOME-PIEMOL"
 
 #. GenericName
 #: Internet/GnomeICU.desktop:3 Internet/licq.desktop:3
@@ -809,14 +805,13 @@ msgstr "ICQ-messenger"
 
 #. Name
 #: Internet/Netscapemessenger.desktop:2
-#, fuzzy
 msgid "Netscape Messenger"
-msgstr "Instant messenger"
+msgstr "Netscape Messenger"
 
 #. Name
 #: Internet/Nmapfe.desktop:2
 msgid "Nmapfe"
-msgstr ""
+msgstr "NMAP-FE"
 
 #. GenericName
 #: Internet/Nmapfe.desktop:3
@@ -826,7 +821,7 @@ msgstr "Poortscanner"
 #. Name
 #: Internet/Pan.desktop:2
 msgid "Pan"
-msgstr ""
+msgstr "Verschuiven"
 
 #. GenericName
 #: Internet/Pan.desktop:3 Internet/knews.desktop:3
@@ -836,23 +831,22 @@ msgstr "Usenet-nieuwslezer"
 #. Name
 #: Internet/Sylpheed.desktop:2
 msgid "Sylpheed"
-msgstr ""
+msgstr "Spreadsheet"
 
 #. Name
 #: Internet/Terminal/Links.desktop:2
 msgid "Links"
-msgstr ""
+msgstr "Koppelingen"
 
 #. Name
 #: Internet/Terminal/Lynx.desktop:2
 msgid "Lynx"
-msgstr ""
+msgstr "Katachtige"
 
 #. Name
 #: Internet/Terminal/btdownloadcurses.desktop:2
-#, fuzzy
 msgid "BitTorrent Python Curses GUI"
-msgstr "Interface voor BitTorrent"
+msgstr "Grafische Interface voor BitTorrent (Python)"
 
 #. GenericName
 #: Internet/Terminal/btdownloadcurses.desktop:3
@@ -863,7 +857,7 @@ msgstr "Interface voor BitTorrent"
 #. Name
 #: Internet/Terminal/lftp.desktop:2
 msgid "Lftp"
-msgstr ""
+msgstr "L-FTP"
 
 #. GenericName
 #: Internet/Terminal/lftp.desktop:3 Internet/Terminal/ncftp.desktop:3
@@ -873,22 +867,22 @@ msgstr "FTP-client"
 #. Name
 #: Internet/Terminal/mutt.desktop:2
 msgid "Mutt"
-msgstr ""
+msgstr "Straathond"
 
 #. Name
 #: Internet/Terminal/ncftp.desktop:2
 msgid "NcFTP"
-msgstr ""
+msgstr "NC-FTP"
 
 #. Name
 #: Internet/Terminal/pine.desktop:2
 msgid "Pine"
-msgstr ""
+msgstr "Dennenappel"
 
 #. Name
 #: Internet/Terminal/silc.desktop:2
 msgid "Silc"
-msgstr ""
+msgstr "Piemol"
 
 #. GenericName
 #: Internet/Terminal/silc.desktop:3
@@ -898,7 +892,7 @@ msgstr "SILC-client"
 #. Name
 #: Internet/Terminal/slrn.desktop:2
 msgid "Slrn"
-msgstr ""
+msgstr "SL-RN"
 
 #. GenericName
 #: Internet/Terminal/slrn.desktop:3
@@ -908,33 +902,32 @@ msgstr "Nieuwslezer"
 #. Name
 #: Internet/Terminal/w3m.desktop:2
 msgid "w3m"
-msgstr ""
+msgstr "W-3-M"
 
 #. Name
 #: Internet/arena.desktop:2
 msgid "Arena"
-msgstr ""
+msgstr "Arena"
 
 #. Name
 #: Internet/balsa.desktop:2
 msgid "Balsa"
-msgstr ""
+msgstr "Basla"
 
 #. Name
 #: Internet/btdownloadgui.desktop:2
-#, fuzzy
 msgid "BitTorrent Python wxGTK GUI"
-msgstr "Interface voor BitTorrent"
+msgstr "Interface voor BitTorrent (wxGTK)"
 
 #. Name
 #: Internet/coolmail.desktop:2
 msgid "Coolmail"
-msgstr ""
+msgstr "Leuke Mail"
 
 #. Name
 #: Internet/dc_gui.desktop:2
 msgid "DCTC GUI"
-msgstr ""
+msgstr "DCTC-Interface"
 
 #. GenericName
 #: Internet/dc_gui.desktop:3
@@ -944,7 +937,7 @@ msgstr "Direct Connect-kloon"
 #. Name
 #: Internet/ed2k_gui.desktop:2
 msgid "eDonkey2000 GTK+ Core Controller"
-msgstr ""
+msgstr "eDonkey2000 GTK+ Kern-Beheerder"
 
 #. GenericName
 #: Internet/ed2k_gui.desktop:3
@@ -954,12 +947,12 @@ msgstr "eDonkey2000-GUI"
 #. Name
 #: Internet/epiphany.desktop:2
 msgid "Epiphany"
-msgstr ""
+msgstr "Olifantje"
 
 #. Name
 #: Internet/ethereal.desktop:2
 msgid "Ethereal"
-msgstr ""
+msgstr "Etherisch"
 
 #. GenericName
 #: Internet/ethereal.desktop:3 Internet/wireshark.desktop:3
@@ -969,17 +962,17 @@ msgstr "Netwerkanalyse"
 #. Name
 #: Internet/gFTP.desktop:2
 msgid "gFTP"
-msgstr ""
+msgstr "GNOME-FTP"
 
 #. Name
 #: Internet/gaim.desktop:2
 msgid "Gaim"
-msgstr ""
+msgstr "Duif"
 
 #. Name
 #: Internet/gnomemeeting.desktop:2
 msgid "GnomeMeeting"
-msgstr ""
+msgstr "GNOME Ontmoeting"
 
 #. GenericName
 #: Internet/gnomemeeting.desktop:3
@@ -1033,7 +1026,6 @@ msgstr ""
 
 #. GenericName
 #: Internet/mldonkey_gui.desktop:3
-#, fuzzy
 msgid "MLDonkey GUI"
 msgstr "eDonkey2000-GUI"
 
@@ -1079,7 +1071,6 @@ msgstr ""
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
 msgstr "IRC-chat"
 
@@ -1213,9 +1204,8 @@ msgstr "Geluidsstudio"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "MPEG-speler"
+msgstr "MPlayer"
 
 #. Name
 #: Multimedia/mtv.desktop:2
@@ -1234,7 +1224,6 @@ msgstr "DVD-speler"
 
 #. Name
 #: Multimedia/oqtplayer.desktop:2
-#, fuzzy
 msgid "OQTPlayer"
 msgstr "DVD-speler"
 
@@ -1245,9 +1234,8 @@ msgstr "MOV-videospeler"
 
 #. Name
 #: Multimedia/realplayer.desktop:2
-#, fuzzy
 msgid "RealPlayer"
-msgstr "Videospeler"
+msgstr "Echte Videospeler"
 
 #. Name
 #: Multimedia/rezound.desktop:2
@@ -1277,7 +1265,7 @@ msgstr ""
 #. GenericName
 #: Multimedia/xawtv.desktop:3
 msgid "Watch TV!"
-msgstr "TV kijken"
+msgstr "TV kijken!"
 
 #. Name
 #: Multimedia/xcam.desktop:2
@@ -1356,9 +1344,8 @@ msgstr "Contactenbeheer"
 
 #. Name
 #: Office/GnomeTimeTracker.desktop:2
-#, fuzzy
 msgid "GNOME Time Tracker"
-msgstr "GNOME Nibbles Spel"
+msgstr "GNOME Tijdsbeheerder"
 
 #. Name
 #: Office/Gnumeric.desktop:2
@@ -1473,9 +1460,8 @@ msgstr "Agendabeheer"
 
 #. Name
 #: Office/pybliographic.desktop:2
-#, fuzzy
 msgid "Pybliographic"
-msgstr "Bibliografische database"
+msgstr "Bibliografische database (Python)"
 
 #. GenericName
 #: Office/pybliographic.desktop:3
@@ -1499,9 +1485,8 @@ msgstr ""
 
 #. Name
 #: System/Terminal/aterm.desktop:2
-#, fuzzy
 msgid "Terminal"
-msgstr "Het origineel"
+msgstr "Terminalvenster"
 
 #. GenericName
 #: System/Terminal/aterm.desktop:3 Utilities/XUtilities/xterm.desktop:3
@@ -1620,23 +1605,22 @@ msgstr ""
 #. Name
 #: Utilities/Editors/nedit.desktop:2
 msgid "Nedit"
-msgstr ""
+msgstr "NEdit"
 
 #. Name
 #: Utilities/Editors/pico.desktop:2
 msgid "Pico"
-msgstr ""
+msgstr "Pico"
 
 #. Name
 #: Utilities/Editors/xedit.desktop:2
-#, fuzzy
 msgid "X Editor"
-msgstr "HTML-editor"
+msgstr "X-aanpasser"
 
 #. Name
 #: Utilities/Editors/xemacs.desktop:2
 msgid "X Emacs"
-msgstr ""
+msgstr "X-Emacs"
 
 #. Name
 #: Utilities/GKrellM.desktop:2
@@ -1651,7 +1635,7 @@ msgstr ""
 #. Name
 #: Utilities/GnomeWho.desktop:2
 msgid "GNOME Who"
-msgstr ""
+msgstr "GNOME Wie"
 
 #. GenericName
 #: Utilities/GnomeWho.desktop:3
@@ -1680,9 +1664,8 @@ msgstr "Vensters geforceerd sluiten"
 
 #. Name
 #: Utilities/XUtilities/Xrefresh.desktop:2
-#, fuzzy
 msgid "X Refresh"
-msgstr "Scherm verversen"
+msgstr "X verversen"
 
 #. GenericName
 #: Utilities/XUtilities/Xrefresh.desktop:3
@@ -1711,9 +1694,8 @@ msgstr "Rekenmachine"
 
 #. Name
 #: Utilities/XUtilities/xclipboard.desktop:2
-#, fuzzy
 msgid "X Clipboard"
-msgstr "Klembordbeheer"
+msgstr "X Klembordbeheer"
 
 #. GenericName
 #: Utilities/XUtilities/xclipboard.desktop:3
@@ -1722,9 +1704,8 @@ msgstr "Klembordbeheer"
 
 #. Name
 #: Utilities/XUtilities/xclock.desktop:2
-#, fuzzy
 msgid "X Clock"
-msgstr "Klok"
+msgstr "X Klok"
 
 #. GenericName
 #: Utilities/XUtilities/xclock.desktop:3 Utilities/oclock.desktop:3
@@ -1753,9 +1734,8 @@ msgstr "Systeembelasting bewaken"
 
 #. Name
 #: Utilities/XUtilities/xmag.desktop:2
-#, fuzzy
 msgid "X Magnifier"
-msgstr "Vergrootglas"
+msgstr "X Vergrootglas"
 
 #. GenericName
 #: Utilities/XUtilities/xmag.desktop:3
@@ -1764,15 +1744,13 @@ msgstr "Vergrootglas"
 
 #. Name
 #: Utilities/XUtilities/xterm.desktop:2
-#, fuzzy
 msgid "X Terminal"
-msgstr "Het origineel"
+msgstr "X Terminalvenster"
 
 #. Name
 #: Utilities/calctool.desktop:2
-#, fuzzy
 msgid "Calctool"
-msgstr "Rekenmachine"
+msgstr "Rekenmachine gereedschap"
 
 #. Name
 #: Utilities/e-notes.desktop:2
@@ -1786,9 +1764,8 @@ msgstr "Persoonlijke notities"
 
 #. Name
 #: Utilities/oclock.desktop:2
-#, fuzzy
 msgid "OClock"
-msgstr "Klok"
+msgstr "O-Klok"
 
 #. Name
 #: Utilities/xgnokii.desktop:2
diff --git a/translations/desktop_files/kappfinder-data/ru.po b/translations/desktop_files/kappfinder-data/ru.po
index 4fffc337e..67a1718e1 100644
--- a/translations/desktop_files/kappfinder-data/ru.po
+++ b/translations/desktop_files/kappfinder-data/ru.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024.
 # Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\n"
-"PO-Revision-Date: 2023-12-07 21:14+0000\n"
-"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kappfinder-data/ru/>\n"
 "Language: ru\n"
@@ -42,7 +42,7 @@ msgstr "Программа про�мотра документов"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -51,9 +51,8 @@ msgstr "Экранный отладчик DDD"
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Редактор форм"
+msgstr "Qt Designer"
 
 #. GenericName
 #: Development/designer.desktop:3
@@ -74,12 +73,12 @@ msgstr "Редактор диалогов дл� Qt"
 #. Name
 #: Development/eclipse.desktop:3
 msgid "Eclipse"
-msgstr ""
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
 msgid "Eclipse IDE"
-msgstr ""
+msgstr "Eclipse IDE"
 
 #. Name
 #: Development/fdesign.desktop:2
@@ -89,7 +88,7 @@ msgstr "Редактор форм"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -109,7 +108,7 @@ msgstr "Переводчик дл� Qt"
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -119,17 +118,17 @@ msgstr "Эмул�тор Palm/Wireless"
 #. Name
 #: Development/sced.desktop:2
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
 msgid "Scene Modeler"
-msgstr ""
+msgstr "Моделирование �цен"
 
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
 msgid "ClanBomber"
-msgstr ""
+msgstr "ClanBomber"
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -145,7 +144,7 @@ msgstr "�ркадна� игра"
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
 msgid "Frozen Bubble"
-msgstr ""
+msgstr "Frozen Bubble"
 
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
@@ -155,7 +154,7 @@ msgstr "Тетри�-подобна� игра"
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -165,12 +164,12 @@ msgstr "Игра GNOME"
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
 msgid "Gnobots II"
-msgstr ""
+msgstr "Gnobots II"
 
 #. Name
 #: Games/Arcade/Mures.desktop:2
 msgid "Mures"
-msgstr ""
+msgstr "Mures"
 
 #. Name
 #: Games/Arcade/SuperMethaneBrothers.desktop:2
@@ -195,17 +194,17 @@ msgstr "Игра-гонки"
 #. Name
 #: Games/Arcade/XKobo.desktop:2
 msgid "XKobo"
-msgstr ""
+msgstr "XKobo"
 
 #. Name
 #: Games/Arcade/XSoldier.desktop:2
 msgid "XSoldier"
-msgstr ""
+msgstr "XSoldier"
 
 #. Name
 #: Games/Arcade/alephone-nogl.desktop:2
 msgid "Alephone"
-msgstr ""
+msgstr "Alephone"
 
 #. Comment
 #: Games/Arcade/alephone-nogl.desktop:3
@@ -231,7 +230,7 @@ msgstr "Батальон"
 #. Name
 #: Games/Arcade/battleball.desktop:2
 msgid "Battleball"
-msgstr ""
+msgstr "Battleball"
 
 #. GenericName
 #: Games/Arcade/battleball.desktop:3
@@ -241,12 +240,12 @@ msgstr "�а�тольна� игра"
 #. Name
 #: Games/Arcade/cxhextris.desktop:2
 msgid "cxhextris"
-msgstr ""
+msgstr "cxhextris"
 
 #. Name
 #: Games/Arcade/rocksndiamonds.desktop:2
 msgid "Rocks n Diamonds"
-msgstr ""
+msgstr "Rocks n Diamonds"
 
 #. GenericName
 #: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
@@ -256,12 +255,12 @@ msgstr "Тактиче�ка� игра"
 #. Name
 #: Games/Arcade/scavenger.desktop:2
 msgid "Scavenger"
-msgstr ""
+msgstr "Scavenger"
 
 #. Name
 #: Games/Board/Gataxx.desktop:2
 msgid "Gataxx"
-msgstr ""
+msgstr "Gataxx"
 
 #. Name
 #: Games/Board/Gchess.desktop:2
@@ -271,13 +270,12 @@ msgstr "Шахматы GNOME"
 #. Name
 #: Games/Board/Glines.desktop:2
 msgid "Glines"
-msgstr ""
+msgstr "Glines"
 
 #. Name
 #: Games/Board/Gmahjongg.desktop:2
-#, fuzzy
 msgid "GNOME Mahjongg"
-msgstr "Сапёр GNOME"
+msgstr "Маджонг GNOME"
 
 #. GenericName
 #: Games/Board/Gmahjongg.desktop:3
@@ -311,14 +309,13 @@ msgstr "Игра GNOME (Klotski)"
 
 #. Name
 #: Games/Board/Gstones.desktop:2
-#, fuzzy
 msgid "GNOME Stones"
-msgstr "Сапёр GNOME"
+msgstr "GNOME Stones"
 
 #. Name
 #: Games/Board/Iagno.desktop:2
 msgid "Iagno"
-msgstr ""
+msgstr "Ревер�и GNOME"
 
 #. GenericName
 #: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
@@ -329,18 +326,17 @@ msgstr "�а�тольна� игра"
 #. Name
 #: Games/Board/SameGnome.desktop:2
 msgid "Same GNOME"
-msgstr ""
+msgstr "Same GNOME"
 
 #. Name
 #: Games/Board/Xgammon.desktop:2
 msgid "Xgammon"
-msgstr ""
+msgstr "Xgammon"
 
 #. Name
 #: Games/Board/xboard.desktop:2
-#, fuzzy
 msgid "Xboard"
-msgstr "Буфер обмена X"
+msgstr "Xboard"
 
 #. GenericName
 #: Games/Board/xboard.desktop:3
@@ -350,7 +346,7 @@ msgstr "Шахматы"
 #. Name
 #: Games/Card/AisleRiot.desktop:2
 msgid "AisleRiot"
-msgstr ""
+msgstr "AisleRiot"
 
 #. GenericName
 #: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
@@ -361,28 +357,27 @@ msgstr "Карточна� игра"
 #. Name
 #: Games/Card/FreeCell.desktop:2
 msgid "FreeCell"
-msgstr ""
+msgstr "Свободна� �чейка"
 
 #. Name
 #: Games/Card/PySol.desktop:2
 msgid "PySol"
-msgstr ""
+msgstr "PySol"
 
 #. Name
 #: Games/Card/XPat2.desktop:2
 msgid "XPat 2"
-msgstr ""
+msgstr "XPat 2"
 
 #. Name
 #: Games/Clanbomber.desktop:2
 msgid "Clanbomber"
-msgstr ""
+msgstr "Clanbomber"
 
 #. Name
 #: Games/Emulators/cmail.desktop:2
-#, fuzzy
 msgid "ChessMail"
-msgstr "Шахматы"
+msgstr "ChessMail"
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -392,7 +387,7 @@ msgstr "Сообщение email дл� шахмат"
 #. Name
 #: Games/Emulators/qmamecat.desktop:2
 msgid "Qmamecat"
-msgstr ""
+msgstr "Qmamecat"
 
 #. GenericName
 #: Games/Emulators/qmamecat.desktop:3
@@ -402,7 +397,7 @@ msgstr "Эмул�тор аркадных игр"
 #. Name
 #: Games/GTali.desktop:2
 msgid "GTali"
-msgstr ""
+msgstr "GTali"
 
 #. GenericName
 #: Games/GTali.desktop:3
@@ -432,7 +427,7 @@ msgstr "Отправьте�ь в Морию и победите Барлога"
 #. Name
 #: Games/Roguelikes/nethack.desktop:2
 msgid "NetHack"
-msgstr ""
+msgstr "NetHack"
 
 #. GenericName
 #: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
@@ -442,7 +437,7 @@ msgstr "Приключение (кве�т)"
 #. Name
 #: Games/Roguelikes/rogue.desktop:2
 msgid "Rogue"
-msgstr ""
+msgstr "Rogue"
 
 #. GenericName
 #: Games/Roguelikes/rogue.desktop:3
@@ -453,7 +448,7 @@ msgstr "Терминал"
 #. Name
 #: Games/Roguelikes/tome.desktop:2
 msgid "ToME"
-msgstr ""
+msgstr "ToME"
 
 #. Name
 #: Games/Roguelikes/zangband.desktop:2
@@ -469,7 +464,7 @@ msgstr "Победите Зме� хао�а"
 #. Name
 #: Games/TacticStrategy/freeciv.desktop:3
 msgid "Freeciv"
-msgstr ""
+msgstr "Freeciv"
 
 #. GenericName
 #: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
@@ -489,7 +484,7 @@ msgstr "Сервер дл� FreeCiv"
 #. Name
 #: Games/TacticStrategy/xscorch.desktop:3
 msgid "XScorch"
-msgstr ""
+msgstr "XScorch"
 
 #. Comment
 #: Games/TacticStrategy/xscorch.desktop:4
@@ -529,7 +524,7 @@ msgstr ""
 #. Name
 #: Games/xshipwars.desktop:3
 msgid "XShipWars"
-msgstr ""
+msgstr "XShipWars"
 
 #. Name
 #: Graphics/ElectricEyes.desktop:2
@@ -544,7 +539,7 @@ msgstr "Программа про�мотра ри�унков"
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "GPhoto"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -584,7 +579,7 @@ msgstr "Программа векторной графики"
 #. Name
 #: Graphics/Xpcd.desktop:2
 msgid "Xpcd"
-msgstr ""
+msgstr "Xpcd"
 
 #. GenericName
 #: Graphics/Xpcd.desktop:3
@@ -614,7 +609,7 @@ msgstr "Создание ра�тровых ри�унков"
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Blender"
 
 #. GenericName
 #: Graphics/blender.desktop:3
@@ -624,7 +619,7 @@ msgstr "3D рендерер/моделер"
 #. Name
 #: Graphics/ghostview.desktop:2
 msgid "GhostView"
-msgstr ""
+msgstr "GhostView"
 
 #. GenericName
 #: Graphics/ghostview.desktop:3
@@ -634,7 +629,7 @@ msgstr "Программа про�мотра PostScript"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "Gimp"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -644,7 +639,7 @@ msgstr "Редактор ри�унков"
 #. Name
 #: Graphics/gv.desktop:2
 msgid "GV"
-msgstr ""
+msgstr "GV"
 
 #. GenericName
 #: Graphics/gv.desktop:3
@@ -654,7 +649,7 @@ msgstr "Программа про�мотра Postscript"
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "Inkscape"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -679,7 +674,7 @@ msgstr "Программа дл� ри�овани�"
 #. Name
 #: Graphics/xdvi.desktop:2
 msgid "X DVI"
-msgstr ""
+msgstr "X DVI"
 
 #. GenericName
 #: Graphics/xdvi.desktop:3
@@ -694,7 +689,7 @@ msgstr ""
 #. Name
 #: Graphics/xpaint.desktop:2
 msgid "X Paint"
-msgstr ""
+msgstr "X Paint"
 
 #. GenericName
 #: Graphics/xpaint.desktop:3
@@ -704,7 +699,7 @@ msgstr "Графиче�кий редактор"
 #. Name
 #: Graphics/xv.desktop:2
 msgid "XV"
-msgstr ""
+msgstr "XV"
 
 #. GenericName
 #: Graphics/xv.desktop:3
@@ -744,7 +739,7 @@ msgstr "Синхронизаци� папок"
 #. Name
 #: Internet/Evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -779,7 +774,7 @@ msgstr "�а�тройка fetchmail"
 #. Name
 #: Internet/Gabber.desktop:2
 msgid "Gabber"
-msgstr ""
+msgstr "Gabber"
 
 #. GenericName
 #: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
@@ -846,12 +841,12 @@ msgstr ""
 #. Name
 #: Internet/Terminal/Links.desktop:2
 msgid "Links"
-msgstr ""
+msgstr "Links"
 
 #. Name
 #: Internet/Terminal/Lynx.desktop:2
 msgid "Lynx"
-msgstr ""
+msgstr "Lynx"
 
 #. Name
 #: Internet/Terminal/btdownloadcurses.desktop:2
@@ -877,7 +872,7 @@ msgstr "Клиент FTP"
 #. Name
 #: Internet/Terminal/mutt.desktop:2
 msgid "Mutt"
-msgstr ""
+msgstr "Mutt"
 
 #. Name
 #: Internet/Terminal/ncftp.desktop:2
@@ -892,7 +887,7 @@ msgstr ""
 #. Name
 #: Internet/Terminal/silc.desktop:2
 msgid "Silc"
-msgstr ""
+msgstr "Silc"
 
 #. GenericName
 #: Internet/Terminal/silc.desktop:3
@@ -912,7 +907,7 @@ msgstr "Программа дл� чтени� ново�тей"
 #. Name
 #: Internet/Terminal/w3m.desktop:2
 msgid "w3m"
-msgstr ""
+msgstr "w3m"
 
 #. Name
 #: Internet/arena.desktop:2
@@ -957,12 +952,12 @@ msgstr "Графиче�кий интерфей� eDonkey2000"
 #. Name
 #: Internet/epiphany.desktop:2
 msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany"
 
 #. Name
 #: Internet/ethereal.desktop:2
 msgid "Ethereal"
-msgstr ""
+msgstr "Ethereal"
 
 #. GenericName
 #: Internet/ethereal.desktop:3 Internet/wireshark.desktop:3
@@ -972,7 +967,7 @@ msgstr "�нализатор �етевого трафика"
 #. Name
 #: Internet/gFTP.desktop:2
 msgid "gFTP"
-msgstr ""
+msgstr "gFTP"
 
 #. Name
 #: Internet/gaim.desktop:2
@@ -1024,7 +1019,7 @@ msgstr "Запу�к приложений Java из �ети"
 #. Name
 #: Internet/knews.desktop:2
 msgid "KNews"
-msgstr ""
+msgstr "KNews"
 
 #. Name
 #: Internet/licq.desktop:2
@@ -1044,37 +1039,37 @@ msgstr "Графиче�кий интерфей� MLDonkey"
 #. Name
 #: Internet/mozilla-firefox.desktop:2
 msgid "Firefox"
-msgstr ""
+msgstr "Firefox"
 
 #. Name
 #: Internet/mozilla-thunderbird.desktop:2
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. Name
 #: Internet/mozilla.desktop:2
 msgid "Mozilla"
-msgstr ""
+msgstr "Mozilla"
 
 #. Name
 #: Internet/netscape.desktop:2
 msgid "Netscape"
-msgstr ""
+msgstr "Netscape"
 
 #. Name
 #: Internet/netscape6.desktop:2
 msgid "Netscape6"
-msgstr ""
+msgstr "Netscape6"
 
 #. Name
 #: Internet/opera.desktop:2
 msgid "Opera"
-msgstr ""
+msgstr "Opera"
 
 #. Name
 #: Internet/wireshark.desktop:2
 msgid "Wireshark"
-msgstr ""
+msgstr "Wireshark"
 
 #. Name
 #: Internet/xbiff.desktop:2
@@ -1083,9 +1078,8 @@ msgstr ""
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "Клиент IRC"
+msgstr "XChat"
 
 #. GenericName
 #: Internet/xchat.desktop:3
@@ -1125,7 +1119,7 @@ msgstr "CD плейер/риппер"
 #. Name
 #: Multimedia/MP3info.desktop:2
 msgid "MP3 Info"
-msgstr ""
+msgstr "MP3 Info"
 
 #. Name
 #: Multimedia/XMovie.desktop:2
@@ -1173,7 +1167,7 @@ msgstr "Звуковой редактор"
 #. Name
 #: Multimedia/aviplay.desktop:2
 msgid "Aviplay"
-msgstr ""
+msgstr "Aviplay"
 
 #. GenericName
 #: Multimedia/aviplay.desktop:3
@@ -1208,7 +1202,7 @@ msgstr ""
 #. Name
 #: Multimedia/jazz.desktop:2
 msgid "Jazz"
-msgstr ""
+msgstr "Jazz"
 
 #. GenericName
 #: Multimedia/jazz.desktop:3
@@ -1217,9 +1211,8 @@ msgstr "Звуковой проце��ор"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "Проигрыватель MPEG"
+msgstr "MPlayer"
 
 #. Name
 #: Multimedia/mtv.desktop:2
@@ -1296,7 +1289,7 @@ msgstr "Камера"
 #. Name
 #: Multimedia/xine.desktop:2
 msgid "Xine"
-msgstr ""
+msgstr "Xine"
 
 #. Name
 #: Multimedia/xmms-enqueue.desktop:2
@@ -1311,7 +1304,7 @@ msgstr "Спи�ок пе�ен"
 #. Name
 #: Multimedia/xmms.desktop:2
 msgid "XMMS"
-msgstr ""
+msgstr "XMMS"
 
 #. GenericName
 #: Multimedia/xmms.desktop:3
@@ -1331,7 +1324,7 @@ msgstr "Офи�ный пакет"
 #. Name
 #: Office/Dia.desktop:2
 msgid "Dia"
-msgstr ""
+msgstr "Dia"
 
 #. GenericName
 #: Office/Dia.desktop:3 Office/Guppi.desktop:3
@@ -1366,7 +1359,7 @@ msgstr "Учёт времени GNOME"
 #. Name
 #: Office/Gnumeric.desktop:2
 msgid "Gnumeric"
-msgstr ""
+msgstr "Gnumeric"
 
 #. GenericName
 #: Office/Gnumeric.desktop:3 Office/XsLite.desktop:3
@@ -1381,7 +1374,7 @@ msgstr ""
 #. Name
 #: Office/Ical.desktop:2
 msgid "Ical"
-msgstr ""
+msgstr "Ical"
 
 #. GenericName
 #: Office/Ical.desktop:3
@@ -1407,7 +1400,7 @@ msgstr ""
 #. Name
 #: Office/XAcc.desktop:2
 msgid "xacc"
-msgstr ""
+msgstr "xacc"
 
 #. GenericName
 #: Office/XAcc.desktop:3
@@ -1422,12 +1415,12 @@ msgstr ""
 #. Name
 #: Office/abiword.desktop:2
 msgid "AbiWord"
-msgstr ""
+msgstr "AbiWord"
 
 #. Name
 #: Office/acroread.desktop:2
 msgid "Acrobat Reader"
-msgstr ""
+msgstr "Acrobat Reader"
 
 #. GenericName
 #: Office/acroread.desktop:3 Office/xpdf.desktop:3
@@ -1436,8 +1429,9 @@ msgstr "Про�мотр PDF"
 
 #. Name
 #: Office/gnucash.desktop:2
+#, fuzzy
 msgid "GnuCash"
-msgstr ""
+msgstr "GnuCash"
 
 #. GenericName
 #: Office/gnucash.desktop:3
@@ -1447,7 +1441,7 @@ msgstr "Менеджер финан�ов"
 #. Name
 #: Office/lyx.desktop:2
 msgid "LyX"
-msgstr ""
+msgstr "LyX"
 
 #. Name
 #: Office/mrproject.desktop:2
@@ -1498,7 +1492,7 @@ msgstr "�а�тольное издатель�тво"
 #. Name
 #: Office/xpdf.desktop:2
 msgid "X PDF"
-msgstr ""
+msgstr "X PDF"
 
 #. Name
 #: System/Terminal/aterm.desktop:2
@@ -1513,7 +1507,7 @@ msgstr "Терминал"
 #. Name
 #: System/Terminal/procinfo.desktop:2
 msgid "Procinfo"
-msgstr ""
+msgstr "Procinfo"
 
 #. GenericName
 #: System/Terminal/procinfo.desktop:3
@@ -1523,7 +1517,7 @@ msgstr "Сведени� о �и�темных проце��ах"
 #. Name
 #: System/Terminal/rxvt.desktop:2
 msgid "RXVT"
-msgstr ""
+msgstr "RXVT"
 
 #. GenericName
 #: System/Terminal/rxvt.desktop:3
@@ -1533,7 +1527,7 @@ msgstr "Ра�ширенный �мул�тор терминала"
 #. Name
 #: System/Terminal/vmstat.desktop:2
 msgid "Vmstat"
-msgstr ""
+msgstr "Vmstat"
 
 #. GenericName
 #: System/Terminal/vmstat.desktop:3
@@ -1568,7 +1562,7 @@ msgstr "Си�темное админи�трирование SAM"
 #. Name
 #: System/wine.desktop:2
 msgid "Wine"
-msgstr ""
+msgstr "Wine"
 
 #. GenericName
 #: System/wine.desktop:3
@@ -1588,7 +1582,7 @@ msgstr "Си�темный монитор"
 #. Name
 #: Utilities/Editors/emacs.desktop:2
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
 #. GenericName
 #: Utilities/Editors/emacs.desktop:3 Utilities/Editors/gedit.desktop:3
@@ -1601,9 +1595,8 @@ msgstr "Тек�товый редактор"
 
 #. Name
 #: Utilities/Editors/gedit.desktop:2
-#, fuzzy
 msgid "gEdit"
-msgstr "Редактор X"
+msgstr "gEdit"
 
 #. Name
 #: Utilities/Editors/gvim.desktop:2
@@ -1618,7 +1611,7 @@ msgstr ""
 #. Name
 #: Utilities/Editors/nano.desktop:2
 msgid "Nano"
-msgstr ""
+msgstr "Nano"
 
 #. Name
 #: Utilities/Editors/nedit.desktop:2
@@ -1628,7 +1621,7 @@ msgstr "NEdit"
 #. Name
 #: Utilities/Editors/pico.desktop:2
 msgid "Pico"
-msgstr ""
+msgstr "Pico"
 
 #. Name
 #: Utilities/Editors/xedit.desktop:2
@@ -1638,12 +1631,12 @@ msgstr "Редактор X"
 #. Name
 #: Utilities/Editors/xemacs.desktop:2
 msgid "X Emacs"
-msgstr ""
+msgstr "X Emacs"
 
 #. Name
 #: Utilities/GKrellM.desktop:2
 msgid "GKrellM"
-msgstr ""
+msgstr "GKrellM"
 
 #. GenericName
 #: Utilities/GKrellM.desktop:3
@@ -1674,7 +1667,7 @@ msgstr "Про�мотр �и�темных журналов"
 #. Name
 #: Utilities/XUtilities/Xkill.desktop:2
 msgid "X Kill"
-msgstr ""
+msgstr "X Kill"
 
 #. GenericName
 #: Utilities/XUtilities/Xkill.desktop:3
@@ -1785,14 +1778,13 @@ msgstr "Личные заметки"
 
 #. Name
 #: Utilities/oclock.desktop:2
-#, fuzzy
 msgid "OClock"
-msgstr "Ча�ы"
+msgstr "OClock"
 
 #. Name
 #: Utilities/xgnokii.desktop:2
 msgid "X-Gnokii"
-msgstr ""
+msgstr "X-Gnokii"
 
 #. GenericName
 #: Utilities/xgnokii.desktop:3
diff --git a/translations/desktop_files/kappfinder-data/sv.po b/translations/desktop_files/kappfinder-data/sv.po
index a1a1862e2..1a8b3c9fc 100644
--- a/translations/desktop_files/kappfinder-data/sv.po
+++ b/translations/desktop_files/kappfinder-data/sv.po
@@ -1,35 +1,36 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:16+0000\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-06-12 23:45+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: Development/Forte.desktop:2
 msgid "Forte"
-msgstr ""
+msgstr "Forte"
 
 #. GenericName
 #: Development/Forte.desktop:3
 msgid "Java IDE"
-msgstr "Java-IDE"
+msgstr "Java integrerad utvecklingsmiljö"
 
 #. Name
 #: Development/assistant.desktop:2
 msgid "Qt Assistant"
-msgstr ""
+msgstr "Qt-assistent"
 
 #. GenericName
 #: Development/assistant.desktop:3
@@ -39,7 +40,7 @@ msgstr "Dokumentbläddrare"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -68,9 +69,8 @@ msgstr "Dialogeditor"
 
 #. Name
 #: Development/eclipse.desktop:3
-#, fuzzy
 msgid "Eclipse"
-msgstr "Eclipse integrerad utvecklingsmiljö"
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
@@ -85,7 +85,7 @@ msgstr "Formulärdesigner"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -104,8 +104,9 @@ msgstr "Översättningsverktyg"
 
 #. Name
 #: Development/pose.desktop:2
+#, fuzzy
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -114,8 +115,9 @@ msgstr "Emulator för trådlös Palm"
 
 #. Name
 #: Development/sced.desktop:2
+#, fuzzy
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
@@ -151,7 +153,7 @@ msgstr "Tetrisliknande spel"
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -161,7 +163,7 @@ msgstr "Gnome-spelet Nibbles"
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
 msgid "Gnobots II"
-msgstr ""
+msgstr "Gnobots II"
 
 #. Name
 #: Games/Arcade/Mures.desktop:2
@@ -330,13 +332,12 @@ msgstr "Same Gnome"
 #. Name
 #: Games/Board/Xgammon.desktop:2
 msgid "Xgammon"
-msgstr ""
+msgstr "X-backgammon"
 
 #. Name
 #: Games/Board/xboard.desktop:2
-#, fuzzy
 msgid "Xboard"
-msgstr "X clipboard"
+msgstr "X-schack"
 
 #. GenericName
 #: Games/Board/xboard.desktop:3
@@ -856,7 +857,7 @@ msgstr "BitTorrent Python Curses grafiskt gränssnitt"
 #: Internet/Terminal/btdownloadcurses.desktop:3
 #: Internet/btdownloadgui.desktop:3
 msgid "BitTorrent GUI"
-msgstr "Grafiskt gränssnitt för BitTorrent "
+msgstr "Grafiskt gränssnitt för BitTorrent"
 
 #. Name
 #: Internet/Terminal/lftp.desktop:2
diff --git a/translations/desktop_files/kappfinder-data/zh_CN.po b/translations/desktop_files/kappfinder-data/zh_CN.po
index 07da33146..9a6ced5ca 100644
--- a/translations/desktop_files/kappfinder-data/zh_CN.po
+++ b/translations/desktop_files/kappfinder-data/zh_CN.po
@@ -1,20 +1,21 @@
 # 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: 2021-07-07 18:16+0000\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-04-22 18:53+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kappfinder-data/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.17\n"
 
 #. Name
 #: Development/Forte.desktop:2
@@ -39,7 +40,7 @@ msgstr "文档�览器"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -68,7 +69,6 @@ msgstr "对�框编辑器"
 
 #. Name
 #: Development/eclipse.desktop:3
-#, fuzzy
 msgid "Eclipse"
 msgstr "Eclipse 集�开�环境"
 
@@ -85,7 +85,7 @@ msgstr "表�设计器"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -181,7 +181,7 @@ msgstr ""
 #. Name
 #: Games/Arcade/TuxRacer.desktop:2
 msgid "TuxRacer"
-msgstr ""
+msgstr "TuxRacer 赛车"
 
 #. GenericName
 #: Games/Arcade/TuxRacer.desktop:3
@@ -343,7 +343,7 @@ msgstr "国际象棋游�"
 #. Name
 #: Games/Card/AisleRiot.desktop:2
 msgid "AisleRiot"
-msgstr ""
+msgstr "AisleRiot 纸牌游�"
 
 #. GenericName
 #: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
@@ -373,9 +373,8 @@ msgstr "炸弹人"
 
 #. Name
 #: Games/Emulators/cmail.desktop:2
-#, fuzzy
 msgid "ChessMail"
-msgstr "国际象棋游�"
+msgstr "ChessMail 国际象棋游�"
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -425,7 +424,7 @@ msgstr "潜入 Moria 并击败 Balrog"
 #. Name
 #: Games/Roguelikes/nethack.desktop:2
 msgid "NetHack"
-msgstr ""
+msgstr "NetHack �典肉鸽"
 
 #. GenericName
 #: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
@@ -495,7 +494,7 @@ msgstr "X 眼�"
 #. Name
 #: Games/Toys/xpinguin.desktop:2
 msgid "Tux"
-msgstr ""
+msgstr "Tux �鹅"
 
 #. GenericName
 #: Games/Toys/xpinguin.desktop:3
@@ -535,7 +534,7 @@ msgstr "图片查看程�"
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "GPhoto 命令行相机客户端"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -565,7 +564,7 @@ msgstr "图片�览器"
 #. Name
 #: Graphics/Sketch.desktop:2
 msgid "Sketch"
-msgstr ""
+msgstr "Sketch 3D 场景设计"
 
 #. GenericName
 #: Graphics/Sketch.desktop:3
@@ -605,7 +604,7 @@ msgstr "�图制作程�"
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Blender 建模"
 
 #. GenericName
 #: Graphics/blender.desktop:3
@@ -625,7 +624,7 @@ msgstr "PostScript 查看器"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "GIMP"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -645,7 +644,7 @@ msgstr "Postscript 查看器"
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "Inkspace SVG 编辑器"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -680,7 +679,7 @@ msgstr "DVI 查看器"
 #. Name
 #: Graphics/xfig.desktop:2
 msgid "Xfig"
-msgstr ""
+msgstr "Xfig 放大镜"
 
 #. Name
 #: Graphics/xpaint.desktop:2
@@ -705,7 +704,7 @@ msgstr "图片查看器"
 #. Name
 #: Internet/BlueFish.desktop:2
 msgid "BlueFish"
-msgstr ""
+msgstr "BlueFish HTML 开�环境"
 
 #. GenericName
 #: Internet/BlueFish.desktop:3
@@ -735,7 +734,7 @@ msgstr "文件夹�步"
 #. Name
 #: Internet/Evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution �览器"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -794,9 +793,8 @@ msgstr "Web �览器"
 
 #. Name
 #: Internet/GnomeICU.desktop:2
-#, fuzzy
 msgid "GNOMEICU"
-msgstr "GNOME 国际象棋"
+msgstr "GNOME 国际象棋�机版"
 
 #. GenericName
 #: Internet/GnomeICU.desktop:3 Internet/licq.desktop:3
@@ -805,9 +803,8 @@ msgstr "ICQ 信使"
 
 #. Name
 #: Internet/Netscapemessenger.desktop:2
-#, fuzzy
 msgid "Netscape Messenger"
-msgstr "�时消�程�"
+msgstr "Netscape Messager �时通讯"
 
 #. Name
 #: Internet/Nmapfe.desktop:2
@@ -843,18 +840,18 @@ msgstr ""
 #. Name
 #: Internet/Terminal/Lynx.desktop:2
 msgid "Lynx"
-msgstr ""
+msgstr "Lynx 命令行文本�览器"
 
 #. Name
 #: Internet/Terminal/btdownloadcurses.desktop:2
 msgid "BitTorrent Python Curses GUI"
-msgstr ""
+msgstr "BitTorrent ��下载器 (Python Curses GUI)"
 
 #. GenericName
 #: Internet/Terminal/btdownloadcurses.desktop:3
 #: Internet/btdownloadgui.desktop:3
 msgid "BitTorrent GUI"
-msgstr ""
+msgstr "BitTorrent ��下载器"
 
 #. Name
 #: Internet/Terminal/lftp.desktop:2
@@ -949,7 +946,7 @@ msgstr ""
 #. Name
 #: Internet/epiphany.desktop:2
 msgid "Epiphany"
-msgstr ""
+msgstr "Epiphany �览器"
 
 #. Name
 #: Internet/ethereal.desktop:2
@@ -989,9 +986,8 @@ msgstr "GNOME 时间记录"
 
 #. Name
 #: Internet/gtelnet.desktop:2
-#, fuzzy
 msgid "GNOME Telnet"
-msgstr "GNOME 挖地雷"
+msgstr "GNOME telnet �端"
 
 #. GenericName
 #: Internet/gtelnet.desktop:3
@@ -1036,12 +1032,12 @@ msgstr ""
 #. Name
 #: Internet/mozilla-firefox.desktop:2
 msgid "Firefox"
-msgstr ""
+msgstr "Firefox �览器"
 
 #. Name
 #: Internet/mozilla-thunderbird.desktop:2
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird 下载器"
 
 #. Name
 #: Internet/mozilla.desktop:2
@@ -1066,7 +1062,7 @@ msgstr ""
 #. Name
 #: Internet/wireshark.desktop:2
 msgid "Wireshark"
-msgstr ""
+msgstr "Wireshark 网络攻击"
 
 #. Name
 #: Internet/xbiff.desktop:2
@@ -1075,9 +1071,8 @@ msgstr ""
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "IRC �天"
+msgstr "XChat IRC 客户端"
 
 #. GenericName
 #: Internet/xchat.desktop:3
@@ -1154,7 +1149,7 @@ msgstr "Alsa 混音器�端"
 #. Name
 #: Multimedia/audacity.desktop:2
 msgid "Audacity"
-msgstr ""
+msgstr "Audacity 音频编辑器"
 
 #. GenericName
 #: Multimedia/audacity.desktop:3 Multimedia/rezound.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/es_AR.po b/translations/desktop_files/kappfinder.desktop/es_AR.po
new file mode 100644
index 000000000..8a9c75ca3
--- /dev/null
+++ b/translations/desktop_files/kappfinder.desktop/es_AR.po
@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 21:48+0200\n"
+"PO-Revision-Date: 2025-03-07 16:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kappfinder-kappfinderdesktop/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kappfinder.desktop:2
+#, fuzzy
+msgid "KAppfinder"
+msgstr "KAppfinder"
+
+#. GenericName
+#: kappfinder.desktop:3
+#, fuzzy
+msgid "Menu Updating Tool"
+msgstr "Herramienta de actualización de menús"
diff --git a/translations/desktop_files/kappfinder.desktop/ka.po b/translations/desktop_files/kappfinder.desktop/ka.po
index 223583cc8..b265e257f 100644
--- a/translations/desktop_files/kappfinder.desktop/ka.po
+++ b/translations/desktop_files/kappfinder.desktop/ka.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-17 21:48+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/nl.po b/translations/desktop_files/kappfinder.desktop/nl.po
index 097131f37..e5d1770ea 100644
--- a/translations/desktop_files/kappfinder.desktop/nl.po
+++ b/translations/desktop_files/kappfinder.desktop/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-17 21:48+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kappfinder-kappfinderdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/pt.po b/translations/desktop_files/kappfinder.desktop/pt.po
index 295657837..b7a92c9d3 100644
--- a/translations/desktop_files/kappfinder.desktop/pt.po
+++ b/translations/desktop_files/kappfinder.desktop/pt.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-17 21:48+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: 2024-08-14 14:10+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/sv.po b/translations/desktop_files/kappfinder.desktop/sv.po
index 965d5b19f..70faf5e54 100644
--- a/translations/desktop_files/kappfinder.desktop/sv.po
+++ b/translations/desktop_files/kappfinder.desktop/sv.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-17 21:48+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-06-09 23:14+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kate-desktops/el.po b/translations/desktop_files/kate-desktops/el.po
index 621aa7f7b..9a799707e 100644
--- a/translations/desktop_files/kate-desktops/el.po
+++ b/translations/desktop_files/kate-desktops/el.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# "blu.256" <mavridisf@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-18 03:49+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-04-24 12:44+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kate-desktop-files/el/>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +25,7 @@ msgstr "Π�οχω�ημένος επεξε�γαστής κειμένου"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +40,4 @@ msgstr "Επεξε�γαστής κειμένου"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/es_AR.po b/translations/desktop_files/kate-desktops/es_AR.po
new file mode 100644
index 000000000..9b781211a
--- /dev/null
+++ b/translations/desktop_files/kate-desktops/es_AR.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-18 03:49+0200\n"
+"PO-Revision-Date: 2024-11-19 14:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kate-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. GenericName
+#: data/kate.desktop:2
+#, fuzzy
+msgid "Advanced Text Editor"
+msgstr "Editor de texto avanzado"
+
+#. Name
+#: data/kate.desktop:3
+#, fuzzy
+msgid "Kate"
+msgstr "Kate"
+
+#. Comment
+#: data/kateplugin.desktop:5
+msgid "Kate Plugin"
+msgstr "Plugin (Complemento) de Kate"
+
+#. GenericName
+#: data/kwrite.desktop:2
+#, fuzzy
+msgid "Text Editor"
+msgstr "Editor de texto"
+
+#. Name
+#: data/kwrite.desktop:3
+#, fuzzy
+msgid "KWrite"
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/nl.po b/translations/desktop_files/kate-desktops/nl.po
index 2c74102c5..b9253978a 100644
--- a/translations/desktop_files/kate-desktops/nl.po
+++ b/translations/desktop_files/kate-desktops/nl.po
@@ -1,42 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-18 03:49+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kate-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. GenericName
 #: data/kate.desktop:2
 msgid "Advanced Text Editor"
-msgstr "Geavanceerde teksteditor"
+msgstr "Uitgebreide tekstbewerker"
 
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
 msgid "Kate Plugin"
-msgstr "Kate-plugin"
+msgstr "Kate-plug-in"
 
 #. GenericName
 #: data/kwrite.desktop:2
 msgid "Text Editor"
-msgstr "Teksteditor"
+msgstr "Tekstbewerker"
 
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kcontrol-color-schemes/af.po b/translations/desktop_files/kcontrol-color-schemes/af.po
index 3840a3b42..0e89c82ba 100644
--- a/translations/desktop_files/kcontrol-color-schemes/af.po
+++ b/translations/desktop_files/kcontrol-color-schemes/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Woestyn Rooi"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Digitaal Cde"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "Kde 1"
@@ -100,6 +145,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -120,6 +170,11 @@ msgid "Pale Gray"
 msgstr "Bleek Grys"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastiek"
@@ -140,6 +195,26 @@ msgid "Pumpkin"
 msgstr "Pampoen"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ar.po b/translations/desktop_files/kcontrol-color-schemes/ar.po
index 2652aa5ec..c58dafdf4 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ar.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "أحمر صحراوي"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "رمادي �اتح"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "بلاستيك"
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "يقطيني"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/az.po b/translations/desktop_files/kcontrol-color-schemes/az.po
index f482ef2d7..849a5d91c 100644
--- a/translations/desktop_files/kcontrol-color-schemes/az.po
+++ b/translations/desktop_files/kcontrol-color-schemes/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Səhra Qırmızısı"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Dijital CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Boz Qurd"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/be.po b/translations/desktop_files/kcontrol-color-schemes/be.po
index 54f4f8c21..58f7f3126 100644
--- a/translations/desktop_files/kcontrol-color-schemes/be.po
+++ b/translations/desktop_files/kcontrol-color-schemes/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Пу�тынна-чырвона�"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Лічбава� CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "�дценні ш�рага колеру"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тык"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Гарбуз"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/bg.po b/translations/desktop_files/kcontrol-color-schemes/bg.po
index 36f33f8a8..06735a0ba 100644
--- a/translations/desktop_files/kcontrol-color-schemes/bg.po
+++ b/translations/desktop_files/kcontrol-color-schemes/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
 "PO-Revision-Date: 2020-07-19 22:59+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -53,6 +53,11 @@ msgid "Desert Red"
 msgstr "Пу�тинно червено"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Дигитално CDE"
@@ -68,6 +73,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Бледо �иво"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тика"
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Тиква"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/bn.po b/translations/desktop_files/kcontrol-color-schemes/bn.po
index ff6b8a7b3..c0b1fb977 100644
--- a/translations/desktop_files/kcontrol-color-schemes/bn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "ডেসার�ট রেড"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "ডিজিটাল CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "কে.ডি.ই. ১"
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "ধূসর ছাই"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "প�লাস�টিক"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "পাম�পকিন"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/br.po b/translations/desktop_files/kcontrol-color-schemes/br.po
index 6c014566f..ab4931069 100644
--- a/translations/desktop_files/kcontrol-color-schemes/br.po
+++ b/translations/desktop_files/kcontrol-color-schemes/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE niverel"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/bs.po b/translations/desktop_files/kcontrol-color-schemes/bs.po
index b031ff346..507e174fc 100644
--- a/translations/desktop_files/kcontrol-color-schemes/bs.po
+++ b/translations/desktop_files/kcontrol-color-schemes/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Pustinjski crvena"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Blijedo siva"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ca.po b/translations/desktop_files/kcontrol-color-schemes/ca.po
index 9b3b1195f..368870f4c 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ca.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Roig del desert"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE digital"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Gris pàl·lid"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Carabassa"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/cs.po b/translations/desktop_files/kcontrol-color-schemes/cs.po
index ccc183366..dc8834183 100644
--- a/translations/desktop_files/kcontrol-color-schemes/cs.po
+++ b/translations/desktop_files/kcontrol-color-schemes/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
-"PO-Revision-Date: 2020-12-23 13:59+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-05-19 02:23+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/color-schemes/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -53,6 +53,11 @@ msgid "Desert Red"
 msgstr "Pouštní �ervená"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr "Jiné"
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Digital"
@@ -65,7 +70,47 @@ msgstr "EveX"
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
-msgstr ""
+msgstr "Člověk"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr "Šperky – ametyst"
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr "Šperky – akvamarín"
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr "Šperky – uhlík"
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr "Šperky – citrin"
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr "Šperky – smaragd"
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr "Šperky – rubín"
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr "Šperky – safír"
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr "Šperky – topas"
 
 #. Name
 #: KDEOne.kcsrc:2
@@ -95,12 +140,17 @@ msgstr "Keramika (bílá)"
 #. Name
 #: Last.fm.kcsrc:2
 msgid "Last.fm"
-msgstr ""
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr "Lila"
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "Ještěrka"
 
 #. Name
 #: MediaPeach.kcsrc:2
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Bledě šedá"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr "Růžovou�ká"
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastický"
@@ -125,7 +180,7 @@ msgstr "Plastický"
 #. Name
 #: Platinum.kcsrc:2
 msgid "Platinum"
-msgstr ""
+msgstr "Platina"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
@@ -138,9 +193,29 @@ msgid "Pumpkin"
 msgstr "Dýně"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr "Ro�ní období – podzim"
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr "Ro�ní období – jaro"
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr "Ro�ní období – léto"
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr "Ro�ní období – zima"
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "Sienna"
 
 #. Name
 #: SolarisCDE.kcsrc:2
@@ -160,7 +235,7 @@ msgstr "Systém"
 #. Name
 #: WedgieWeb.kcsrc:2
 msgid "WedgieWeb"
-msgstr ""
+msgstr "Web Wedgie"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/csb.po b/translations/desktop_files/kcontrol-color-schemes/csb.po
index 0ab321869..e12167543 100644
--- a/translations/desktop_files/kcontrol-color-schemes/csb.po
+++ b/translations/desktop_files/kcontrol-color-schemes/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Czerwionosc pùstini"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE firmë Digital"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Bladoszari"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Bania"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/cy.po b/translations/desktop_files/kcontrol-color-schemes/cy.po
index 327d07df3..9658ad390 100644
--- a/translations/desktop_files/kcontrol-color-schemes/cy.po
+++ b/translations/desktop_files/kcontrol-color-schemes/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Anialdir Coch"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Digidol"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Llwyd Golau"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Pwmpen"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/da.po b/translations/desktop_files/kcontrol-color-schemes/da.po
index 74dbc6496..7881f6b96 100644
--- a/translations/desktop_files/kcontrol-color-schemes/da.po
+++ b/translations/desktop_files/kcontrol-color-schemes/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Ørkenrød"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Hvidgrå"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/de.po b/translations/desktop_files/kcontrol-color-schemes/de.po
index f4f006d11..c44134791 100644
--- a/translations/desktop_files/kcontrol-color-schemes/de.po
+++ b/translations/desktop_files/kcontrol-color-schemes/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Wüstenrot"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Digital (DEC) CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Fahles Grau"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Kürbis"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/el.po b/translations/desktop_files/kcontrol-color-schemes/el.po
index f0819fbe6..6a5013755 100644
--- a/translations/desktop_files/kcontrol-color-schemes/el.po
+++ b/translations/desktop_files/kcontrol-color-schemes/el.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
 "PO-Revision-Date: 2022-01-16 15:00+0000\n"
 "Last-Translator: blu.256 <mavridisf@gmail.com>\n"
 "Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
@@ -53,6 +53,11 @@ msgid "Desert Red"
 msgstr "Κόκκινο της ε�ήμου"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Ψηφιακό CDE"
@@ -68,6 +73,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Χλωμό γκ�ι"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Πλαστικό"
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Κολοκ�θα"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/en_GB.po b/translations/desktop_files/kcontrol-color-schemes/en_GB.po
index 7c0293f4b..50c456b39 100644
--- a/translations/desktop_files/kcontrol-color-schemes/en_GB.po
+++ b/translations/desktop_files/kcontrol-color-schemes/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Pale Grey"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/eo.po b/translations/desktop_files/kcontrol-color-schemes/eo.po
index 150773c83..d0fc796b7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/eo.po
+++ b/translations/desktop_files/kcontrol-color-schemes/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Dezerta ru�o"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Digital-CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Pala grizo"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastiko"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Kukurbo"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/es.po b/translations/desktop_files/kcontrol-color-schemes/es.po
index 974ef787e..91630b390 100644
--- a/translations/desktop_files/kcontrol-color-schemes/es.po
+++ b/translations/desktop_files/kcontrol-color-schemes/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Rojo desierto"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE de Digital"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Gris pálido"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Calabaza"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/es_AR.po b/translations/desktop_files/kcontrol-color-schemes/es_AR.po
index 7b3ee5cbf..6d472943a 100644
--- a/translations/desktop_files/kcontrol-color-schemes/es_AR.po
+++ b/translations/desktop_files/kcontrol-color-schemes/es_AR.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Sergio Ricardo Vicari <sercari@gmail.com>, 2020.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
-"PO-Revision-Date: 2020-11-11 19:33+0000\n"
-"Last-Translator: Sergio Ricardo Vicari <sercari@gmail.com>\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-08-21 14:59+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
 "Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
 "weblate/projects/tdebase/color-schemes/es_AR/>\n"
 "Language: es_AR\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -53,6 +54,11 @@ msgid "Desert Red"
 msgstr "Rojo desierto"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Digital"
@@ -65,6 +71,46 @@ msgstr "EveX"
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
+msgstr "Humano"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
 msgstr ""
 
 #. Name
@@ -94,18 +140,24 @@ msgstr "Keramik Blanca"
 
 #. Name
 #: Last.fm.kcsrc:2
+#, fuzzy
 msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
 msgstr ""
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "Lagarto"
 
 #. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "Color durazno medio"
 
 #. Name
 #: Next.kcsrc:2
@@ -118,34 +170,61 @@ msgid "Pale Gray"
 msgstr "Gris pálido"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
-msgstr ""
+msgstr "Plástiko"
 
 #. Name
 #: Platinum.kcsrc:2
 msgid "Platinum"
-msgstr ""
+msgstr "Platinum"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
-msgstr ""
+msgstr "Verde Point Reyes"
 
 #. Name
 #: Pumpkin.kcsrc:3
 msgid "Pumpkin"
+msgstr "Calabaza"
+
+#. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
 msgstr ""
 
 #. Name
 #: Sienna.kcsrc:2
+#, fuzzy
 msgid "Sienna"
-msgstr ""
+msgstr "Sienna"
 
 #. Name
 #: SolarisCDE.kcsrc:2
+#, fuzzy
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -159,8 +238,9 @@ msgstr "Sistema"
 
 #. Name
 #: WedgieWeb.kcsrc:2
+#, fuzzy
 msgid "WedgieWeb"
-msgstr ""
+msgstr "WedgieWeb"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
@@ -169,18 +249,21 @@ msgstr "Texto blanco de alto contraste"
 
 #. Name
 #: Windows2000.kcsrc:2
+#, fuzzy
 msgid "Redmond 2000"
-msgstr ""
+msgstr "Redmond 2000"
 
 #. Name
 #: Windows95.kcsrc:3
+#, fuzzy
 msgid "Redmond 95"
-msgstr ""
+msgstr "Redmond 95"
 
 #. Name
 #: WindowsXP.kcsrc:2
+#, fuzzy
 msgid "Redmond XP"
-msgstr ""
+msgstr "Redmond XP"
 
 #. Name
 #: YellowOnBlue.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/et.po b/translations/desktop_files/kcontrol-color-schemes/et.po
index 8a7979623..bf80e60f1 100644
--- a/translations/desktop_files/kcontrol-color-schemes/et.po
+++ b/translations/desktop_files/kcontrol-color-schemes/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Kõrbepunane"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Kahvatuhall"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Kõrvits"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/eu.po b/translations/desktop_files/kcontrol-color-schemes/eu.po
index f7d55c284..fb1798bce 100644
--- a/translations/desktop_files/kcontrol-color-schemes/eu.po
+++ b/translations/desktop_files/kcontrol-color-schemes/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Basamortu gorria"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Digital-en CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Gris zurbila"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Kalabaza"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/fa.po b/translations/desktop_files/kcontrol-color-schemes/fa.po
index 268e1d1f1..06af99a83 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fa.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "قرمز صحرایی"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE رقمی"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE Û±"
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "خاکستری کم‌رنگ"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "پلاستیک"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "کدو حلوایی"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/fi.po b/translations/desktop_files/kcontrol-color-schemes/fi.po
index 0ef6df59b..faebcaa65 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fi.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Aavikon punainen"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Vaaleanharmaa"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Kurpitsa"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/fo.po b/translations/desktop_files/kcontrol-color-schemes/fo.po
index a3f1bf73f..094bd9cf5 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fo.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/fr.po b/translations/desktop_files/kcontrol-color-schemes/fr.po
index b8fd519bc..e6e5669cf 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Désert rouge"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Gris pâle"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Potiron"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/fy.po b/translations/desktop_files/kcontrol-color-schemes/fy.po
index d02907876..f73e5d302 100644
--- a/translations/desktop_files/kcontrol-color-schemes/fy.po
+++ b/translations/desktop_files/kcontrol-color-schemes/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Woestynread"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Fealgriis"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastyk"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "klabats"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ga.po b/translations/desktop_files/kcontrol-color-schemes/ga.po
index f8b620968..697acc7fd 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ga.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Liathghlas"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Puimcín"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/gl.po b/translations/desktop_files/kcontrol-color-schemes/gl.po
index 5a81d5770..f9ba2d94f 100644
--- a/translations/desktop_files/kcontrol-color-schemes/gl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Vermello Deserto"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Dixital"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Gris Claro"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/he.po b/translations/desktop_files/kcontrol-color-schemes/he.po
index b81c4d9f6..8c6cb601f 100644
--- a/translations/desktop_files/kcontrol-color-schemes/he.po
+++ b/translations/desktop_files/kcontrol-color-schemes/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "�דו� מדברי"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "�פור בהיר"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "דלעת"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/hi.po b/translations/desktop_files/kcontrol-color-schemes/hi.po
index 844adb587..d6e8844d2 100644
--- a/translations/desktop_files/kcontrol-color-schemes/hi.po
+++ b/translations/desktop_files/kcontrol-color-schemes/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "मर� लाल"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "डिज़िटल सीडीई"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "केडीई 1"
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "फ़ीका धूसर"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "प�लास�टिक"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "क�म�हड़ा"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/hr.po b/translations/desktop_files/kcontrol-color-schemes/hr.po
index 40e7a91e7..c1669b7ff 100644
--- a/translations/desktop_files/kcontrol-color-schemes/hr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Pustinjski crvena"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Digitalni CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Blijedo sivo"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastika"
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Bundeva"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/hu.po b/translations/desktop_files/kcontrol-color-schemes/hu.po
index 57539f2e9..b4604b455 100644
--- a/translations/desktop_files/kcontrol-color-schemes/hu.po
+++ b/translations/desktop_files/kcontrol-color-schemes/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Téglavörös"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Halványszürke"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Házitök"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/id.po b/translations/desktop_files/kcontrol-color-schemes/id.po
index 9dbc920ae..19c6489ef 100644
--- a/translations/desktop_files/kcontrol-color-schemes/id.po
+++ b/translations/desktop_files/kcontrol-color-schemes/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/is.po b/translations/desktop_files/kcontrol-color-schemes/is.po
index e1c551bf5..77a3a0415 100644
--- a/translations/desktop_files/kcontrol-color-schemes/is.po
+++ b/translations/desktop_files/kcontrol-color-schemes/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Eyðimerkurrautt"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Stafrænt CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Fölgrátt"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plast"
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Grasker"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/it.po b/translations/desktop_files/kcontrol-color-schemes/it.po
index 56ee0d0d8..aff715e73 100644
--- a/translations/desktop_files/kcontrol-color-schemes/it.po
+++ b/translations/desktop_files/kcontrol-color-schemes/it.po
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
-# Michele Calgaro <michele.calgaro@yahoo.it>, 2023.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2023, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
-"PO-Revision-Date: 2023-11-08 01:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-03-01 01:44+0000\n"
 "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/it/>\n"
@@ -54,6 +54,11 @@ msgid "Desert Red"
 msgstr "Rosso deserto"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr "Differente"
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Digitale"
@@ -69,6 +74,46 @@ msgid "Human"
 msgstr "Umano"
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr "Gioielli - Ametista"
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr "Gioielli - Acquamarina"
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr "Gioielli - Carbonio"
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr "Gioielli - Citrino"
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr "Gioielli - Smeraldo"
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr "Gioielli - Rubino"
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr "Gioielli - Zaffiro"
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr "Gioielli - Topazio"
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr "Last.fm"
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr "Lila"
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr "Lucertola"
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Grigio pallido"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr "Rosato"
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastica"
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Zucca"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr "Stagioni - Autunno"
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr "Stagioni - Primavera"
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr "Stagioni - Estate"
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr "Stagioni - Inverno"
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr "Sienna"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ja.po b/translations/desktop_files/kcontrol-color-schemes/ja.po
index 6e82decd1..f811b654e 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ja.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "砂漠色"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "ペールグレー"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "���ゃ色"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ka.po b/translations/desktop_files/kcontrol-color-schemes/ka.po
index f51a17183..01653361c 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ka.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ka.po
@@ -1,155 +1,231 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\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"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-01-27 09:33+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/color-schemes/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
 msgid "Atlas Green"
-msgstr ""
+msgstr "მწვ�ნე �ტლ�სი"
 
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
 msgid "High Contrast Black Text"
-msgstr "კ�ნტრ�სტული შ�ვი ტექსტი"
+msgstr "მ�ღ�ლი კ�ნტრ�სტის მქ�ნე შ�ვი ტექსტი"
 
 #. Name
 #: BlueSlate.kcsrc:3
 msgid "Blue Slate"
-msgstr ""
+msgstr "ლურჯი ფიქ�ლი"
 
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
 msgid "Dark Blue"
-msgstr ""
+msgstr "მუქი ლურჯი"
 
 #. Name
 #: DesertRed.kcsrc:3
 msgid "Desert Red"
-msgstr ""
+msgstr "უდ�ბნ�ს წითელი"
+
+#. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr "გ�ნსხვ�ვებული"
 
 #. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
-msgstr ""
+msgstr "ციფრული CDE"
 
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr ""
+msgstr "EveX"
 
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
-msgstr ""
+msgstr "�დ�მი�ნი"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr "ძვირფ�სეულ�ბ� - �მეთვისტ�"
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr "ძვირფ�სეულ�ბ� - �კვ�მ�რინი"
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr "ძვირფ�სეულ�ბ� - ნ�ხშირბ�დი"
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr "ძვირფ�სეულ�ბ� - ციტრინი"
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr "ძვირფ�სეულ�ბ� - ზურმუხტი"
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr "ძვირფ�სეულ�ბ� - ლ�ლი"
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr "ძვირფ�სეულ�ბ� - ს�ფირ�ნი"
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr "ძვირფ�სეულ�ბ� - ტ�პ�ზი"
 
 #. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
-msgstr ""
+msgstr "KDE 1"
 
 #. Name
 #: KDETwo.kcsrc:2
 msgid "KDE 2"
-msgstr ""
+msgstr "KDE 2"
 
 #. Name
 #: Keramik.kcsrc:2
 msgid "Keramik"
-msgstr ""
+msgstr "კერ�მიკ�"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
 msgid "Keramik Emerald"
-msgstr ""
+msgstr "ზურმუხტისფერი კერ�მიკ�"
 
 #. Name
 #: KeramikWhite.kcsrc:2
 msgid "Keramik White"
-msgstr ""
+msgstr "თეთრი კერ�მიკ�"
 
 #. Name
 #: Last.fm.kcsrc:2
 msgid "Last.fm"
-msgstr ""
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr "შრ�შ�ნისფერი"
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "ხვლიკი"
 
 #. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "მედი��ტ�მი"
 
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "შემდეგი"
 
 #. Name
 #: PaleGray.kcsrc:3
 msgid "Pale Gray"
-msgstr ""
+msgstr "მკრთ�ლი ნ�ცრისფერი"
+
+#. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr "მ�ვ�რდისფრ�"
 
 #. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
-msgstr "Пла�тик"
+msgstr "პლ�სტმ�ს�"
 
 #. Name
 #: Platinum.kcsrc:2
 msgid "Platinum"
-msgstr ""
+msgstr "პლ�ტინ�"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
-msgstr ""
+msgstr "მწვ�ნე Point Reyes-დ�ნ"
 
 #. Name
 #: Pumpkin.kcsrc:3
 msgid "Pumpkin"
-msgstr ""
+msgstr "გ�გრ�"
+
+#. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr "სეზ�ნები - შემ�დგ�მ�"
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr "სეზ�ნები - გ�ზ�ფხული"
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr "სეზ�ნები - ზ�ფხული"
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr "სეზ�ნები - ზ�მთ�რი"
 
 #. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "სიენ�"
 
 #. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "ს�ლ�რისი"
 
 #. Name
 #: Storm.kcsrc:3
 msgid "Storm"
-msgstr ""
+msgstr "ქ�რიშხ�ლი"
 
 #. Name
 #: System.kcsrc:2
@@ -159,27 +235,27 @@ msgstr "სისტემ�"
 #. Name
 #: WedgieWeb.kcsrc:2
 msgid "WedgieWeb"
-msgstr ""
+msgstr "WedgieWeb"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
-msgstr "მ�ღ�ლკ�ნსტრ�სტული თეთრი ტექტი"
+msgstr "მ�ღ�ლკ�ნსტრ�სტული თეთრი ტექსტი"
 
 #. Name
 #: Windows2000.kcsrc:2
 msgid "Redmond 2000"
-msgstr ""
+msgstr "რედმ�ნდი 2000"
 
 #. Name
 #: Windows95.kcsrc:3
 msgid "Redmond 95"
-msgstr ""
+msgstr "რედმ�ნდი 95"
 
 #. Name
 #: WindowsXP.kcsrc:2
 msgid "Redmond XP"
-msgstr ""
+msgstr "რედმ�ნდი XP"
 
 #. Name
 #: YellowOnBlue.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot b/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot
index bc28357e2..6dcf0b3ab 100644
--- a/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot
+++ b/translations/desktop_files/kcontrol-color-schemes/kcontrol-color-schemes.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/kk.po b/translations/desktop_files/kcontrol-color-schemes/kk.po
index cfa5f26d7..89798a317 100644
--- a/translations/desktop_files/kcontrol-color-schemes/kk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Қызыл шөл"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тик"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "��қабақ"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/km.po b/translations/desktop_files/kcontrol-color-schemes/km.po
index 29cfb83d3..09713aa3b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/km.po
+++ b/translations/desktop_files/kcontrol-color-schemes/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "ក្រហម​ស្ល�ក"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE ឌីជី�ល"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE ១"
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "ប្រផ�ះ​ស្ល�ក"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "ប្ល៉ាស្ទិក"
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "ល្ពៅ"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ko.po b/translations/desktop_files/kcontrol-color-schemes/ko.po
index 81f933e4d..2fab8469a 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ko.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "디지털 시계"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/lo.po b/translations/desktop_files/kcontrol-color-schemes/lo.po
index f8d704876..5b24bcbdb 100644
--- a/translations/desktop_files/kcontrol-color-schemes/lo.po
+++ b/translations/desktop_files/kcontrol-color-schemes/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "�ດງທະເລຊາ�"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "ໂປຣ��ຣມຈັດ�ານຫນ້າຕ່າງ CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "ໂປຣ��ຣມຈັດ�ານຫນ້າຕ່າງ KDE 1"
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "ເທົາອ່ອນ"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "ຫມາ�ອຶ"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/lt.po b/translations/desktop_files/kcontrol-color-schemes/lt.po
index ce9c3ff3f..8f006baf4 100644
--- a/translations/desktop_files/kcontrol-color-schemes/lt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Raudona dykumos"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Skaitmeninis CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Pilkšva"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastikinis"
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/lv.po b/translations/desktop_files/kcontrol-color-schemes/lv.po
index 318f08fae..c5b1a34e7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/lv.po
+++ b/translations/desktop_files/kcontrol-color-schemes/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Tuksneša sarkans"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Ciparu CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Gaiši pelēks"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastika"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Ķirbis"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/mk.po b/translations/desktop_files/kcontrol-color-schemes/mk.po
index e8d067a2b..aebaf25c6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/mk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Пу�тин�ко црвено"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Бледо �иво"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тик"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Тиквичка"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/mn.po b/translations/desktop_files/kcontrol-color-schemes/mn.po
index 1a5add8c2..cf2431dc7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/mn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Говийн улаан"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Тоон (DEC) КДE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "КДЭ 1"
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Цайвар �аарал"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Хулуу"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ms.po b/translations/desktop_files/kcontrol-color-schemes/ms.po
index 91e969086..63492ac69 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ms.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Merah Karat"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Digital"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Kelabu Pucat"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Labu"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/mt.po b/translations/desktop_files/kcontrol-color-schemes/mt.po
index daf00e49b..a4c186020 100644
--- a/translations/desktop_files/kcontrol-color-schemes/mt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Ramla l-ħamra"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Griż Ċar"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Qargħa Ħamra"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/nb.po b/translations/desktop_files/kcontrol-color-schemes/nb.po
index 7a4d44d42..6f471bab2 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nb.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Ørkenrød"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Lysegrå"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plast"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Gresskar"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/nds.po b/translations/desktop_files/kcontrol-color-schemes/nds.po
index d0a767b9e..6348a6dea 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nds.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Wööst-Root"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Bleek-Gries"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Körbs"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ne.po b/translations/desktop_files/kcontrol-color-schemes/ne.po
index 7d4328737..f817744ea 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ne.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "बलौटे रातो"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "डिजिटल CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "पेल खैरो"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "प�लास�टिक"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "पम�पकिन"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/nl.po b/translations/desktop_files/kcontrol-color-schemes/nl.po
index 189991ec6..60df5da85 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\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"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-01-31 11:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/color-schemes/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -24,12 +25,12 @@ msgstr "Atlasgroen"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
 msgid "High Contrast Black Text"
-msgstr "Hoog contrast zwarte tekst"
+msgstr "Hoog contrast met zwarte tekst"
 
 #. Name
 #: BlueSlate.kcsrc:3
@@ -39,7 +40,7 @@ msgstr "Leisteenblauw"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -52,65 +53,114 @@ msgid "Desert Red"
 msgstr "Woestijnrood"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr "Anders"
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
-msgstr ""
+msgstr "CDE digitaal"
 
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr ""
+msgstr "EveX"
 
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
-msgstr ""
+msgstr "Human"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr "Juwelen: amethist"
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr "Juwelen: aquamarijn"
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr "Juwelen: carbon"
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr "Juwelen: citrien"
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr "Juwelen: smaragd"
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr "Juwelen: robijn"
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr "Juwelen: saffier"
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr "Juwelen: topaas"
 
 #. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
-msgstr ""
+msgstr "KDE 1"
 
 #. Name
 #: KDETwo.kcsrc:2
 msgid "KDE 2"
-msgstr ""
+msgstr "KDE 2"
 
 #. Name
 #: Keramik.kcsrc:2
-#, fuzzy
 msgid "Keramik"
-msgstr "Keramik-wit"
+msgstr "Keramiek"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
 msgid "Keramik Emerald"
-msgstr "Keramik-Emerald"
+msgstr "Keramiek-smaragd"
 
 #. Name
 #: KeramikWhite.kcsrc:2
 msgid "Keramik White"
-msgstr "Keramik-wit"
+msgstr "Keramiek-wit"
 
 #. Name
 #: Last.fm.kcsrc:2
 msgid "Last.fm"
-msgstr ""
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr "Lila"
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "Hagedis"
 
 #. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "Mediaperzik"
 
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -118,14 +168,19 @@ msgid "Pale Gray"
 msgstr "Vaalgrijs"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr "Rozig"
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
-msgstr ""
+msgstr "Plastik"
 
 #. Name
 #: Platinum.kcsrc:2
 msgid "Platinum"
-msgstr ""
+msgstr "Platinum"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
@@ -138,19 +193,39 @@ msgid "Pumpkin"
 msgstr "Pompoen"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr "Seizoenen: herfst"
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr "Seizoenen: lente"
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr "Seizoenen: zomer"
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr "Seizoenen: winter"
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "Sienna"
 
 #. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
 msgid "Storm"
-msgstr ""
+msgstr "Storm"
 
 #. Name
 #: System.kcsrc:2
@@ -160,29 +235,29 @@ msgstr "Systeem"
 #. Name
 #: WedgieWeb.kcsrc:2
 msgid "WedgieWeb"
-msgstr ""
+msgstr "WedgieWeb"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
-msgstr "Hoog contrast witte tekst"
+msgstr "Hoog contrast met witte tekst"
 
 #. Name
 #: Windows2000.kcsrc:2
 msgid "Redmond 2000"
-msgstr ""
+msgstr "Redmond 2000"
 
 #. Name
 #: Windows95.kcsrc:3
 msgid "Redmond 95"
-msgstr ""
+msgstr "Redmond 95"
 
 #. Name
 #: WindowsXP.kcsrc:2
 msgid "Redmond XP"
-msgstr ""
+msgstr "Redmond XP"
 
 #. Name
 #: YellowOnBlue.kcsrc:2
 msgid "High Contrast Yellow on Blue"
-msgstr "Hoog contrast geel op blauw"
+msgstr "Hoog contrast met geel op blauw"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nn.po b/translations/desktop_files/kcontrol-color-schemes/nn.po
index 3a4d0a8d0..4b9a5466b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Ørkenraud"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Lysegrå"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plast"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Graskar"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/nso.po b/translations/desktop_files/kcontrol-color-schemes/nso.po
index 58b6d66a5..2080607c0 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nso.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Bohubedu bja Letanaga"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE ya Dinomoro"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Lephutsi"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/oc.po b/translations/desktop_files/kcontrol-color-schemes/oc.po
index 9e6594dcc..3d576b0f2 100644
--- a/translations/desktop_files/kcontrol-color-schemes/oc.po
+++ b/translations/desktop_files/kcontrol-color-schemes/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/pa.po b/translations/desktop_files/kcontrol-color-schemes/pa.po
index 580747870..521f031c1 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pa.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "ਮਾਰੂਥਲੀ ਲਾਲ"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "ਡਿਜ਼ੀਟਲ CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "ਪਾਲੀ ਗਰੇ"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "ਪਲਾਸਟਿਕ"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "ਪੰਪਕਿਨ"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/pl.po b/translations/desktop_files/kcontrol-color-schemes/pl.po
index 3ca34bb1a..a4a43ca26 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
 "PO-Revision-Date: 2021-10-10 09:30+0000\n"
 "Last-Translator: Marek W <coronzon88@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
@@ -54,6 +54,11 @@ msgid "Desert Red"
 msgstr "Czerwień pustyni"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE firmy Digital"
@@ -69,6 +74,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Bladoszary"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastik"
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Dynia"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/pt.po b/translations/desktop_files/kcontrol-color-schemes/pt.po
index 9e9a9a79b..ee36959e8 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pt.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
-"PO-Revision-Date: 2021-12-02 19:00+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2024-03-26 17:44+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/pt/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.9.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -53,6 +53,11 @@ msgid "Desert Red"
 msgstr "Vermelho Deserto"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE da Digital"
@@ -65,6 +70,46 @@ msgstr "EveX"
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
+msgstr "Human"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
 msgstr ""
 
 #. Name
@@ -95,12 +140,17 @@ msgstr "Keramik Branco"
 #. Name
 #: Last.fm.kcsrc:2
 msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
 msgstr ""
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "Lizard"
 
 #. Name
 #: MediaPeach.kcsrc:2
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Cinzento Pálido"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastik"
@@ -125,7 +180,7 @@ msgstr "Plastik"
 #. Name
 #: Platinum.kcsrc:2
 msgid "Platinum"
-msgstr ""
+msgstr "Platinum"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
@@ -138,9 +193,29 @@ msgid "Pumpkin"
 msgstr "Abóbora"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "Sienna"
 
 #. Name
 #: SolarisCDE.kcsrc:2
@@ -160,7 +235,7 @@ msgstr "Sistema"
 #. Name
 #: WedgieWeb.kcsrc:2
 msgid "WedgieWeb"
-msgstr ""
+msgstr "WedgieWeb"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/pt_BR.po b/translations/desktop_files/kcontrol-color-schemes/pt_BR.po
index 1cfdb51f2..133a946fd 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pt_BR.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Vermelho"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Digital"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Cinza"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Abóbora"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ro.po b/translations/desktop_files/kcontrol-color-schemes/ro.po
index 1c4dee37f..1251cb5c6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ro.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Roșu deșert"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Digital"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Gri pal"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastic"
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Dovlecel"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ru.po b/translations/desktop_files/kcontrol-color-schemes/ru.po
index 9bc5e5e3d..0b421ba00 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ru.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ru.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # blu.256 <mavridisf@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
-"PO-Revision-Date: 2022-01-16 15:00+0000\n"
-"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/ru/>\n"
 "Language: ru\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -54,6 +55,11 @@ msgid "Desert Red"
 msgstr "Кра�на� пу�тын�"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Цифровой CDE"
@@ -61,11 +67,51 @@ msgstr "Цифровой CDE"
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr "EveX"
+msgstr "Ева X"
 
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
+msgstr "Человек"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
 msgstr ""
 
 #. Name
@@ -96,12 +142,17 @@ msgstr "Керамика бела�"
 #. Name
 #: Last.fm.kcsrc:2
 msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
 msgstr ""
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "Ящерица"
 
 #. Name
 #: MediaPeach.kcsrc:2
@@ -119,6 +170,11 @@ msgid "Pale Gray"
 msgstr "Ту�клый �ерый"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тик"
@@ -126,7 +182,7 @@ msgstr "Пла�тик"
 #. Name
 #: Platinum.kcsrc:2
 msgid "Platinum"
-msgstr ""
+msgstr "Платина"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
@@ -139,9 +195,29 @@ msgid "Pumpkin"
 msgstr "Тыква"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "Сиена"
 
 #. Name
 #: SolarisCDE.kcsrc:2
@@ -161,7 +237,7 @@ msgstr "Си�тема"
 #. Name
 #: WedgieWeb.kcsrc:2
 msgid "WedgieWeb"
-msgstr ""
+msgstr "WedgieWeb"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
@@ -171,17 +247,17 @@ msgstr "Вы�ококонтра�тный белый тек�т"
 #. Name
 #: Windows2000.kcsrc:2
 msgid "Redmond 2000"
-msgstr "Redmond 2000"
+msgstr "Редмонд 2000"
 
 #. Name
 #: Windows95.kcsrc:3
 msgid "Redmond 95"
-msgstr "Redmond 95"
+msgstr "Редмонд 95"
 
 #. Name
 #: WindowsXP.kcsrc:2
 msgid "Redmond XP"
-msgstr "Redmond XP"
+msgstr "Редмонд XP"
 
 #. Name
 #: YellowOnBlue.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/rw.po b/translations/desktop_files/kcontrol-color-schemes/rw.po
index ae40f3e55..d1eb49240 100644
--- a/translations/desktop_files/kcontrol-color-schemes/rw.po
+++ b/translations/desktop_files/kcontrol-color-schemes/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Umutuku Ubutayu"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Bimenyetsomibare"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Ikijuju cyoroshye"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/se.po b/translations/desktop_files/kcontrol-color-schemes/se.po
index 950f971f1..7a31eeeac 100644
--- a/translations/desktop_files/kcontrol-color-schemes/se.po
+++ b/translations/desktop_files/kcontrol-color-schemes/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Saddoáhperuoksat"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Digitalálaš CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Čuvgesránes"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastihkka"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Gurbbet"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/sk.po b/translations/desktop_files/kcontrol-color-schemes/sk.po
index 5064ea031..e4d800e32 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
 "PO-Revision-Date: 2020-10-16 13:31+0000\n"
 "Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
 "Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
@@ -53,6 +53,11 @@ msgid "Desert Red"
 msgstr "Púštna �ervená"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE od Digital"
@@ -68,6 +73,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Svetlošedá"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "Tekvica"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/sl.po b/translations/desktop_files/kcontrol-color-schemes/sl.po
index 9847fd4e8..fb1913b14 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Puš�avska rde�a"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Digitalni CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Bleda sivina"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Bu�a"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/sr.po b/translations/desktop_files/kcontrol-color-schemes/sr.po
index 0aefb3194..1bcd063a6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Пу�тињ�ко црвена"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Бледо �ива"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тика"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Бундева"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po b/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po
index 1067dd4dc..263aa7f8a 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Pustinjsko crvena"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Bledo siva"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastika"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Bundeva"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ss.po b/translations/desktop_files/kcontrol-color-schemes/ss.po
index 10247f99c..a54ff4003 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ss.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Litsanga"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/sv.po b/translations/desktop_files/kcontrol-color-schemes/sv.po
index 25aa358d7..0cd210660 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sv.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\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"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-08-25 00:28+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/color-schemes/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -24,7 +25,7 @@ msgstr "Atlasgrön"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -39,7 +40,7 @@ msgstr "Blå skiffer"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -52,35 +53,79 @@ msgid "Desert Red"
 msgstr "Ökenröd"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
-msgstr ""
+msgstr "Digital CDE"
 
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr ""
+msgstr "EveX"
 
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
-msgstr ""
+msgstr "Human"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr "Juveler - Ametist"
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr "Juveler - Akvamarin"
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr "Juveler - Kol"
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr "Juveler - Citrin"
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr "Juveler - Smaragd"
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr "Juveler - Rubin"
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr "Juveler - Safir"
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr "Juveler - Topas"
 
 #. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
-msgstr ""
+msgstr "KDE 1"
 
 #. Name
 #: KDETwo.kcsrc:2
 msgid "KDE 2"
-msgstr ""
+msgstr "KDE 2"
 
 #. Name
 #: Keramik.kcsrc:2
-#, fuzzy
 msgid "Keramik"
-msgstr "Vit Keramik"
+msgstr "Keramik"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
@@ -95,12 +140,17 @@ msgstr "Vit Keramik"
 #. Name
 #: Last.fm.kcsrc:2
 msgid "Last.fm"
-msgstr ""
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr "Lila"
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "Ödla"
 
 #. Name
 #: MediaPeach.kcsrc:2
@@ -110,7 +160,7 @@ msgstr ""
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "NeXT"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "Blekgrå"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr "Rosa"
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,9 +193,29 @@ msgid "Pumpkin"
 msgstr "Pumpa"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr "Årstider - Höst"
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr "Ã…rstider - VÃ¥r"
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr "Ã…rstider - Sommar"
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr "Ã…rstider - Vinter"
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "Sienna"
 
 #. Name
 #: SolarisCDE.kcsrc:2
@@ -150,7 +225,7 @@ msgstr ""
 #. Name
 #: Storm.kcsrc:3
 msgid "Storm"
-msgstr ""
+msgstr "Storm"
 
 #. Name
 #: System.kcsrc:2
@@ -160,7 +235,7 @@ msgstr ""
 #. Name
 #: WedgieWeb.kcsrc:2
 msgid "WedgieWeb"
-msgstr ""
+msgstr "Webb"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
@@ -170,17 +245,17 @@ msgstr "Vit text med hög kontrast"
 #. Name
 #: Windows2000.kcsrc:2
 msgid "Redmond 2000"
-msgstr ""
+msgstr "Redmond 2000"
 
 #. Name
 #: Windows95.kcsrc:3
 msgid "Redmond 95"
-msgstr ""
+msgstr "Redmond 95"
 
 #. Name
 #: WindowsXP.kcsrc:2
 msgid "Redmond XP"
-msgstr ""
+msgstr "Redmond XP"
 
 #. Name
 #: YellowOnBlue.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/ta.po b/translations/desktop_files/kcontrol-color-schemes/ta.po
index 185d42844..747c6150e 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ta.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "பாலைவன சிவப�ப�"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "டிஜிட�டல� CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "பழ�ப�ப�ச� சாயல�"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "திட�டம�"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "பூசணிக�காய�"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/te.po b/translations/desktop_files/kcontrol-color-schemes/te.po
index 1278c283e..9192d95dd 100644
--- a/translations/desktop_files/kcontrol-color-schemes/te.po
+++ b/translations/desktop_files/kcontrol-color-schemes/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "ఎడారి ఎర�ప�"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "డిజిటల� సిడిఈ"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "కెడిఈ 1"
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "లేత బూడిద"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "ప�లాస�టిక�"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "గ�మ�మడి"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/tg.po b/translations/desktop_files/kcontrol-color-schemes/tg.po
index e200e80a6..15e0a2dcd 100644
--- a/translations/desktop_files/kcontrol-color-schemes/tg.po
+++ b/translations/desktop_files/kcontrol-color-schemes/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr ""
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Каду"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/th.po b/translations/desktop_files/kcontrol-color-schemes/th.po
index ca097aacd..6309d2683 100644
--- a/translations/desktop_files/kcontrol-color-schemes/th.po
+++ b/translations/desktop_files/kcontrol-color-schemes/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "�ดงทะเลทราย"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "�บบ Digital CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "�บบ KDE 1"
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "เทาอ่อน"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "พลาสติ�"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "ฟั�ทอง"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/tr.po b/translations/desktop_files/kcontrol-color-schemes/tr.po
index 1fc9b7d31..a88cecea9 100644
--- a/translations/desktop_files/kcontrol-color-schemes/tr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
 "PO-Revision-Date: 2021-04-20 20:01+0000\n"
 "Last-Translator: Erdem Ersoy <erdemersoy@erdemersoy.net>\n"
 "Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
@@ -54,6 +54,11 @@ msgid "Desert Red"
 msgstr "Çöl Kırmızısı"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Dijital CDE"
@@ -69,6 +74,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Açık Gri"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Plastik"
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Kabak"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/tt.po b/translations/desktop_files/kcontrol-color-schemes/tt.po
index 3bbd089c5..12dc0d725 100644
--- a/translations/desktop_files/kcontrol-color-schemes/tt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr ""
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr ""
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Tonıq Sorı"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Qabaq"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/uk.po b/translations/desktop_files/kcontrol-color-schemes/uk.po
index a6a1b6401..485b0bd68 100644
--- a/translations/desktop_files/kcontrol-color-schemes/uk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-04-22 18:53+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/color-schemes/uk/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -54,6 +54,11 @@ msgid "Desert Red"
 msgstr "Червона пу�тел�"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr "Інший"
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Цифровий CDE"
@@ -66,7 +71,47 @@ msgstr "EveX"
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
-msgstr ""
+msgstr "Людина"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr "Самоцвіти - �мети�т"
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr "Самоцвіти - �квамарин"
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr "Самоцвіти - Графіт"
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr "Самоцвіти - Цитрин"
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr "Самоцвіти - Смарагд"
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr "Самоцвіти - Рубін"
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr "Самоцвіти - Сапфір"
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr "Самоцвіти - Топаз"
 
 #. Name
 #: KDEOne.kcsrc:2
@@ -96,12 +141,17 @@ msgstr "Білий Керамік"
 #. Name
 #: Last.fm.kcsrc:2
 msgid "Last.fm"
-msgstr ""
+msgstr "Last.fm"
+
+#. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr "Лиловий"
 
 #. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
-msgstr ""
+msgstr "Ящірка"
 
 #. Name
 #: MediaPeach.kcsrc:2
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Тьм�но Сірий"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr "Рожевий"
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тик"
@@ -126,7 +181,7 @@ msgstr "Пла�тик"
 #. Name
 #: Platinum.kcsrc:2
 msgid "Platinum"
-msgstr ""
+msgstr "Платина"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
@@ -139,9 +194,29 @@ msgid "Pumpkin"
 msgstr "Гарбузовий"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr "Сезони - О�інь"
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr "Сезони - Ве�на"
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr "Сезони - Літо"
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr "Сезони - Зима"
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "Сиена"
 
 #. Name
 #: SolarisCDE.kcsrc:2
@@ -161,7 +236,7 @@ msgstr "Си�тема"
 #. Name
 #: WedgieWeb.kcsrc:2
 msgid "WedgieWeb"
-msgstr ""
+msgstr "WedgieWeb"
 
 #. Name
 #: WhiteOnBlack.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/uz.po b/translations/desktop_files/kcontrol-color-schemes/uz.po
index dc8dffc37..69942a989 100644
--- a/translations/desktop_files/kcontrol-color-schemes/uz.po
+++ b/translations/desktop_files/kcontrol-color-schemes/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Qizil choʻl"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Raqamli CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Och kul"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Qovoq"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po b/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po
index e4d87fdef..e45bb6abb 100644
--- a/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po
+++ b/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Қизил чўл"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Рақамли CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Оч кул"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Пла�тик"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Қовоқ"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ven.po b/translations/desktop_files/kcontrol-color-schemes/ven.po
index 8d5780701..d48bc537d 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ven.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Vhutswuku ha muvhala wa soga"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE ya Didzhithala"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Lutada lwo tshenuluwaho"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Fhuri"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/vi.po b/translations/desktop_files/kcontrol-color-schemes/vi.po
index 76b8749cc..f58ce46cb 100644
--- a/translations/desktop_files/kcontrol-color-schemes/vi.po
+++ b/translations/desktop_files/kcontrol-color-schemes/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "�� sa mạc"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE số"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -97,6 +142,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -117,6 +167,11 @@ msgid "Pale Gray"
 msgstr "Màu xám nhạt"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "Chất dẻo"
@@ -137,6 +192,26 @@ msgid "Pumpkin"
 msgstr "Bí đ�"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/wa.po b/translations/desktop_files/kcontrol-color-schemes/wa.po
index af4568fc5..368248009 100644
--- a/translations/desktop_files/kcontrol-color-schemes/wa.po
+++ b/translations/desktop_files/kcontrol-color-schemes/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Rodje do dezert"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "Didjitå CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Clair gris"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Potiron"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/xh.po b/translations/desktop_files/kcontrol-color-schemes/xh.po
index 3e97b2a5a..084736e42 100644
--- a/translations/desktop_files/kcontrol-color-schemes/xh.po
+++ b/translations/desktop_files/kcontrol-color-schemes/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Bomvu Krwe"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "CDE Ebonisa Inani Ngalinye"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Ngwevu Bumbatsha"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Ithanga"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po b/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
index b04e875d6..bb5c5fea9 100644
--- a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
+++ b/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
@@ -1,20 +1,21 @@
 # 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: 2023-11-02 18:13+0000\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"
+"POT-Creation-Date: 2025-01-26 18:11+0000\n"
+"PO-Revision-Date: 2025-08-28 20:46+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified Han script) <https://mirror.git."
+"trinitydesktop.org/weblate/projects/tdebase/color-schemes/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
 #: AtlasGreen.kcsrc:3
@@ -52,9 +53,14 @@ msgid "Desert Red"
 msgstr "沙漠红"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr "�一样"
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
-msgstr ""
+msgstr "æ•°å­— CDE"
 
 #. Name
 #: EveX.kcsrc:2
@@ -64,21 +70,60 @@ msgstr ""
 #. Name
 #: Human.kcsrc:2
 msgid "Human"
-msgstr ""
+msgstr "人类"
+
+#. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr "�� - 紫水晶"
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr "�� - ��石"
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr "��"
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr "�� - 柠檬酸"
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr "�� - 绿�石"
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr "�� - 红�石"
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr "�� - ��石"
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr "�� - 黄玉"
 
 #. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
-msgstr ""
+msgstr "KDE 1 �典"
 
 #. Name
 #: KDETwo.kcsrc:2
 msgid "KDE 2"
-msgstr ""
+msgstr "KDE 2 �旧�典"
 
 #. Name
 #: Keramik.kcsrc:2
-#, fuzzy
 msgid "Keramik"
 msgstr "Keramik 白"
 
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "�白"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr "å¡‘æ–™"
@@ -138,14 +193,34 @@ msgid "Pumpkin"
 msgstr "�瓜黄"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr "季节 - 秋天"
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr "季节 - 春天"
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr "季节 - �天"
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr "季节 - 冬天"
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
-msgstr ""
+msgstr "黄土"
 
 #. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris 系统"
 
 #. Name
 #: Storm.kcsrc:3
@@ -170,17 +245,17 @@ msgstr "高对比度白色文字"
 #. Name
 #: Windows2000.kcsrc:2
 msgid "Redmond 2000"
-msgstr ""
+msgstr "Redmond 2000 旧���"
 
 #. Name
 #: Windows95.kcsrc:3
 msgid "Redmond 95"
-msgstr ""
+msgstr "Redmond 95 旧�"
 
 #. Name
 #: WindowsXP.kcsrc:2
 msgid "Redmond XP"
-msgstr ""
+msgstr "Redmond XP 最�典的一代"
 
 #. Name
 #: YellowOnBlue.kcsrc:2
diff --git a/translations/desktop_files/kcontrol-color-schemes/zh_TW.po b/translations/desktop_files/kcontrol-color-schemes/zh_TW.po
index 09d238def..0ad4fb0e0 100644
--- a/translations/desktop_files/kcontrol-color-schemes/zh_TW.po
+++ b/translations/desktop_files/kcontrol-color-schemes/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "沙漠紅"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "數� CDE"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -98,6 +143,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -118,6 +168,11 @@ msgid "Pale Gray"
 msgstr "�白"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -138,6 +193,26 @@ msgid "Pumpkin"
 msgstr "�瓜黃"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/zu.po b/translations/desktop_files/kcontrol-color-schemes/zu.po
index 1a279b340..b57bc96b0 100644
--- a/translations/desktop_files/kcontrol-color-schemes/zu.po
+++ b/translations/desktop_files/kcontrol-color-schemes/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"POT-Creation-Date: 2025-01-26 18:11+0000\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"
@@ -52,6 +52,11 @@ msgid "Desert Red"
 msgstr "Okubovu okogwadule"
 
 #. Name
+#: Different.kcsrc:2
+msgid "Different"
+msgstr ""
+
+#. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
 msgstr "I-CDE eyizinombolo"
@@ -67,6 +72,46 @@ msgid "Human"
 msgstr ""
 
 #. Name
+#: Jewels-Amethyst.kcsrc:2
+msgid "Jewels - Amethyst"
+msgstr ""
+
+#. Name
+#: Jewels-Aquamarine.kcsrc:2
+msgid "Jewels - Aquamarine"
+msgstr ""
+
+#. Name
+#: Jewels-Carbon.kcsrc:2
+msgid "Jewels - Carbon"
+msgstr ""
+
+#. Name
+#: Jewels-Citrin.kcsrc:2
+msgid "Jewels - Citrin"
+msgstr ""
+
+#. Name
+#: Jewels-Emerald.kcsrc:2
+msgid "Jewels - Emerald"
+msgstr ""
+
+#. Name
+#: Jewels-Ruby.kcsrc:2
+msgid "Jewels - Ruby"
+msgstr ""
+
+#. Name
+#: Jewels-Sapphire.kcsrc:2
+msgid "Jewels - Sapphire"
+msgstr ""
+
+#. Name
+#: Jewels-Topaz.kcsrc:2
+msgid "Jewels - Topaz"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -99,6 +144,11 @@ msgid "Last.fm"
 msgstr ""
 
 #. Name
+#: Lila.kcsrc:2
+msgid "Lila"
+msgstr ""
+
+#. Name
 #: Lizard.kcsrc:2
 msgid "Lizard"
 msgstr ""
@@ -119,6 +169,11 @@ msgid "Pale Gray"
 msgstr "Okumpunga ngokukhanyayo"
 
 #. Name
+#: Pinkie.kcsrc:2
+msgid "Pinkie"
+msgstr ""
+
+#. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
 msgstr ""
@@ -139,6 +194,26 @@ msgid "Pumpkin"
 msgstr "Ithanga"
 
 #. Name
+#: Seasons-Autumn.kcsrc:2
+msgid "Seasons - Autumn"
+msgstr ""
+
+#. Name
+#: Seasons-Spring.kcsrc:2
+msgid "Seasons - Spring"
+msgstr ""
+
+#. Name
+#: Seasons-Summer.kcsrc:2
+msgid "Seasons - Summer"
+msgstr ""
+
+#. Name
+#: Seasons-Winter.kcsrc:2
+msgid "Seasons - Winter"
+msgstr ""
+
+#. Name
 #: Sienna.kcsrc:2
 msgid "Sienna"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/af.po b/translations/desktop_files/kcontrol-desktops/af.po
index c44398502..a217c216e 100644
--- a/translations/desktop_files/kcontrol-desktops/af.po
+++ b/translations/desktop_files/kcontrol-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1578,6 +1578,33 @@ msgstr ""
 "DoubleClick;mapping;right handig;left handig;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Muis instellings"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handig;left handig;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ar.po b/translations/desktop_files/kcontrol-desktops/ar.po
index 8cb163170..8c6dc2524 100644
--- a/translations/desktop_files/kcontrol-desktops/ar.po
+++ b/translations/desktop_files/kcontrol-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1598,6 +1598,35 @@ msgstr ""
 "الأزرار;نقر;أبقونات;ارجاع;مؤشرات;سحب; نقر مزدوج;خريطة;أيمن;أعسر;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "اعدادات ال�أرة"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;ال�أرة;تسارع ال�أرة;الحد الأقضى "
+"لل�أرة;�أرة;.أزرار ال�أرة; اختيار;مؤشر;الاختيار;المؤشر;أجهزة الادخال;.خريطة "
+"الأزرار;نقر;أبقونات;ارجاع;مؤشرات;سحب; نقر مزدوج;خريطة;أيمن;أعسر;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/as.po b/translations/desktop_files/kcontrol-desktops/as.po
index 888ac4e26..14c49be4b 100644
--- a/translations/desktop_files/kcontrol-desktops/as.po
+++ b/translations/desktop_files/kcontrol-desktops/as.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ast.po b/translations/desktop_files/kcontrol-desktops/ast.po
index f59ac0d9c..569da37ad 100644
--- a/translations/desktop_files/kcontrol-desktops/ast.po
+++ b/translations/desktop_files/kcontrol-desktops/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/az.po b/translations/desktop_files/kcontrol-desktops/az.po
index ddf99f0d8..63531090f 100644
--- a/translations/desktop_files/kcontrol-desktops/az.po
+++ b/translations/desktop_files/kcontrol-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1587,6 +1587,33 @@ msgstr ""
 "Daşı;Cüt Tıqla;xəritələmə;sağ əlli;sol əlli;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Siçan qurğuları"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"siçan;Siçan Sür'ətləndirmə;Siçan sərhədi;Siçan Düymələri;Seçim;ox şəkli;"
+"giriş avadanlıqları;Düymə Xəritəsi;Tıqlama;timsallar;əks təs'ir;İşarətçilər;"
+"Daşı;Cüt Tıqla;xəritələmə;sağ əlli;sol əlli;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/be.po b/translations/desktop_files/kcontrol-desktops/be.po
index ce546b6c0..154d55725 100644
--- a/translations/desktop_files/kcontrol-desktops/be.po
+++ b/translations/desktop_files/kcontrol-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1625,6 +1625,36 @@ msgstr ""
 "mapping;right handed;left handed;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "�а�таўленні мышы"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Мыш;Па�кар�нне мышы;Кнопкі мышы;Вылуч�нне;Форма кур�ора;Прылады ўводу;"
+"Прызнач�нне кнопак;Дзе�нне кнопак;�аці�к;значкі;Указальнік;Кур�ор;"
+"Перац�гваць;Двайны наці�к;дл� левай рукі;дл� правай рукі;Mouse;Mouse "
+"acceleration;Mouse threshold;Mouse buttons;Selection;Cursor Shape;Input "
+"Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;DoubleClick;"
+"mapping;right handed;left handed;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Джой�тык"
diff --git a/translations/desktop_files/kcontrol-desktops/be@latin.po b/translations/desktop_files/kcontrol-desktops/be@latin.po
index 994223a90..12bd8e24e 100644
--- a/translations/desktop_files/kcontrol-desktops/be@latin.po
+++ b/translations/desktop_files/kcontrol-desktops/be@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/bg.po b/translations/desktop_files/kcontrol-desktops/bg.po
index 3e81c6f7c..8e9bac2f2 100644
--- a/translations/desktop_files/kcontrol-desktops/bg.po
+++ b/translations/desktop_files/kcontrol-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
 "PO-Revision-Date: 2020-07-22 06:31+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -1620,6 +1620,34 @@ msgstr ""
 "handed; left handed;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "�а�тройване на мишката"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"на�тройки; мишка; по�очващо; у�трой�тво; Mouse; Mouse acceleration; Mouse "
+"threshold; Mouse buttons; Selection; Cursor Shape; Input Devices; Button "
+"Mapping; Click; icons; feedback; Pointers; Drag; DoubleClick; mapping; right "
+"handed; left handed;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Джой�тик"
diff --git a/translations/desktop_files/kcontrol-desktops/bn.po b/translations/desktop_files/kcontrol-desktops/bn.po
index a294d2a38..6c21a789a 100644
--- a/translations/desktop_files/kcontrol-desktops/bn.po
+++ b/translations/desktop_files/kcontrol-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1571,6 +1571,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "মাউস সেটিংস"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "জয়-স�টিক"
diff --git a/translations/desktop_files/kcontrol-desktops/bn_IN.po b/translations/desktop_files/kcontrol-desktops/bn_IN.po
index 201ce42f3..23f5c7e87 100644
--- a/translations/desktop_files/kcontrol-desktops/bn_IN.po
+++ b/translations/desktop_files/kcontrol-desktops/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/br.po b/translations/desktop_files/kcontrol-desktops/br.po
index 3096ccef4..3fc4dd5f6 100644
--- a/translations/desktop_files/kcontrol-desktops/br.po
+++ b/translations/desktop_files/kcontrol-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1567,6 +1567,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Kefluniañ al logodenn"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Lanker-c'hoari"
diff --git a/translations/desktop_files/kcontrol-desktops/bs.po b/translations/desktop_files/kcontrol-desktops/bs.po
index c1564e986..1548fd81e 100644
--- a/translations/desktop_files/kcontrol-desktops/bs.po
+++ b/translations/desktop_files/kcontrol-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1592,6 +1592,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Podešavanje miša"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ca.po b/translations/desktop_files/kcontrol-desktops/ca.po
index d19f7696d..6d4ad1c57 100644
--- a/translations/desktop_files/kcontrol-desktops/ca.po
+++ b/translations/desktop_files/kcontrol-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1603,6 +1603,33 @@ msgstr ""
 "realimentació;apuntadors;arrossegar;clic doble;mapejat;dretà;esquerrà;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Arranjament del ratolí"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Ratolí;acceleració del ratolí;llindar del ratolí;botons del ratolí;selecció;"
+"forma del cursor;dispositius d'entrada;mapejat de botons;clic;icones;"
+"realimentació;apuntadors;arrossegar;clic doble;mapejat;dretà;esquerrà;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Palanca de control"
diff --git a/translations/desktop_files/kcontrol-desktops/ca@valencia.po b/translations/desktop_files/kcontrol-desktops/ca@valencia.po
index 2d0ad8017..1c51450e2 100644
--- a/translations/desktop_files/kcontrol-desktops/ca@valencia.po
+++ b/translations/desktop_files/kcontrol-desktops/ca@valencia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1548,6 +1548,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/cs.po b/translations/desktop_files/kcontrol-desktops/cs.po
index 3eec32c95..665ba4734 100644
--- a/translations/desktop_files/kcontrol-desktops/cs.po
+++ b/translations/desktop_files/kcontrol-desktops/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2021-09-07 01:16+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2024-09-10 15:10+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/kcontrol-desktop-files/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.8\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -1575,8 +1575,27 @@ msgid ""
 "DoubleClick;mapping;right handed;left handed;"
 msgstr ""
 "Myš;Akcelerace myši;Práh myši;Tla�ítka myši;Výběr;Tvar kurzoru;Vstupní "
-"zařízení;Mapování tla�ítek;Kurzor;Kliknutí;Odezva;Ukzatele;Poklepání;Dvojité "
-"kliknutí;Pravák;Levák;"
+"zařízení;Mapování tla�ítek;Kurzor;Kliknutí;Odezva;Ukazatele;Poklepání;"
+"Dvojité kliknutí;Pravák;Levák;"
+
+#. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Touchpad"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "Nastavení touchpadu"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Touchpad;Kliknutí klepnutím;Myš;Tla�ítka myši;Vstupní zařízení;Mapování "
+"tla�ítek;Klepnutí;Kliknutí;mapování; pravák;levák;"
 
 #. Name
 #: joystick/joystick.desktop:12
diff --git a/translations/desktop_files/kcontrol-desktops/csb.po b/translations/desktop_files/kcontrol-desktops/csb.po
index 46e5036ad..a393a1749 100644
--- a/translations/desktop_files/kcontrol-desktops/csb.po
+++ b/translations/desktop_files/kcontrol-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1597,6 +1597,33 @@ msgstr ""
 "wskôzywôczë;przecyganié;podwójné klëkniãce;mapòwanié;prawòrãczny;lewòrãczny;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Nastôw mëszë"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mësz;przërëchlënié mëszë;Próg mëszë;Knąpë mëszë;Zaznaczenié;Sztôłt kùrsora;"
+"Ùrządzenia wéńdzeniô;mapòwanié knąpów;klëkniãce;ikònë;widzałé efektë;"
+"wskôzywôczë;przecyganié;podwójné klëkniãce;mapòwanié;prawòrãczny;lewòrãczny;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/cy.po b/translations/desktop_files/kcontrol-desktops/cy.po
index 70340ef23..033da6ca7 100644
--- a/translations/desktop_files/kcontrol-desktops/cy.po
+++ b/translations/desktop_files/kcontrol-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1593,6 +1593,33 @@ msgstr ""
 "Llusgo;Clic Dwbl;mapio;llaw dde;llaw chwith;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Gosodiadau Llygoden"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Llygoden;Cyflymu Llygoden;Trothwy Llygoden;Botymau Llygoden;Dewis;Si?p "
+"Cyrchydd;Dyfeisiau Mewnbwn;Mapio Botymau; Clic;eiconau;adborth;Pwyntyddion;"
+"Llusgo;Clic Dwbl;mapio;llaw dde;llaw chwith;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Ffôn reoli"
diff --git a/translations/desktop_files/kcontrol-desktops/da.po b/translations/desktop_files/kcontrol-desktops/da.po
index 1cea9ce83..089ccbe30 100644
--- a/translations/desktop_files/kcontrol-desktops/da.po
+++ b/translations/desktop_files/kcontrol-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1593,6 +1593,33 @@ msgstr ""
 "mapping;højrehåndet;venstrehåndet;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Opsætning af mus"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mus;Museacceleration;Musegrænse;Museknapper;Markering;Markørform;"
+"Inddataenheder;Knap-mapping;Klik;ikoner;feedback;Pegere; Træk;Dobbeltklik;"
+"mapping;højrehåndet;venstrehåndet;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/de.po b/translations/desktop_files/kcontrol-desktops/de.po
index 938a24c10..b9cbf2b34 100644
--- a/translations/desktop_files/kcontrol-desktops/de.po
+++ b/translations/desktop_files/kcontrol-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1598,6 +1598,33 @@ msgstr ""
 "Doppelklick;Rechtshänder;Linkshänder;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Einstellungen für die Maus vornehmen"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Maus;Mausbeschleunigung;Mausschwellenwert;Maustasten;Auswahl;Cursor;"
+"Cursorform;Eingabegeräte;Knöpfe;Buttons;Zuordnungen;Klicks;Zeigegeräte;"
+"Doppelklick;Rechtshänder;Linkshänder;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/el.po b/translations/desktop_files/kcontrol-desktops/el.po
index 41773eeb9..a4c3fb3ff 100644
--- a/translations/desktop_files/kcontrol-desktops/el.po
+++ b/translations/desktop_files/kcontrol-desktops/el.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# "blu.256" <mavridisf@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2025-04-24 12:44+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kcontrol-desktop-files/el/>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -183,15 +184,14 @@ msgstr "Διαχει�ιστής α�χείων"
 
 #. Comment
 #: componentchooser/componentservices/kcm_filemanager.desktop:3
-#, fuzzy
 msgid ""
 "This service allows you to configure your default file manager. All TDE "
 "applications which invoke a file manager application should honor this "
 "setting."
 msgstr ""
-"Αυτή η υπη�εσία σας επιτ�έπει να �υθμίσετε τον π�οκαθο�ισμένο π�οσομοιωτή "
-"τε�ματικο� σας. Όλες οι εφα�μογές του TDE που καλο�ν μια εφα�μογή "
-"π�οσομοιωτή τε�ματικο� θα π�έπει να τη�ο�ν αυτήν τη ��θμιση."
+"Αυτή η υπη�εσία σας επιτ�έπει να �υθμίσετε τον π�οκαθο�ισμένο διαχει�ιστή "
+"α�χείων σας. Όλες οι εφα�μογές του TDE που καλο�ν έναν διαχει�ιστή α�χείων "
+"θα π�έπει να τη�ο�ν αυτήν τη ��θμιση."
 
 #. Name
 #: componentchooser/componentservices/kcm_kemail.desktop:1
@@ -274,18 +274,17 @@ msgstr "Ρυθμίσεις οθόνης"
 #. Name
 #: displayconfig/displayconfig.desktop:12
 msgid "Monitor & Display"
-msgstr ""
+msgstr "Οθόνη"
 
 #. Comment
 #: displayconfig/displayconfig.desktop:14
-#, fuzzy
 msgid "Configure display"
-msgstr "Ρ�θμιση ε��εσης υπη�εσιών"
+msgstr "Ρ�θμιση οθόνης"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "οθόνη;ανάλυση οθόνης;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -339,48 +338,49 @@ msgstr "Βάση δεδομένων α�κτικόλεξου"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6
 msgid "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
-msgstr ""
+msgstr "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3
 msgid "Alexa"
-msgstr ""
+msgstr "Alexa"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
 msgid "http://info.alexa.com/search?q=\\{@}"
-msgstr ""
+msgstr "http://info.alexa.com/search?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:3
 msgid "Alexa URL"
-msgstr ""
+msgstr "Alexa URL"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:6
 msgid "http://info.alexa.com/data/details?url=\\{@}"
-msgstr ""
+msgstr "http://info.alexa.com/data/details?url=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:3
 msgid "AllTheWeb fast"
-msgstr ""
+msgstr "Γ�ήγο�η αναζήτηση AllTheWeb"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:6
 msgid ""
 "http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web"
 msgstr ""
+"http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:3
 msgid "AltaVista"
-msgstr ""
+msgstr "AltaVista"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:6
 msgid "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}"
-msgstr ""
+msgstr "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:4
@@ -390,7 +390,7 @@ msgstr "Οδηγός All Music"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:5
 msgid "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}"
-msgstr ""
+msgstr "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:3
@@ -400,17 +400,17 @@ msgstr "Αναζήτηση εφα�μογών του KDE"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:6
 msgid "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}"
-msgstr ""
+msgstr "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:3
 msgid "AustroNaut"
-msgstr ""
+msgstr "AustroNaut"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:6
 msgid "http://austronaut.at/page.php?begriff=\\{@}&wo=at"
-msgstr ""
+msgstr "http://austronaut.at/page.php?begriff=\\{@}&wo=at"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3
@@ -420,7 +420,7 @@ msgstr "Αναζήτηση νέων Πακέτων Debian για σταθε�ή
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4
 msgid "http://www.backports.org/package.php?search=\\{@}"
-msgstr ""
+msgstr "http://www.backports.org/package.php?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:3
@@ -433,6 +433,8 @@ msgid ""
 "http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+"
 "\\{5}+\\{6}+\\{7}+\\{8}+\\{9}"
 msgstr ""
+"http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+"
+"\\{5}+\\{6}+\\{7}+\\{8}+\\{9}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:3
@@ -442,7 +444,7 @@ msgstr "Αναζήτηση αÏ�ιθμοÏ� σφάλματος στη βάση δÎ
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:4
 msgid "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}"
-msgstr ""
+msgstr "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/call.desktop:5
@@ -452,7 +454,7 @@ msgstr "QRZ.com βάση δεδομένων τηλεπικοινωνίας"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/call.desktop:6
 msgid "http://www.qrz.com/database?callsign=\\{@}"
-msgstr ""
+msgstr "http://www.qrz.com/database?callsign=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/cia.desktop:4
@@ -466,6 +468,8 @@ msgid ""
 "http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww."
 "cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky"
 msgstr ""
+"http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww."
+"cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:5
@@ -475,7 +479,7 @@ msgstr "CiteSeer: Ψηφιακή βιβλιοθήκη επιστημονικής
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:6
 msgid "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1"
-msgstr ""
+msgstr "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:3
@@ -487,6 +491,7 @@ msgstr "CPAN - Πε�ιεκτικό δίκτυο α�χειοθήκης perl"
 msgid ""
 "http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}"
 msgstr ""
+"http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:3
@@ -499,6 +504,8 @@ msgid ""
 "http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename="
 "\\{ at }"
 msgstr ""
+"http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=\\{ "
+"at }"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3
@@ -510,6 +517,7 @@ msgstr "Κατάλογος CTAN"
 msgid ""
 "http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}"
 msgstr ""
+"http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:3
@@ -519,7 +527,7 @@ msgstr "Σ�στημα εντοπισμο� σφαλμάτων του Debian"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:4
 msgid "http://bugs.debian.org/\\{@}"
-msgstr ""
+msgstr "http://bugs.debian.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5
@@ -530,7 +538,7 @@ msgstr "Μετάφ�αση dict.cc: Γε�μανικά σε Αγγλικά"
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:6
 msgid "http://www.dict.cc/?s=\\{@}"
-msgstr ""
+msgstr "http://www.dict.cc/?s=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3
@@ -541,7 +549,7 @@ msgstr "LEO - Μετάφ�αση μεταξ� Γε�μανικών και Γαλ
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:6
 #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:6
 msgid "http://dict.leo.org/?lp=frde&search=\\{@}"
-msgstr ""
+msgstr "http://dict.leo.org/?lp=frde&search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:3
@@ -551,17 +559,17 @@ msgstr "Αναζήτηση πακέτων Debian"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:4
 msgid "http://packages.debian.org/\\{@}"
-msgstr ""
+msgstr "http://packages.debian.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:3
 msgid "Open Directory"
-msgstr ""
+msgstr "Ανοιχτός κατάλογος (DMOZ)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
 msgid "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
-msgstr ""
+msgstr "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
@@ -571,7 +579,7 @@ msgstr "DocBook - Ο απόλυτος οδηγός"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:6
 msgid "http://www.docbook.org/tdg/en/html/\\{1}.html"
-msgstr ""
+msgstr "http://www.docbook.org/tdg/en/html/\\{1}.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:5
@@ -581,7 +589,7 @@ msgstr "Αναγνώ�ιση ψηφιακών αντικειμένων"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:6
 msgid "http://dx.doi.org/\\{@}"
-msgstr ""
+msgstr "http://dx.doi.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5
@@ -596,7 +604,7 @@ msgstr "WordReference.com Μετάφ�αση: Αγγλικά σε Ισπανικ
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:6
 msgid "http://www.wordreference.com/es/translation.asp?tranword=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/es/translation.asp?tranword=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:5
@@ -606,7 +614,7 @@ msgstr "WordReference.com Μετάφ�αση: Αγγλικά σε Γαλλικά
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:6
 msgid "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:5
@@ -616,7 +624,7 @@ msgstr "WordReference.com Μετάφ�αση: Αγγλικά σε Ιταλικά
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:6
 msgid "http://www.wordreference.com/it/translation.asp?enit=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/it/translation.asp?enit=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:5
@@ -626,27 +634,27 @@ msgstr "WordReference.com Μετάφ�αση: Ισπανικά σε Αγγλικ
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:6
 msgid "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:3
 msgid "Excite"
-msgstr ""
+msgstr "Excite"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:6
 msgid "http://search.excite.com/search.gw?search=\\{@}"
-msgstr ""
+msgstr "http://search.excite.com/search.gw?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:3
 msgid "Feedster"
-msgstr ""
+msgstr "Feedster"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:6
 msgid "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:3
@@ -656,7 +664,7 @@ msgstr "ΕλεÏ�θεÏ�ο διαδικτυακό λεξικό υπολογιστÏ
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:6
 msgid "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}"
-msgstr ""
+msgstr "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:3
@@ -671,58 +679,57 @@ msgstr "WordReference.com Μετάφ�αση: Γαλλικά σε Αγγλικά
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:6
 msgid "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:3
 msgid "FreeDB"
-msgstr ""
+msgstr "FreeDB"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:6
 msgid "http://www.freedb.org/freedb_search.php?words=\\{@}"
-msgstr ""
+msgstr "http://www.freedb.org/freedb_search.php?words=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:3
 msgid "Freshmeat"
-msgstr ""
+msgstr "Freshmeat"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:6
 msgid "http://freshmeat.net/search/?q=\\{@}"
-msgstr ""
+msgstr "http://freshmeat.net/search/?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:3
 msgid "Froogle"
-msgstr ""
+msgstr "Google Shopping"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:6
 msgid "http://froogle.google.com/froogle?q=\\{@}"
-msgstr ""
+msgstr "http://froogle.google.com/froogle?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:3
 msgid "FSF/UNESCO Free Software Directory"
-msgstr ""
+msgstr "FSF/UNESCO Κατάλογος ελε�θε�ου λογισμικο�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:6
 msgid "http://directory.fsf.org/search/?query=\\{@}"
-msgstr ""
+msgstr "http://directory.fsf.org/search/?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:3
-#, fuzzy
 msgid "Google"
-msgstr "Google νέα"
+msgstr "Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:6
 msgid "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:3
@@ -738,6 +745,11 @@ msgid ""
 "\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\"}"
 "&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
 msgstr ""
+"http://www.google.com/search?as_q=\\{all,@}&num=\\{num,\"10\""
+"}&btnG=Google+Search&as_epq=\\{exact,\"\"}&as_oq=\\{any,\"\"}&as_eq=\\"
+"{without,\"\"}&lr=\\{lang,\"\"}&as_ft=\\{ft,\"i\"}&as_filetype=\\{filetype,\""
+"\"}&as_qdr=\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\""
+"}&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3
@@ -747,7 +759,7 @@ msgstr "Ομάδες του Google"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:6
 msgid "http://groups.google.com/groups?oi=djq&as_q=\\{@}"
-msgstr ""
+msgstr "http://groups.google.com/groups?oi=djq&as_q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:3
@@ -757,7 +769,7 @@ msgstr "Αναζήτηση εικόνων του Google"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:6
 msgid "http://images.google.com/images?q=\\{@}"
-msgstr ""
+msgstr "http://images.google.com/images?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:3
@@ -771,6 +783,8 @@ msgid ""
 "http://www.google.com/search?q=\\{@}&btnI=I%27m+Feeling"
 "+Lucky&ie=UTF-8&oe=UTF-8"
 msgstr ""
+"http://www.google.com/search?q=\\"
+"{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:3
@@ -780,7 +794,7 @@ msgstr "Google ταινίες"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:6
 msgid "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:3
@@ -790,17 +804,17 @@ msgstr "Google νέα"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:6
 msgid "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:3
 msgid "Gracenote"
-msgstr ""
+msgstr "Gracenote"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:6
 msgid "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
-msgstr ""
+msgstr "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5
@@ -810,28 +824,27 @@ msgstr "Μεγάλο Λεξικό της Καταλανικής Γλώσσας
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:6
 msgid "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}"
-msgstr ""
+msgstr "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:3
 msgid "Hotbot"
-msgstr ""
+msgstr "Lycos Hotbot"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:6
 msgid "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2"
-msgstr ""
+msgstr "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:3
-#, fuzzy
 msgid "HyperDictionary.com"
 msgstr "Θησαυ�ός λέξεων HyperDictionary.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:6
 msgid "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
-msgstr ""
+msgstr "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:3
@@ -841,7 +854,7 @@ msgstr "Θησαυ�ός λέξεων HyperDictionary.com"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:6
 msgid "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
-msgstr ""
+msgstr "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:3
@@ -851,7 +864,7 @@ msgstr "Βάση δεδομένων ταινιών στο διαδίκτυο"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:6
 msgid "http://imdb.com/Find?\\{@}"
-msgstr ""
+msgstr "http://imdb.com/Find?\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:5
@@ -861,12 +874,12 @@ msgstr "WordReference.com Μετάφ�αση: Ιταλικά σε Αγγλικά
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:6
 msgid "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:3
 msgid "Ask Jeeves"
-msgstr ""
+msgstr "Ask Jeeves"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:6
@@ -874,16 +887,18 @@ msgid ""
 "http://www.ask.com/main/askJeeves.asp?"
 "origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
 msgstr ""
+"http://www.ask.com/main/askJeeves."
+"asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:3
 msgid "KataTudo"
-msgstr ""
+msgstr "KataTudo"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:6
 msgid "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar"
-msgstr ""
+msgstr "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:5
@@ -893,37 +908,37 @@ msgstr "Τεκμη�ίωση KDE API"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:6
 msgid "http://api.kde.org/classmapper.php?class=\\{@}"
-msgstr ""
+msgstr "http://api.kde.org/classmapper.php?class=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:3
 msgid "KDE WebSVN"
-msgstr ""
+msgstr "KDE WebSVN"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:6
 msgid "http://websvn.kde.org/\\{@}"
-msgstr ""
+msgstr "http://websvn.kde.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:3
 msgid "LEO-Translate"
-msgstr ""
+msgstr "LEO-Μετάφ�αση"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:6
 msgid "http://dict.leo.org/?search=\\{@}"
-msgstr ""
+msgstr "http://dict.leo.org/?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:3
 msgid "Lycos"
-msgstr ""
+msgstr "Lycos"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:6
 msgid "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}"
-msgstr ""
+msgstr "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:3
@@ -933,12 +948,12 @@ msgstr "Mamma - Η μητέÏ�α όλων των μηχανών αναζήτησÎ
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:6
 msgid "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}"
-msgstr ""
+msgstr "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:3
 msgid "MetaCrawler"
-msgstr ""
+msgstr "MetaCrawler"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:6
@@ -947,6 +962,9 @@ msgid ""
 "&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-"
 "search&refer=mc-search"
 msgstr ""
+"http://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=m"
+"etaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&t"
+"heme=classic&refer=mc-search&refer=mc-search"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3
@@ -960,16 +978,19 @@ msgid ""
 "handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
 "asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
 msgstr ""
+"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff."
+"asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
+"asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:3
 msgid "Netcraft"
-msgstr ""
+msgstr "Netcraft"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:6
 msgid "http://uptime.netcraft.com/up/graph?site=\\{@}"
-msgstr ""
+msgstr "http://uptime.netcraft.com/up/graph?site=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:2
@@ -985,6 +1006,10 @@ msgid ""
 "&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription=&country=&catcode=&dcity="
 "\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
 msgstr ""
+"http://www.detelefoongids.nl/tginl.dll?action=white&type=search&resultsperpag"
+"e=25&pagestart=1&source=searchcategory&name2=\\{1}&name=&initials=&city=\\{2}"
+"&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription="
+"&country=&catcode=&dcity=\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:2
@@ -994,7 +1019,7 @@ msgstr "Πά�οχος αναζήτησης Teletekst "
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:6
 msgid "http://teletekst.nos.nl/gif/\\{@}-01.html"
-msgstr ""
+msgstr "http://teletekst.nos.nl/gif/\\{@}-01.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:3
@@ -1004,7 +1029,7 @@ msgstr "Αναζήτηση κλειδιο� OpenPGP"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:4
 msgid "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex"
-msgstr ""
+msgstr "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/php.desktop:3
@@ -1014,7 +1039,7 @@ msgstr "Αναζήτηση PHP"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/php.desktop:4
 msgid "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}"
-msgstr ""
+msgstr "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/python.desktop:5
@@ -1028,6 +1053,8 @@ msgid ""
 "http://www.google.com/search?sourceid=python-search&q=\\{@}"
 "&submit=Search&q=site%3Apython.org"
 msgstr ""
+"http://www.google.com/search?sourceid=python-search&q=\\"
+"{@}&submit=Search&q=site%3Apython.org"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/qt.desktop:5
@@ -1037,7 +1064,7 @@ msgstr "Τελευταία τεκμηÏ�ίωση του Qt στο διαδίκτÏ
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/qt.desktop:6
 msgid "http://doc.trolltech.com/latest/\\{@}.html"
-msgstr ""
+msgstr "http://doc.trolltech.com/latest/\\{@}.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:5
@@ -1047,7 +1074,7 @@ msgstr "Τεκμη�ίωση του Qt3 στο διαδίκτυο"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:6
 msgid "http://doc.trolltech.com/3.3/\\{@}.html"
-msgstr ""
+msgstr "http://doc.trolltech.com/3.3/\\{@}.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:5
@@ -1060,6 +1087,8 @@ msgid ""
 "http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}"
 "&FORMATO=ampliado"
 msgstr ""
+"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\"
+"{@}&FORMATO=ampliado"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3
@@ -1069,7 +1098,7 @@ msgstr "IETF ε�ωτήσεις για σχόλια"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:4
 msgid "http://www.ietf.org/rfc/rfc\\{@}.txt"
-msgstr ""
+msgstr "http://www.ietf.org/rfc/rfc\\{@}.txt"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:3
@@ -1079,7 +1108,7 @@ msgstr "RPM-Αναζήτηση"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:6
 msgid "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}"
-msgstr ""
+msgstr "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:3
@@ -1089,12 +1118,12 @@ msgstr "Α�χειοθήκη εφα�μογών Ruby"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:6
 msgid "http://raa.ruby-lang.org/search.rhtml?search=\\{@}"
-msgstr ""
+msgstr "http://raa.ruby-lang.org/search.rhtml?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:3
 msgid "GO.com"
-msgstr ""
+msgstr "GO.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:6
@@ -1102,11 +1131,13 @@ msgid ""
 "http://www.go.com/Titles?col=WW&qt=\\{@}"
 "&svx=home_searchbox&sv=IS&lk=noframeso"
 msgstr ""
+"http://www.go.com/Titles?col=WW&qt=\\"
+"{@}&svx=home_searchbox&sv=IS&lk=noframeso"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3
 msgid "SourceForge"
-msgstr ""
+msgstr "SourceForge"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:4
@@ -1114,17 +1145,18 @@ msgid ""
 "http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact="
 "\\{exact,\"0\"}&words=\\{@}"
 msgstr ""
+"http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact=\\"
+"{exact,\"0\"}&words=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
-#, fuzzy
 msgid "Technorati"
 msgstr "Ετικέτες Technorati"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
 msgid "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}"
-msgstr ""
+msgstr "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:3
@@ -1134,7 +1166,7 @@ msgstr "Ετικέτες Technorati"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:6
 msgid "http://technorati.com/tag/\\{@}?sourceid=kde-search"
-msgstr ""
+msgstr "http://technorati.com/tag/\\{@}?sourceid=kde-search"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:3
@@ -1144,23 +1176,22 @@ msgstr "Θησαυ�ός λέξεων Merriam-Webster"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:6
 msgid "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}"
-msgstr ""
+msgstr "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:4
 msgid "TV Tome"
-msgstr ""
+msgstr "TV Tome"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:6
 msgid "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0"
-msgstr ""
+msgstr "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:5
-#, fuzzy
 msgid "U.S. Patent Database"
-msgstr "Βάση δεδομένων ταινιών στο διαδίκτυο"
+msgstr "Βάση δεδομένων πατεντών ΗΠΑ"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:6
@@ -1168,11 +1199,13 @@ msgid ""
 "http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}"
 "&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 msgstr ""
+"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\"
+"{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3
 msgid "Vivisimo"
-msgstr ""
+msgstr "Vivisimo"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:6
@@ -1181,11 +1214,13 @@ msgid ""
 "http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD"
 "%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16"
 msgstr ""
+"http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD"
+"%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:3
 msgid "Voila"
-msgstr ""
+msgstr "Voila"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:6
@@ -1193,6 +1228,8 @@ msgid ""
 "http://search.ke.voila.fr/S/voila?"
 "lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
 msgstr ""
+"http://search.ke.voila.fr/S/"
+"voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:3
@@ -1202,7 +1239,7 @@ msgstr "Λεξικό Merriam-Webster"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:6
 msgid "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}"
-msgstr ""
+msgstr "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:3
@@ -1214,6 +1251,7 @@ msgstr "Ε�ώτηση Whatis"
 msgid ""
 "http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}"
 msgstr ""
+"http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:3
@@ -1223,7 +1261,7 @@ msgstr "Wikipedia - Η ελε�θε�η εγκυκλοπαίδεια"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:6
 msgid "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
-msgstr ""
+msgstr "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3
@@ -1233,7 +1271,7 @@ msgstr "Wiktionary - Το ελε�θε�ο λεξικό"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6
 msgid "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
-msgstr ""
+msgstr "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:5
@@ -1243,7 +1281,7 @@ msgstr "WordReference.com αγγλικό λεξικό"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:6
 msgid "http://www.wordreference.com/english/definition.asp?en=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/english/definition.asp?en=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/localdomain/localdomainurifilter.desktop:3
@@ -1312,52 +1350,49 @@ msgstr ""
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:2
 msgid "tdehwdevicetray"
-msgstr ""
+msgstr "Διαχει�ιστής υλικο� για το πλαίσιο συστήματος TDE"
 
 #. GenericName
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2
 #: hwmanager/hwdevicetray.desktop:4
-#, fuzzy
 msgid "Device Monitor"
-msgstr "Πολλαπλές οθόνες"
+msgstr "Διαχει�ιστής υλικο�"
 
 #. Comment
 #: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
 msgid "Monitor hardware devices from the system tray"
-msgstr ""
+msgstr "Πα�ακολο�θηση συσκευών από το πλαίσιο συστήματος"
 
 #. Name
 #: hwmanager/hwmanager.desktop:11
-#, fuzzy
 msgid "Device Manager"
-msgstr "Διαχει�ιστής υπη�εσιών"
+msgstr "Διαχει�ιστής συσκευών"
 
 #. Comment
 #: hwmanager/hwmanager.desktop:13
-#, fuzzy
 msgid "Configure hardware devices"
-msgstr "Ρυθμίστε τη συμπε�ιφο�ά του πε�ιηγητή"
+msgstr "Ρ�θμιση συσκευών"
 
 #. Keywords
 #: hwmanager/hwmanager.desktop:15
 msgid "hardware;devices;manager;"
-msgstr ""
+msgstr "συσκευές;υλικό;διαχεί�ιση;"
 
 #. Comment
 #: iccconfig/iccconfig.desktop:14
 msgid "Configure display ICC color profile"
-msgstr ""
+msgstr "Διαχεί�ιση χ�ωματικο� π�οφίλ ICC οθόνης"
 
 #. Keywords
 #: iccconfig/iccconfig.desktop:16
 msgid "ICC;display;color;profile;"
-msgstr ""
+msgstr "ICC;οθόνη;χ�ώμα;π�οφίλ;"
 
 #. Name
 #: iccconfig/iccconfig.desktop:18
 msgid "Color Profile"
-msgstr ""
+msgstr "Χ�ωματικό π�οφίλ"
 
 #. Name
 #: icons/icons.desktop:12
@@ -1472,7 +1507,7 @@ msgstr ""
 #. Name
 #: info/opengl.desktop:13
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
 #. Comment
 #: info/opengl.desktop:15
@@ -1506,7 +1541,7 @@ msgstr "Κατατμήσεις;Σκλη�ός Δίσκος;HD;Πλη�οφο�ί
 #. Name
 #: info/pci.desktop:12
 msgid "PCI"
-msgstr ""
+msgstr "PCI"
 
 #. Comment
 #: info/pci.desktop:14
@@ -1536,7 +1571,7 @@ msgstr "Επεξε�γαστής;KME;FPU;Πλη�οφο�ίες συστήματ
 #. Name
 #: info/scsi.desktop:12
 msgid "SCSI"
-msgstr ""
+msgstr "SCSI"
 
 #. Comment
 #: info/scsi.desktop:14
@@ -1602,6 +1637,25 @@ msgstr ""
 "Δείκτες;Σ��σιμο;Διπλό κλικ;αντιστοίχηση;δεξιόχει�ας;α�ιστε�όχει�ας;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Πε�ιοχή αφής"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "Ρ�θμιση πε�ιοχής αφής (touchpad)"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"touchpad;πε�ιοχή αφής;tap-to-click;ποντίκι;πλήκτ�α;συσκευές "
+"εισόδου;α�ιστε�όχει�ας;δεξιόχει�ας;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Χει�ιστή�ιο"
@@ -1903,7 +1957,7 @@ msgstr ""
 #. Name
 #: konqhtml/tdehtml_java_js.desktop:11
 msgid "Java & JavaScript"
-msgstr ""
+msgstr "Java και Javascript"
 
 #. Comment
 #: konqhtml/tdehtml_java_js.desktop:13
@@ -1917,21 +1971,18 @@ msgstr "konqueror;kfm;πε�ιηγητής;html;ιστός;www;java;javascript;"
 
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
-#, fuzzy
 msgid "User Interface"
-msgstr "Δικτυακές διασυνδέσεις"
+msgstr "Γ�αφικό πε�ιβάλλον"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
-#, fuzzy
 msgid "Configure user interface options"
-msgstr "Ρυθμίστε τη λανθάνουσα μνήμη ιστοσελίδων"
+msgstr "Ρ�θμιση γ�αφικο� πε�ιβάλλοντος χ�ήστη"
 
 #. Keywords
 #: konqhtml/tdehtml_userinterface.desktop:15
-#, fuzzy
 msgid "konqueror;kfm;user;interface;tabbed;browsing;"
-msgstr "konqueror;επαναχ�ησιμοποίηση;π�οφό�τωση;"
+msgstr "konqueror;γ�αφικό;πε�ιβάλλον;κα�τέλες;πε�ιήγηση;πλοήγηση;"
 
 #. Name
 #: konsole/kcmkonsole.desktop:10
@@ -2092,7 +2143,7 @@ msgstr ""
 #. Name
 #: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
 msgid "TDERandRTray"
-msgstr ""
+msgstr "Διαχει�ιστής οθόνης για το πλαίσιο συστήματος TDE"
 
 #. GenericName
 #: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
@@ -2264,9 +2315,8 @@ msgstr "Α�χεία γ�αμματοσει�ών"
 
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:2
-#, fuzzy
 msgid "TDEFontView"
-msgstr "Π�οβολέας γ�αμματοσει�ών"
+msgstr "Π�οβολέας γ�αμματοσει�ών TDE"
 
 #. GenericName
 #. Name
@@ -2293,7 +2343,7 @@ msgstr "Λανθάνουσα μνήμη;Ιστο�ικό;Ιστο�ικό πε�
 #. Name
 #: tdeio/cookies.desktop:12
 msgid "Cookies"
-msgstr ""
+msgstr "Α�χεία Cookies"
 
 #. Comment
 #: tdeio/cookies.desktop:14
diff --git a/translations/desktop_files/kcontrol-desktops/en_GB.po b/translations/desktop_files/kcontrol-desktops/en_GB.po
index 16e6149fa..de69676d4 100644
--- a/translations/desktop_files/kcontrol-desktops/en_GB.po
+++ b/translations/desktop_files/kcontrol-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1599,6 +1599,24 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+msgid "Touchpad settings"
+msgstr "Colour settings"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/en_US.po b/translations/desktop_files/kcontrol-desktops/en_US.po
index 84986883d..29d58ee72 100644
--- a/translations/desktop_files/kcontrol-desktops/en_US.po
+++ b/translations/desktop_files/kcontrol-desktops/en_US.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1548,6 +1548,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/eo.po b/translations/desktop_files/kcontrol-desktops/eo.po
index f0ab1cec0..9a46f3213 100644
--- a/translations/desktop_files/kcontrol-desktops/eo.po
+++ b/translations/desktop_files/kcontrol-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1580,6 +1580,33 @@ msgstr ""
 "maldekstramanulo;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Agordo de la muso"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"muso;akcelado;butonoj;elekto;montrilo;kursoro;enigo;aparatoj;butonsignifo;"
+"klako;piktogramoj;reago;montriloj;�ovado;trenado;duklako;dekstrmanulo;"
+"maldekstramanulo;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Stirstango"
diff --git a/translations/desktop_files/kcontrol-desktops/es.po b/translations/desktop_files/kcontrol-desktops/es.po
index 94ac5eca8..93dc8636b 100644
--- a/translations/desktop_files/kcontrol-desktops/es.po
+++ b/translations/desktop_files/kcontrol-desktops/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
 "PO-Revision-Date: 2022-01-20 14:00+0000\n"
 "Last-Translator: Victor Galvez <cassdee_058@protonmail.com>\n"
 "Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
@@ -1606,6 +1606,34 @@ msgstr ""
 "zurdo;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Preferencias sobre el ratón"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Ratón;Aceleración del ratón;Umbral del ratón;Botones del ratón;Selección;"
+"Forma del cursor;Dispositivos de entrada;Asignaciones de botones;Pulsación;"
+"iconos;notificación;Punteros;Arrastrar;Doble pulsación;asignaciones;diestro;"
+"zurdo;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/es_AR.po b/translations/desktop_files/kcontrol-desktops/es_AR.po
new file mode 100644
index 000000000..4b5307248
--- /dev/null
+++ b/translations/desktop_files/kcontrol-desktops/es_AR.po
@@ -0,0 +1,2734 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2025-05-13 14:19+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kcontrol-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: access/kaccess.desktop:3
+msgid "Accessibility Tool"
+msgstr "Herramienta de accesibilidad"
+
+#. Name
+#: access/kcmaccess.desktop:12
+#, fuzzy
+msgid "Accessibility"
+msgstr "Accesibilidad"
+
+#. Comment
+#: access/kcmaccess.desktop:14
+msgid "Improve accessibility for disabled persons"
+msgstr "Mejorar accesibilidad para personas con discapacidad"
+
+#. Keywords
+#: access/kcmaccess.desktop:16
+#, fuzzy
+msgid ""
+"access;accessibility;deaf;impaired;bell;audible bell;visible bell;Keyboard;"
+"keys;sticky keys;bounce keys;slow keys;mouse navigation;num pad;"
+msgstr ""
+"acceso;accesibilidad;sordo;disminuido;timbre;timbre audible;timbre "
+"visible;Teclado;teclas;teclas pegajosas;teclas de golpe;teclas lentas;"
+"navegación del ratón;teclado numérico;"
+
+#. Name
+#: arts/arts.desktop:12
+#, fuzzy
+msgid "Sound System"
+msgstr "Sistema de sonido"
+
+#. Comment
+#: arts/arts.desktop:14
+#, fuzzy
+msgid "Sound System Configuration"
+msgstr "Configuración del sistema de sonido"
+
+#. Keywords
+#: arts/arts.desktop:16
+#, fuzzy
+msgid ""
+"aRts;Sound Server;artsd;Audio;Sound;startup;network transparency;"
+"transparency;priority;duplex;full duplex;response time;Mixer;Volume;KMix;Mix;"
+"login;MIDI;synthesizer;music;"
+msgstr ""
+"aRts;Servidor de sonido;artsd;Audio;Sonido;arranque;transparencia de "
+"red;transparencia;prioridad;duplex;full duplex;tiempo de respuesta; "
+"tiempo;Mezclador;Volumen;KMix;Mix;acceso;MIDI;sintetizador;música;"
+
+#. Name
+#: background/background.desktop:12
+#, fuzzy
+msgid "Background"
+msgstr "Fondo"
+
+#. Comment
+#: background/background.desktop:14
+#, fuzzy
+msgid "Change the background settings"
+msgstr "Modificación de las preferencias del fondo"
+
+#. Keywords
+#: background/background.desktop:16
+#, fuzzy
+msgid ""
+"background;desktops;colors;colours;images;wallpapers;blending;balance;cache;"
+"multiple wallpapers;pixmap;"
+msgstr ""
+"fondo;escritorios;colores;imágenes;tapices;mezcla;equilibrio;caché;tapices "
+"múltiples;mapa de píxeles;pixmap;"
+
+#. Name
+#: bell/bell.desktop:13
+#, fuzzy
+msgid "System Bell"
+msgstr "Timbre del sistema"
+
+#. Comment
+#: bell/bell.desktop:15
+#, fuzzy
+msgid "System Bell Configuration"
+msgstr "Configuración del timbre del sistema"
+
+#. Keywords
+#: bell/bell.desktop:17
+#, fuzzy
+msgid "Bell;Audio;Sound;Volume;Pitch;Duration;"
+msgstr "Timbre;Audio;Sonido;Volumen;Tono;Duración;"
+
+#. Name
+#: clock/clock.desktop:13
+#, fuzzy
+msgid "Date & Time"
+msgstr "Fecha y hora"
+
+#. Comment
+#: clock/clock.desktop:15
+#, fuzzy
+msgid "Date and time settings"
+msgstr "Preferencias sobre la fecha y hora"
+
+#. Keywords
+#: clock/clock.desktop:17
+#, fuzzy
+msgid "clock;date;time;time zone;"
+msgstr "reloj;fecha;hora;zona horaria;"
+
+#. Name
+#: colors/colors.desktop:12
+#, fuzzy
+msgid "Colors"
+msgstr "Colores"
+
+#. Comment
+#: colors/colors.desktop:14
+#, fuzzy
+msgid "Color settings"
+msgstr "Preferencias sobre los colores"
+
+#. Keywords
+#: colors/colors.desktop:16
+#, fuzzy
+msgid "colors;colours;scheme;contrast;Widget colors;Color Scheme;"
+msgstr ""
+"colores;esquema;contraste;Colores de los objetos visuales;Colores de los "
+"widgets;Esquema de colores;"
+
+#. Name
+#: componentchooser/EXAMPLE.desktop:1
+msgid "A nice name you have chosen for your interface"
+msgstr "Un bonito nombre de su elección para tu interfaz"
+
+#. Comment
+#: componentchooser/EXAMPLE.desktop:2
+#, fuzzy
+msgid "A helpful description of the interface for the top right info box"
+msgstr ""
+"Una descripción útil de la interfaz para el cuadro de información superior "
+"derecho"
+
+#. Name
+#: componentchooser/componentchooser.desktop:10
+msgid "Default Applications"
+msgstr "Programas por omisión"
+
+#. Comment
+#: componentchooser/componentchooser.desktop:12
+msgid "Choose the default components for various services"
+msgstr "Elegir los componentes por omisión para varios servicios"
+
+#. Keywords
+#: componentchooser/componentchooser.desktop:14
+msgid ""
+"default applications;components;component chooser;resources;e-mail;email "
+"client;text editor;instant messenger;terminal emulator;web browser;file "
+"manager;URL;hyperlinks;"
+msgstr ""
+"aplicaciones predeterminadas;componentes;selector de componente;recursos;"
+"correo electrónico;cliente de correo electrónico;editor de texto;cliente de "
+"mensajería instantánea;emulador de terminal;navegador web;gestor de "
+"archivos;URL;hiperenlaces;"
+
+#. Name
+#: componentchooser/componentservices/kcm_browser.desktop:1
+#, fuzzy
+msgid "Web Browser"
+msgstr "Navegador Web"
+
+#. Comment
+#: componentchooser/componentservices/kcm_browser.desktop:3
+msgid ""
+"Here you can configure your default web browser. All TDE applications in "
+"which you can select hyperlinks should honor this setting."
+msgstr ""
+"Éste servicio te permite configurar tu navegador de Internet por omisión. "
+"Todos los programas TDE que precisan acceso a hiperenlaces deberían "
+"reconocer esta opción."
+
+#. Name
+#: componentchooser/componentservices/kcm_filemanager.desktop:1
+#: konq/filebrowser.desktop:12
+#, fuzzy
+msgid "File Manager"
+msgstr "Gestor de archivos"
+
+#. Comment
+#: componentchooser/componentservices/kcm_filemanager.desktop:3
+msgid ""
+"This service allows you to configure your default file manager. All TDE "
+"applications which invoke a file manager application should honor this "
+"setting."
+msgstr ""
+"Éste servicio te permite configurar tu gestor de archivos por omisión. Todos "
+"los programas TDE que invoquen un gestor de archivos deberían reconocer ésta "
+"opción."
+
+#. Name
+#: componentchooser/componentservices/kcm_kemail.desktop:1
+msgid "Email Client"
+msgstr "Cliente de Mail"
+
+#. Comment
+#: componentchooser/componentservices/kcm_kemail.desktop:3
+msgid ""
+"This service allows you to configure your default email client. All TDE "
+"applications which need access to an email client application should honor "
+"this setting."
+msgstr ""
+"Éste servicio te permite configurar tu cliente de Mail por omisión. Todos "
+"los programas TDE que precisan acceso a un programas de cliente de correo "
+"deberían reconocer ésta opción."
+
+#. Name
+#: componentchooser/componentservices/kcm_terminal.desktop:1
+#, fuzzy
+msgid "Terminal Emulator"
+msgstr "Emulador de terminal"
+
+#. Comment
+#: componentchooser/componentservices/kcm_terminal.desktop:3
+msgid ""
+"This service allows you to configure your default terminal emulator. All TDE "
+"applications which invoke a terminal emulator application should honor this "
+"setting."
+msgstr ""
+"Éste servicio te permite configurar tu emulador de terminal por omisión. "
+"Todos los programas TDE que invoquen un emulador de terminal deberían "
+"reconocer ésta opción."
+
+#. Name
+#: crypto/crypto.desktop:10
+#, fuzzy
+msgid "Crypto"
+msgstr "Criptografía"
+
+#. Comment
+#: crypto/crypto.desktop:12
+#, fuzzy
+msgid "Configure SSL, manage certificates, and other cryptography settings"
+msgstr ""
+"Configura SSL, administra los certificados y otras preferencias de "
+"criptografía"
+
+#. Keywords
+#: crypto/crypto.desktop:14
+#, fuzzy
+msgid ""
+"Crypto;Krypto;Cryptography;encryption;SSL;https;certificates;ciphers;TLS;"
+"secure;security;"
+msgstr ""
+"Criptografía;cifra;SSL;https;certificados;cifrados;TLS;seguro;seguridad;"
+
+#. Name
+#: css/kcmcss.desktop:12
+#, fuzzy
+msgid "Stylesheets"
+msgstr "Hojas de estilo"
+
+#. Comment
+#: css/kcmcss.desktop:14
+msgid "Configure the stylesheets used to render web pages"
+msgstr ""
+"Configuración de las hojas de estilo usadas para mostrar páginas y sitiosweb"
+
+#. Keywords
+#: css/kcmcss.desktop:16
+#, fuzzy
+msgid "CSS;HTML;style;stylesheet;accessibility;"
+msgstr "CSS;HTML;estilo;hoja de estilo;accesibilidad;"
+
+#. Name
+#: display/display.desktop:11
+#, fuzzy
+msgid "Display"
+msgstr "Pantalla"
+
+#. Comment
+#: display/display.desktop:13
+#, fuzzy
+msgid "Display Settings"
+msgstr "Preferencias de la pantalla"
+
+#. Name
+#: displayconfig/displayconfig.desktop:12
+#, fuzzy
+msgid "Monitor & Display"
+msgstr "Monitores y pantallas"
+
+#. Comment
+#: displayconfig/displayconfig.desktop:14
+#, fuzzy
+msgid "Configure display"
+msgstr "Configurar pantalla"
+
+#. Keywords
+#: displayconfig/displayconfig.desktop:16
+#, fuzzy
+msgid "monitor;resolution;display;"
+msgstr "monitor;resolución;pantalla;"
+
+#. Name
+#: dnssd/kcm_tdednssd.desktop:18
+#, fuzzy
+msgid "Zeroconf Service Discovery"
+msgstr "Buscador de servicios"
+
+#. Comment
+#: dnssd/kcm_tdednssd.desktop:20
+#, fuzzy
+msgid "Configure service discovery"
+msgstr "Configura el buscador de servicios"
+
+#. Name
+#: ebrowsing/ebrowsing.desktop:12
+#, fuzzy
+msgid "Web Shortcuts"
+msgstr "Accesos rápidos para web"
+
+#. Comment
+#: ebrowsing/ebrowsing.desktop:14
+#, fuzzy
+msgid "Configure enhanced browsing"
+msgstr "Configuración de la navegación mejorada"
+
+#. Keywords
+#: ebrowsing/ebrowsing.desktop:16
+#, fuzzy
+msgid ""
+"Enhanced Browsing;Browsing;WWW;Internet;Internet Keywords;Internet Filters;"
+"Network;Search Engines;Shortcuts;"
+msgstr ""
+"Navegación Mejorada;Navegación;WWW;Internet;Palabras clave de Internet;"
+"Filtros de Internet;Red;Motores de búsqueda;Accesos directos;"
+
+#. Name
+#: ebrowsing/plugins/ikws/kuriikwsfilter.desktop:3
+#, fuzzy
+msgid "InternetKeywordsFilter"
+msgstr "Filtro de palabras clave de Internet"
+
+#. Name
+#: ebrowsing/plugins/ikws/kurisearchfilter.desktop:3
+#, fuzzy
+msgid "SearchKeywordsFilter"
+msgstr "Filtro de palabras clave de búsqueda"
+
+#. Comment
+#: ebrowsing/plugins/ikws/searchprovider.desktop:4
+#, fuzzy
+msgid "Search Engine"
+msgstr "Motor de búsqueda"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3
+#, fuzzy
+msgid "Acronym Database"
+msgstr "Base de datos Acronym"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6
+#, fuzzy
+msgid "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
+msgstr "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3
+#, fuzzy
+msgid "Alexa"
+msgstr "Alexa"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
+#, fuzzy
+msgid "http://info.alexa.com/search?q=\\{@}"
+msgstr "http://info.alexa.com/search?q=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:3
+#, fuzzy
+msgid "Alexa URL"
+msgstr "URL de Alexa"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:6
+#, fuzzy
+msgid "http://info.alexa.com/data/details?url=\\{@}"
+msgstr "http://info.alexa.com/data/details?url=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:3
+#, fuzzy
+msgid "AllTheWeb fast"
+msgstr "AllTheWeb de Fast"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:6
+#, fuzzy
+msgid ""
+"http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web"
+msgstr ""
+"http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:3
+#, fuzzy
+msgid "AltaVista"
+msgstr "AltaVista"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:6
+#, fuzzy
+msgid "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}"
+msgstr "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/amg.desktop:4
+#, fuzzy
+msgid "All Music Guide"
+msgstr "Guía All Music"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/amg.desktop:5
+#, fuzzy
+msgid "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}"
+msgstr "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:3
+#, fuzzy
+msgid "KDE App Search"
+msgstr "Búsqueda de apps. de KDE"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:6
+#, fuzzy
+msgid "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}"
+msgstr "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:3
+#, fuzzy
+msgid "AustroNaut"
+msgstr "AustroNaut"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:6
+#, fuzzy
+msgid "http://austronaut.at/page.php?begriff=\\{@}&wo=at"
+msgstr "http://austronaut.at/page.php?begriff=\\{@}&wo=at"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3
+#, fuzzy
+msgid "Debian Backports Search"
+msgstr "Búsqueda de backports de Debian"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4
+#, fuzzy
+msgid "http://www.backports.org/package.php?search=\\{@}"
+msgstr "http://www.backports.org/package.php?search=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:3
+#, fuzzy
+msgid "KDE Bug Database Fulltext Search"
+msgstr "Búsqueda textual en la base de datos de fallos de KDE"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:4
+#, fuzzy
+msgid ""
+"http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+"
+"\\{5}+\\{6}+\\{7}+\\{8}+\\{9}"
+msgstr ""
+"http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+"
+"\\{5}+\\{6}+\\{7}+\\{8}+\\{9}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:3
+#, fuzzy
+msgid "TDE Bug Database Bug Number Search"
+msgstr "Búsqueda de número de fallo en la base de datos de fallos de TDE"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:4
+#, fuzzy
+msgid "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}"
+msgstr "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/call.desktop:5
+#, fuzzy
+msgid "QRZ.com Callsign Database"
+msgstr "Base de datos callsign QRZ.com"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/call.desktop:6
+#, fuzzy
+msgid "http://www.qrz.com/database?callsign=\\{@}"
+msgstr "http://www.qrz.com/database?callsign=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/cia.desktop:4
+#, fuzzy
+msgid "CIA World Factbook"
+msgstr "Libro del estado del mundo de la CIA"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/cia.desktop:5
+#, c-format, fuzzy
+msgid ""
+"http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww."
+"cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky"
+msgstr ""
+"http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww."
+"cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:5
+#, fuzzy
+msgid "CiteSeer: Scientific Literature Digital Library"
+msgstr "CiteSeer: Biblioteca digital de literatura científica"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:6
+#, fuzzy
+msgid "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1"
+msgstr "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:3
+#, fuzzy
+msgid "CPAN - Comprehensive Perl Archive Network"
+msgstr "CPAN - Red de archivos Perl comprensibles"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:4
+#, fuzzy
+msgid ""
+"http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}"
+msgstr ""
+"http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:3
+#, fuzzy
+msgid "CTAN - Comprehensive TeX Archive Network"
+msgstr "CTAN - Red de archivos TeX comprensivos"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:4
+#, fuzzy
+msgid ""
+"http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename="
+"\\{ at }"
+msgstr ""
+"http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=\\{ "
+"at }"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3
+#, fuzzy
+msgid "CTAN Catalog"
+msgstr "Catálogo CTAN"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:4
+#, fuzzy
+msgid ""
+"http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}"
+msgstr ""
+"http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:3
+#, fuzzy
+msgid "Debian BTS Bug Search"
+msgstr "Búsqueda de fallos BTS de Debian"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:4
+#, fuzzy
+msgid "http://bugs.debian.org/\\{@}"
+msgstr "http://bugs.debian.org/\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5
+#, fuzzy
+msgid "dict.cc Translation: German to English"
+msgstr "dict.cc  Traducción: alemán a inglés"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6
+#: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:6
+#, fuzzy
+msgid "http://www.dict.cc/?s=\\{@}"
+msgstr "http://www.dict.cc/?s=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3
+#, fuzzy
+msgid "LEO - Translate Between German and French"
+msgstr "LEO - Traducción entre alemán y francés"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:6
+#: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:6
+#, fuzzy
+msgid "http://dict.leo.org/?lp=frde&search=\\{@}"
+msgstr "http://dict.leo.org/?lp=frde&search=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/deb.desktop:3
+#, fuzzy
+msgid "Debian Package Search"
+msgstr "Búsqueda de paquetes de Debian"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/deb.desktop:4
+#, fuzzy
+msgid "http://packages.debian.org/\\{@}"
+msgstr "http://packages.debian.org/\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:3
+#, fuzzy
+msgid "Open Directory"
+msgstr "Open Directory"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
+#, fuzzy
+msgid "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
+msgstr "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
+#, fuzzy
+msgid "DocBook - The Definitive Guide"
+msgstr "DocBook - La guía definitiva"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:6
+#, fuzzy
+msgid "http://www.docbook.org/tdg/en/html/\\{1}.html"
+msgstr "http://www.docbook.org/tdg/en/html/\\{1}.html"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/doi.desktop:5
+#, fuzzy
+msgid "Digital Object Identifier"
+msgstr "Digital Object Identifier"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/doi.desktop:6
+#, fuzzy
+msgid "http://dx.doi.org/\\{@}"
+msgstr "http://dx.doi.org/\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5
+#, fuzzy
+msgid "dict.cc Translation: English to German"
+msgstr "dict.cc Tranducción: inglés a alemán"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:5
+#, fuzzy
+msgid "WordReference.com Translation: English to Spanish"
+msgstr "WordReference.com Traducción: inglés a español"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:6
+#, fuzzy
+msgid "http://www.wordreference.com/es/translation.asp?tranword=\\{@}"
+msgstr "http://www.wordreference.com/es/translation.asp?tranword=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:5
+#, fuzzy
+msgid "WordReference.com Translation: English to French"
+msgstr "WordReference.com Traducción: inglés a francés"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:6
+#, fuzzy
+msgid "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}"
+msgstr "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:5
+#, fuzzy
+msgid "WordReference.com Translation: English to Italian"
+msgstr "WordReference.com Traducción: inglés a italiano"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:6
+#, fuzzy
+msgid "http://www.wordreference.com/it/translation.asp?enit=\\{@}"
+msgstr "http://www.wordreference.com/it/translation.asp?enit=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:5
+#, fuzzy
+msgid "WordReference.com Translation: Spanish to English"
+msgstr "WordReference.com Traducción: español a inglés"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:6
+#, fuzzy
+msgid "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}"
+msgstr "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/excite.desktop:3
+#, fuzzy
+msgid "Excite"
+msgstr "Excite"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/excite.desktop:6
+#, fuzzy
+msgid "http://search.excite.com/search.gw?search=\\{@}"
+msgstr "http://search.excite.com/search.gw?search=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:3
+#, fuzzy
+msgid "Feedster"
+msgstr "Feedster"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:6
+#, fuzzy
+msgid "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:3
+#, fuzzy
+msgid "Free On-Line Dictionary of Computing"
+msgstr "Free On-Line Dictionary Of Computing"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:6
+#, fuzzy
+msgid "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}"
+msgstr "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:3
+#, fuzzy
+msgid "LEO - Translate Between French and German"
+msgstr "LEO - Traducción entre francés y alemán"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:5
+#, fuzzy
+msgid "WordReference.com Translation: French to English"
+msgstr "WordReference.com Traducción: francés a inglés"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:6
+#, fuzzy
+msgid "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}"
+msgstr "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:3
+#, fuzzy
+msgid "FreeDB"
+msgstr "FreeDB"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:6
+#, fuzzy
+msgid "http://www.freedb.org/freedb_search.php?words=\\{@}"
+msgstr "http://www.freedb.org/freedb_search.php?words=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:3
+#, fuzzy
+msgid "Freshmeat"
+msgstr "Freshmeat"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:6
+#, fuzzy
+msgid "http://freshmeat.net/search/?q=\\{@}"
+msgstr "http://freshmeat.net/search/?q=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:3
+#, fuzzy
+msgid "Froogle"
+msgstr "Froogle"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:6
+#, fuzzy
+msgid "http://froogle.google.com/froogle?q=\\{@}"
+msgstr "http://froogle.google.com/froogle?q=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:3
+#, fuzzy
+msgid "FSF/UNESCO Free Software Directory"
+msgstr "Directorio de software libre de FSF/UNESCO"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:6
+#, fuzzy
+msgid "http://directory.fsf.org/search/?query=\\{@}"
+msgstr "http://directory.fsf.org/search/?query=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/google.desktop:3
+#, fuzzy
+msgid "Google"
+msgstr "Google"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/google.desktop:6
+#, fuzzy
+msgid "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:3
+#, fuzzy
+msgid "Google Advanced Search"
+msgstr "Búsqueda avanzada de Google"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:4
+#, fuzzy
+msgid ""
+"http://www.google.com/search?as_q=\\{all,@}&num=\\{num,\"10\"}&btnG=Google"
+"+Search&as_epq=\\{exact,\"\"}&as_oq=\\{any,\"\"}&as_eq=\\{without,\"\"}&lr="
+"\\{lang,\"\"}&as_ft=\\{ft,\"i\"}&as_filetype=\\{filetype,\"\"}&as_qdr="
+"\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\"}"
+"&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
+msgstr ""
+"http://www.google.com/search?as_q=\\{all,@}&num=\\{num,\"10\""
+"}&btnG=Google+Search&as_epq=\\{exact,\"\"}&as_oq=\\{any,\"\"}&as_eq=\\"
+"{without,\"\"}&lr=\\{lang,\"\"}&as_ft=\\{ft,\"i\"}&as_filetype=\\{filetype,\""
+"\"}&as_qdr=\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\" "
+"}&as_sitesearch=\\{site}&safe=\\{safe, \"active\"}&ie=UTF-8&oe=UTF-8"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3
+#, fuzzy
+msgid "Google Groups"
+msgstr "Grupos de Google"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:6
+#, fuzzy
+msgid "http://groups.google.com/groups?oi=djq&as_q=\\{@}"
+msgstr "http://groups.google.com/groups?oi=djq&as_q=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:3
+#, fuzzy
+msgid "Google Image Search"
+msgstr "Búsqueda de imágenes de Google"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:6
+#, fuzzy
+msgid "http://images.google.com/images?q=\\{@}"
+msgstr "http://images.google.com/images?q=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:3
+#, fuzzy
+msgid "Google (I'm Feeling Lucky)"
+msgstr "Google (Me siento afortunado)"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:6
+#, c-format, fuzzy
+msgid ""
+"http://www.google.com/search?q=\\{@}&btnI=I%27m+Feeling"
+"+Lucky&ie=UTF-8&oe=UTF-8"
+msgstr ""
+"http://www.google.com/search?q=\\"
+"{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:3
+#, fuzzy
+msgid "Google Movies"
+msgstr "Películas de Google"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:6
+#, fuzzy
+msgid "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:3
+#, fuzzy
+msgid "Google News"
+msgstr "Noticias de Google"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:6
+#, fuzzy
+msgid "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:3
+#, fuzzy
+msgid "Gracenote"
+msgstr "Gracenote"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:6
+#, fuzzy
+msgid "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
+msgstr "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5
+msgid "Great Dictionary of the Catalan Language (GRan Enciclopèdia  Catalana)"
+msgstr "Gran enciclopedia catalana (GRan Enciclopèdia  Catalana)"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/grec.desktop:6
+#, fuzzy
+msgid "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}"
+msgstr "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:3
+#, fuzzy
+msgid "Hotbot"
+msgstr "Hotbot"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:6
+#, fuzzy
+msgid "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2"
+msgstr "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:3
+#, fuzzy
+msgid "HyperDictionary.com"
+msgstr "HyperDictionary.com"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:6
+#, fuzzy
+msgid "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
+msgstr "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:3
+#, fuzzy
+msgid "HyperDictionary.com Thesaurus"
+msgstr "Tesaurus de HyperDictionary.com"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:6
+#, fuzzy
+msgid "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
+msgstr "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:3
+#, fuzzy
+msgid "Internet Movie Database"
+msgstr "Base de datos de internet de películas"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:6
+#, fuzzy
+msgid "http://imdb.com/Find?\\{@}"
+msgstr "http://imdb.com/Find?\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:5
+#, fuzzy
+msgid "WordReference.com Translation: Italian to English"
+msgstr "WordReference.com Traducción: italiano a inglés"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:6
+#, fuzzy
+msgid "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}"
+msgstr "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:3
+#, fuzzy
+msgid "Ask Jeeves"
+msgstr "Ask Jeeves"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:6
+#, fuzzy
+msgid ""
+"http://www.ask.com/main/askJeeves.asp?"
+"origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
+msgstr ""
+"http://www.ask.com/main/askJeeves."
+"asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:3
+#, fuzzy
+msgid "KataTudo"
+msgstr "KataTudo"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:6
+#, fuzzy
+msgid "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar"
+msgstr "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/kde.desktop:5
+#, fuzzy
+msgid "KDE API Documentation"
+msgstr "Documentación de la API de KDE"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/kde.desktop:6
+#, fuzzy
+msgid "http://api.kde.org/classmapper.php?class=\\{@}"
+msgstr "http://api.kde.org/classmapper.php?class=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:3
+#, fuzzy
+msgid "KDE WebSVN"
+msgstr "WebSVN de KDE"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:6
+#, fuzzy
+msgid "http://websvn.kde.org/\\{@}"
+msgstr "http://websvn.kde.org/\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/leo.desktop:3
+#, fuzzy
+msgid "LEO-Translate"
+msgstr "LEO-Translate"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/leo.desktop:6
+#, fuzzy
+msgid "http://dict.leo.org/?search=\\{@}"
+msgstr "http://dict.leo.org/?search=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:3
+#, fuzzy
+msgid "Lycos"
+msgstr "Lycos"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:6
+#, fuzzy
+msgid "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}"
+msgstr "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:3
+#, fuzzy
+msgid "Mamma - Mother of all Search Engines"
+msgstr "Mamma - La madre de todos los motores de búsqueda"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:6
+#, fuzzy
+msgid "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}"
+msgstr "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:3
+#, fuzzy
+msgid "MetaCrawler"
+msgstr "MetaCrawler"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:6
+#, fuzzy
+msgid ""
+"http://search.metacrawler.com/crawler?general=\\{@}"
+"&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-"
+"search&refer=mc-search"
+msgstr ""
+"http://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=m"
+"etaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&t"
+"heme=classic&refer=mc-search&refer=mc-search"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3
+msgid "Microsoft Developer Network Search"
+msgstr "Red de búsqueda del desarrollador de Microsoft"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:6
+msgid ""
+"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff.asp?"
+"handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
+"asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
+msgstr ""
+"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff."
+"asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
+"asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:3
+msgid "Netcraft"
+msgstr "Netcraft"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:6
+msgid "http://uptime.netcraft.com/up/graph?site=\\{@}"
+msgstr "http://uptime.netcraft.com/up/graph?site=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:2
+msgid "Telephonebook Search Provider"
+msgstr "Proveedor de búsqueda de teléfonos"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:6
+msgid ""
+"http://www.detelefoongids.nl/tginl.dll?"
+"action=white&type=search&resultsperpage=25&pagestart=1&source=searchcategory&name2="
+"\\{1}&name=&initials=&city=\\{2}"
+"&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription=&country=&catcode=&dcity="
+"\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
+msgstr ""
+"http://www.detelefoongids.nl/tginl.dll?action=white&type=search&resultsperpag"
+"e=25&pagestart=1&source=searchcategory&name2=\\{1}&name=&initials=&city=\\{2}"
+"&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription="
+"&country=&catcode=&dcity=\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:2
+msgid "Teletekst Search Provider"
+msgstr "Proveedor de búsqueda Teletekst"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:6
+msgid "http://teletekst.nos.nl/gif/\\{@}-01.html"
+msgstr "http://teletekst.nos.nl/gif/\\{@}-01.html"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:3
+msgid "OpenPGP Key Search"
+msgstr "Búsqueda de clave OpenPGP"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:4
+msgid "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex"
+msgstr "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/php.desktop:3
+msgid "PHP Search"
+msgstr "Búsqueda PHP"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/php.desktop:4
+msgid "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}"
+msgstr "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/python.desktop:5
+msgid "Python Reference Manual"
+msgstr "Manual de referencia de Python"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/python.desktop:6
+#, c-format
+msgid ""
+"http://www.google.com/search?sourceid=python-search&q=\\{@}"
+"&submit=Search&q=site%3Apython.org"
+msgstr ""
+"http://www.google.com/search?sourceid=python-search&q=\\"
+"{@}&submit=Search&q=site%3Apython.org"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/qt.desktop:5
+msgid "Latest Qt Online Documentation"
+msgstr "Ultima documentación Qt en línea"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/qt.desktop:6
+msgid "http://doc.trolltech.com/latest/\\{@}.html"
+msgstr "http://doc.trolltech.com/latest/\\{@}.html"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:5
+msgid "Qt3 Online Documentation"
+msgstr "Documentación Qt3 en línea"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:6
+msgid "http://doc.trolltech.com/3.3/\\{@}.html"
+msgstr "http://doc.trolltech.com/3.3/\\{@}.html"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/rae.desktop:5
+msgid "Dictionary of the Spanish Academy (RAE)"
+msgstr "Diccionario de la Real Academia de la Lengua Española (RAE)"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/rae.desktop:6
+msgid ""
+"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}"
+"&FORMATO=ampliado"
+msgstr ""
+"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\"
+"{@}&FORMATO=ampliado"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3
+msgid "IETF Requests for Comments"
+msgstr "Solicitudes de comentarios del IETF"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:4
+msgid "http://www.ietf.org/rfc/rfc\\{@}.txt"
+msgstr "http://www.ietf.org/rfc/rfc\\{@}.txt"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:3
+msgid "RPM-Find"
+msgstr "RPM-Find"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:6
+msgid "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}"
+msgstr "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:3
+msgid "Ruby Application Archive"
+msgstr "Archivo de aplicación Ruby"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:6
+msgid "http://raa.ruby-lang.org/search.rhtml?search=\\{@}"
+msgstr "http://raa.ruby-lang.org/search.rhtml?search=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/seek.desktop:3
+msgid "GO.com"
+msgstr "GO.com"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/seek.desktop:6
+msgid ""
+"http://www.go.com/Titles?col=WW&qt=\\{@}"
+"&svx=home_searchbox&sv=IS&lk=noframeso"
+msgstr ""
+"http://www.go.com/Titles?col=WW&qt=\\"
+"{@}&svx=home_searchbox&sv=IS&lk=noframeso"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3
+msgid "SourceForge"
+msgstr "SourceForge"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:4
+msgid ""
+"http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact="
+"\\{exact,\"0\"}&words=\\{@}"
+msgstr ""
+"http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact=\\"
+"{exact,\"0\"}&words=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
+msgid "Technorati"
+msgstr "Technorati"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
+msgid "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}"
+msgstr "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:3
+msgid "Technorati Tags"
+msgstr "Etiquetas de Technorati"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:6
+msgid "http://technorati.com/tag/\\{@}?sourceid=kde-search"
+msgstr "http://technorati.com/tag/\\{@}?sourceid=kde-search"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:3
+msgid "Merriam-Webster Thesaurus"
+msgstr "Sinónimos Merriam-Webster"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:6
+msgid "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}"
+msgstr "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:4
+msgid "TV Tome"
+msgstr "TV Tome"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:6
+msgid "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0"
+msgstr "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:5
+msgid "U.S. Patent Database"
+msgstr "Base de datos de patentes de EEUU"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:6
+msgid ""
+"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}"
+"&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
+msgstr ""
+"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\"
+"{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3
+msgid "Vivisimo"
+msgstr "Vivisimo"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:6
+#, c-format
+msgid ""
+"http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD"
+"%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16"
+msgstr ""
+"http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD"
+"%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/voila.desktop:3
+msgid "Voila"
+msgstr "Voila"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/voila.desktop:6
+msgid ""
+"http://search.ke.voila.fr/S/voila?"
+"lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
+msgstr ""
+"http://search.ke.voila.fr/S/"
+"voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/webster.desktop:3
+msgid "Merriam-Webster Dictionary"
+msgstr "Diccionario Merriam-Webster"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/webster.desktop:6
+msgid "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}"
+msgstr "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:3
+msgid "Whatis Query"
+msgstr "Consulta Whatis"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:6
+msgid ""
+"http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}"
+msgstr ""
+"http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:3
+msgid "Wikipedia - The Free Encyclopedia"
+msgstr "Wikipedia - La enciclopedia libre"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:6
+msgid "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
+msgstr "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3
+msgid "Wiktionary - The Free Dictionary"
+msgstr "Wikitionary - El diccionario libre"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6
+msgid "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
+msgstr "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
+
+#. Name
+#: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:5
+msgid "WordReference.com English Dictionary"
+msgstr "WordReference.com diccionario de inglés"
+
+#. Query
+#: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:6
+msgid "http://www.wordreference.com/english/definition.asp?en=\\{@}"
+msgstr "http://www.wordreference.com/english/definition.asp?en=\\{@}"
+
+#. Name
+#: ebrowsing/plugins/localdomain/localdomainurifilter.desktop:3
+msgid "LocalDomainFilter"
+msgstr "FiltrodeDominioLocal"
+
+#. Name
+#: ebrowsing/plugins/shorturi/tdeshorturifilter.desktop:3
+msgid "ShortURIFilter"
+msgstr "Filtro de URIs cortas"
+
+#. Name
+#: energy/energy.desktop:11
+msgid "Power Control"
+msgstr "Control de energía"
+
+#. Comment
+#: energy/energy.desktop:13
+msgid "Settings for display power management"
+msgstr "Preferencias para la pantalla de control de energía"
+
+#. Keywords
+#: energy/energy.desktop:15
+msgid "energy;saver;apm;acpi;dpms;timeout;blanking;stand by;suspend;power;"
+msgstr ""
+"energía;ahorro;APM;ACPI;tiempo de expiración;apagar monitor;modo de "
+"espera;suspender;"
+
+#. Name
+#: filetypes/filetypes.desktop:12
+msgid "File Associations"
+msgstr "Asociaciones de archivo"
+
+#. Comment
+#: filetypes/filetypes.desktop:14
+msgid "Configure file associations"
+msgstr "Configuración de asociaciones de archivos"
+
+#. Keywords
+#: filetypes/filetypes.desktop:16
+msgid "Filetypes;File Associations;Mime Types;File Patterns;Files;Pattern;"
+msgstr ""
+"Tipos de archivo;Asociaciones de archivo;Tipos MIME;Patrones de "
+"archivo;Archivos;Patrón;"
+
+#. Name
+#: fonts/fonts.desktop:12 konqhtml/tdehtml_fonts.desktop:11
+#: tdefontinst/tdeio/fonts.desktop:5
+msgid "Fonts"
+msgstr "Tipografía"
+
+#. Comment
+#: fonts/fonts.desktop:14
+msgid "Font settings"
+msgstr "Opciones de la tipografía"
+
+#. Keywords
+#: fonts/fonts.desktop:16
+msgid ""
+"fonts;font size;styles;charsets;character sets;panel;kicker;control panel;"
+"desktops;FileManager;Toolbars;Menu;Window Title;Title;"
+msgstr ""
+"tipografía;tamaño de la tipografía;estilos;mapas de caracteres;panel;kicker;"
+"panel de control;escritorios;Gestor de archivos;Barras de herramientas;Menú;"
+"Título de la ventana;Título;"
+
+#. Name
+#: hwmanager/hwdevicetray-autostart.desktop:2
+msgid "tdehwdevicetray"
+msgstr "tdehwdevicetray"
+
+#. GenericName
+#. Name
+#: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2
+#: hwmanager/hwdevicetray.desktop:4
+msgid "Device Monitor"
+msgstr "Monitor de dispositivos"
+
+#. Comment
+#: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
+msgid "Monitor hardware devices from the system tray"
+msgstr "Observá dispositivos desde área de notificación"
+
+#. Name
+#: hwmanager/hwmanager.desktop:11
+msgid "Device Manager"
+msgstr "Administrador de dispositivos"
+
+#. Comment
+#: hwmanager/hwmanager.desktop:13
+msgid "Configure hardware devices"
+msgstr "Configuración de dispositivos"
+
+#. Keywords
+#: hwmanager/hwmanager.desktop:15
+msgid "hardware;devices;manager;"
+msgstr "hardware;dispositivos;"
+
+#. Comment
+#: iccconfig/iccconfig.desktop:14
+msgid "Configure display ICC color profile"
+msgstr "Configurar el perfil de color ICC de la pantalla"
+
+#. Keywords
+#: iccconfig/iccconfig.desktop:16
+msgid "ICC;display;color;profile;"
+msgstr "ICC;pantalla;color;perfil;"
+
+#. Name
+#: iccconfig/iccconfig.desktop:18
+msgid "Color Profile"
+msgstr "Perfil de color"
+
+#. Name
+#: icons/icons.desktop:12
+msgid "Icons"
+msgstr "Iconos"
+
+#. Comment
+#: icons/icons.desktop:14
+msgid "Customize TDE Icons"
+msgstr "Personaliza los iconos de TDE"
+
+#. Keywords
+#: icons/icons.desktop:16
+msgid "icons;effects;size;hicolor;locolor;"
+msgstr "iconos;efectos;tamaño;alta profundidad;baja profundidad;"
+
+#. Name
+#: info/cdinfo.desktop:12
+msgid "CD-ROM Information"
+msgstr "Información de CD-ROM"
+
+#. Comment
+#: info/cdinfo.desktop:14
+msgid "CD/DVD Drive Capabilites"
+msgstr "Posibilidades del dispositivo CD/ DVD"
+
+#. Keywords
+#: info/cdinfo.desktop:16
+msgid "CD-ROM Information;CD-ROM;CD;CD Drive;Writer Capabilities;"
+msgstr "Información CD-ROM;CD-ROM;CD;Dispositivo CD;Capacidades de escritura;"
+
+#. Name
+#: info/devices.desktop:13
+msgid "Devices"
+msgstr "Dispositivo(s)"
+
+#. Comment
+#: info/devices.desktop:15
+msgid "Attached devices information"
+msgstr "Información sobre los dispositivos conectados"
+
+#. Keywords
+#: info/devices.desktop:17
+msgid "dev;Devices;System Information;Information;"
+msgstr "Dispositivos;Información del sistema;"
+
+#. Name
+#: info/dma.desktop:13
+msgid "DMA-Channels"
+msgstr "Canales DMA"
+
+#. Comment
+#: info/dma.desktop:15
+msgid "DMA information"
+msgstr "Información sobre DMA"
+
+#. Keywords
+#: info/dma.desktop:17
+msgid "dma;DMA-Channels;System Information;"
+msgstr "DMA;Canales DMA;Información del sistema;"
+
+#. Name
+#: info/interrupts.desktop:13
+msgid "Interrupts"
+msgstr "Interrupcion(es)"
+
+#. Comment
+#: info/interrupts.desktop:15
+msgid "Interrupt information"
+msgstr "Información sobre las interrupciones"
+
+#. Keywords
+#: info/interrupts.desktop:17
+msgid "Interrupts;IRQ;System Information;"
+msgstr "Interrupciones;IRQ;Información del sistema;"
+
+#. Name
+#: info/ioports.desktop:13
+msgid "IO-Ports"
+msgstr "Puertos de E/S"
+
+#. Comment
+#: info/ioports.desktop:15
+msgid "IO-port information"
+msgstr "Información sobre los puertos de E/S"
+
+#. Keywords
+#: info/ioports.desktop:17
+msgid "IO;I/O;IO-Ports;I/O-Ports;Ports;IO-Range;I/O-Range;System Information;"
+msgstr ""
+"ES;E/S;Puertos de ES;Puertos de E/S;Puertos;Intervalo de ES;Intervalo de E/S;"
+"Información del sistema;"
+
+#. Name
+#: info/memory.desktop:12
+msgid "Memory"
+msgstr "Memoria"
+
+#. Comment
+#: info/memory.desktop:14
+msgid "Memory information"
+msgstr "Información sobre la memoria"
+
+#. Keywords
+#: info/memory.desktop:16
+msgid ""
+"Memory;RAM;Virtual memory;Physical memory;Shared memory;Swap;System "
+"Information;"
+msgstr ""
+"Memoria;RAM;Memoria virtual;Memoria física;Memoria "
+"compartida;Swap;Intercambio;Información del sistema;"
+
+#. Name
+#: info/opengl.desktop:13
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#. Comment
+#: info/opengl.desktop:15
+msgid "OpenGL information"
+msgstr "Información OpenGL"
+
+#. Keywords
+#: info/opengl.desktop:17
+msgid ""
+"OpenGL;DRI;GLX;3D;VideoCard;Hardware Acceleration;Graphics;X;X11;Xserver;X-"
+"Server;XFree86;Display;"
+msgstr ""
+"OpenGL;DRI;GLX;3D;Tarjeta; Grafica;Hardware "
+"Aceleradora;Gráficos;X;X11;Xserver;X-Server;XFree86;Monitor;"
+
+#. Name
+#: info/partitions.desktop:13
+msgid "Partitions"
+msgstr "Particion(es)"
+
+#. Comment
+#: info/partitions.desktop:15
+msgid "Partition information"
+msgstr "Información sobre las particiones"
+
+#. Keywords
+#: info/partitions.desktop:17
+msgid "Partitions;Harddrive;HD;System Information;"
+msgstr "Particiones;Disco duro;Unidad;SSD;Información del sistema;"
+
+#. Name
+#: info/pci.desktop:12
+msgid "PCI"
+msgstr "PCI"
+
+#. Comment
+#: info/pci.desktop:14
+msgid "PCI information"
+msgstr "Información sobre los dispositivos PCI"
+
+#. Keywords
+#: info/pci.desktop:16
+msgid "PCI;PCI-Devices;PCI-Bus;System Information;"
+msgstr "PCI;Dispositivos PCI;Bus PCI;Información del sistema;"
+
+#. Name
+#: info/processor.desktop:12
+msgid "Processor"
+msgstr "Procesador"
+
+#. Comment
+#: info/processor.desktop:14
+msgid "Processor information"
+msgstr "Información sobre el procesador"
+
+#. Keywords
+#: info/processor.desktop:16
+msgid "Processor;CPU;FPU;MHz;System Information;"
+msgstr "Procesador;CPU;FPU;MHz;Información del sistema;"
+
+#. Name
+#: info/scsi.desktop:12
+msgid "SCSI"
+msgstr "SCSI"
+
+#. Comment
+#: info/scsi.desktop:14
+msgid "SCSI information"
+msgstr "Información sobre los dispositivos SCSI"
+
+#. Keywords
+#: info/scsi.desktop:16
+msgid "SCSI;SCSI-Bus;System Information;"
+msgstr "SCSI;Bus SCSI;Información del sistema;"
+
+#. Name
+#: info/sound.desktop:12
+msgid "Sound"
+msgstr "Sonido"
+
+#. Comment
+#: info/sound.desktop:14
+msgid "Sound information"
+msgstr "Información sobre el sonido"
+
+#. Keywords
+#: info/sound.desktop:16
+msgid "Sound;Audio;Soundcard;MIDI;OSS;System Information;"
+msgstr "Sonido;Audio;Tarjeta de sonido;MIDI;OSS;Información del sistema;"
+
+#. Name
+#: info/xserver.desktop:12
+msgid "X-Server"
+msgstr "Servidor X"
+
+#. Comment
+#: info/xserver.desktop:14
+msgid "X-Server information"
+msgstr "Información sobre el servidor X"
+
+#. Keywords
+#: info/xserver.desktop:16
+msgid "X;X-Server;XServer;XFree86;Display;VideoCard;System Information;"
+msgstr ""
+"X;X-Server;XServer;XFree86;Monitor;Tarjeta; Gráfica;Sistema;Información;"
+
+#. Name
+#: input/mouse.desktop:13
+msgid "Mouse"
+msgstr "Mouse"
+
+#. Comment
+#: input/mouse.desktop:15
+msgid "Mouse settings"
+msgstr "Preferencias sobre el mouse"
+
+#. Keywords
+#: input/mouse.desktop:17
+msgid ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Aceleración del mouse;Umbral del mouse;Botones del mouse;Selección;"
+"Forma del cursor;Dispositivos de entrada;Asignaciones de "
+"botones;Pulsación;iconos;notificación;Punteros;Arrastrar;Doble "
+"pulsación;asignaciones;diestro;zurdo;"
+
+#. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Panel táctil (Touchpad)"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "Configuración del panel táctil (Touchpad)"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Panel táctil;Touchpad;Tocar para hacer clic;Mouse;Botones del mouse;"
+"Dispositivos de entrada;Asignación de "
+"botones;Tocar;Clic;asignación;diestro;zurdo;"
+
+#. Name
+#: joystick/joystick.desktop:12
+msgid "Joystick"
+msgstr "Joystick"
+
+#. Comment
+#: joystick/joystick.desktop:14
+msgid "Joystick - a kcontrol module to test Joysticks"
+msgstr "Joystick - un módulo de kcontrol para probar Joysticks"
+
+#. Keywords
+#: joystick/joystick.desktop:16
+msgid "joystick;gamepad;"
+msgstr "joystick;gamepad;"
+
+#. Name
+#: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8
+#: kcontrol/tde-kcontrol.desktop:8
+msgid "Trinity Control Center"
+msgstr "Configuración de Trinity"
+
+#. Name
+#: kded/kcmkded.desktop:11
+msgid "Service Manager"
+msgstr "Gestor de servicios"
+
+#. Comment
+#: kded/kcmkded.desktop:13
+msgid "System Services Configuration"
+msgstr "Configuración de los servicios del sistema"
+
+#. Keywords
+#: kded/kcmkded.desktop:15
+msgid "KDED;Daemon;Services;"
+msgstr "KDED;Demonio;servicios;"
+
+#. Name
+#: keys/keys.desktop:12
+msgid "Keyboard Shortcuts"
+msgstr "Accesos rápidos de teclado"
+
+#. Comment
+#: keys/keys.desktop:14
+msgid "Configuration of keybindings"
+msgstr "Configuración de las asociaciones de las teclas"
+
+#. Keywords
+#: keys/keys.desktop:16
+msgid ""
+"Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application "
+"shortcuts;"
+msgstr ""
+"Teclas;Asociaciones de teclas globales;Esquema de teclas;Asociaciones de "
+"teclas;accesos directos;accesos directos de programas;"
+
+#. Name
+#: kicker/kicker_config.desktop:11
+msgid "Layout"
+msgstr "Disposición"
+
+#. Comment
+#: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13
+msgid "Configure the arrangement of the panel"
+msgstr "Configuración de la apariencia del panel"
+
+#. Keywords
+#: kicker/kicker_config.desktop:15 kicker/kicker_config_appearance.desktop:15
+#: kicker/kicker_config_arrangement.desktop:15
+#: kicker/kicker_config_hiding.desktop:15 kicker/kicker_config_menus.desktop:15
+#: kicker/panel.desktop:14
+msgid ""
+"kicker;panel;kpanel;taskbar;startbar;launchbar;location;size;auto hide;hide;"
+"buttons;animation;background;themes;menu cache;cache;hidden;TDE Menu;"
+"bookmarks;recent documents;quickbrowser;browser menu;menu;icons;tiles;"
+"applets;startup;highlight;handles;zooming icons;"
+msgstr ""
+"kicker;panel;kpanel;barra de tareas;barra de inicio;barra de "
+"lanzamiento;dirección;tamaño;auto "
+"ocultar;ocultar;botones;animación;fondo;temas;caché de menú;caché;oculto;"
+"Menú TDE;marcadores;documentos recientes;navegador rápido;menú "
+"navegador;menú;iconos;mosaicos;applets;arranque;resaltado;asas;iconos "
+"ampliados;"
+
+#. Name
+#: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11
+msgid "Appearance"
+msgstr "Aspecto"
+
+#. Comment
+#: kicker/kicker_config_appearance.desktop:13
+msgid "Configure the appearance of the panel"
+msgstr "Configuración de la apariencia del panel"
+
+#. Name
+#: kicker/kicker_config_arrangement.desktop:11
+msgid "Arrangement"
+msgstr "Acuerdo"
+
+#. Name
+#: kicker/kicker_config_hiding.desktop:11
+msgid "Hiding"
+msgstr "Ocultar"
+
+#. Comment
+#: kicker/kicker_config_hiding.desktop:13
+msgid "Configure the hiding of the panel"
+msgstr "Aquí podés configurar el que el panel se oculte"
+
+#. Name
+#: kicker/kicker_config_menus.desktop:11
+msgid "Menus"
+msgstr "Menús"
+
+#. Comment
+#: kicker/kicker_config_menus.desktop:13
+msgid "Configure the menus of the panel"
+msgstr "Configuración de la apariencia del panel"
+
+#. Name
+#: kicker/panel.desktop:10
+msgid "Panels"
+msgstr "Paneles"
+
+#. Comment
+#: kicker/panel.desktop:12
+msgid "Configure the arrangement of the panels"
+msgstr "Configuración de la apariencia del panel"
+
+#. Name
+#: knotify/kcmnotify.desktop:11
+msgid "System Notifications"
+msgstr "Notificaciones del sistema"
+
+#. Comment
+#: knotify/kcmnotify.desktop:13
+msgid "System Notification Configuration"
+msgstr "Configuración de las notificaciones del sistema"
+
+#. Keywords
+#: knotify/kcmnotify.desktop:15
+msgid "System sounds;Audio;Sound;Notify;Alerts;Notification;"
+msgstr "Sonidos del sistema;Audio;Sonido;Notificar;Alertas;Notificación;"
+
+#. Name
+#: konq/desktop.desktop:11
+msgid "Multiple Desktops"
+msgstr "Escritorios múltiples"
+
+#. Comment
+#: konq/desktop.desktop:13
+msgid "You can configure how many virtual desktops there are"
+msgstr "Podés configurar cuántos escritorios virtuales hay"
+
+#. Keywords
+#: konq/desktop.desktop:15
+msgid "desktop;desktops;number;virtual desktop;"
+msgstr "escritorio;escritorios;número;escritorio virtual;"
+
+#. Name
+#: konq/desktopbehavior.desktop:12 konq/filebehavior.desktop:11
+msgid "Behavior"
+msgstr "Comportamiento"
+
+#. Comment
+#: konq/desktopbehavior.desktop:14
+msgid "You can configure how the desktop behaves here"
+msgstr "Configuración del modo de comportamiento del escritorio"
+
+#. Keywords
+#: konq/desktopbehavior.desktop:16
+msgid ""
+"konqueror;filemanager;kfm;tips;file tips;separate window;spawn windows;"
+"behavior;behaviour;memory usage;Home URL;"
+msgstr ""
+"konqueror;gestor de archivos;kfm;sugerencias;ventana separada; extender "
+"ventanas;comportamiento;uso de memoria; URl de inicio;"
+
+#. Name
+#: konq/desktoppath.desktop:11
+msgid "Paths"
+msgstr "Rutas"
+
+#. Comment
+#: konq/desktoppath.desktop:13
+msgid "Change the location important files are stored"
+msgstr "Cambiar la ubicación de archivos importantes"
+
+#. Keywords
+#: konq/desktoppath.desktop:15
+msgid "konqueror;filemanager;paths;desktop;directories;autostart;"
+msgstr ""
+"konqueror;gestor de "
+"archivos;rutas;escritorio;papelera;directorios;autoinicio;"
+
+#. Comment
+#: konq/fileappearance.desktop:13
+msgid "Configure how Konqueror looks as a file manager"
+msgstr "Aquí podés configurar el aspecto de Konqueror como gestor de archivos"
+
+#. Keywords
+#: konq/fileappearance.desktop:15 konq/filebrowser.desktop:16
+msgid ""
+"konqueror;filemanager;word wrap;wrap;underline;display;filesize;bytes;font;"
+"color;colour;"
+msgstr ""
+"konqueror;gestor de archivos; ajuste de línea;subrayar;mostrar;tamaño de "
+"archivo;bytes;tipo de letra;color;"
+
+#. Comment
+#: konq/filebehavior.desktop:13
+msgid "Configure how Konqueror behaves as a file manager"
+msgstr ""
+"Aquí podés configurar el comportamiento de Konqueror como gestor de archivos"
+
+#. Keywords
+#: konq/filebehavior.desktop:15
+msgid ""
+"konqueror;filemanager;kfm;tips;file tips;separate window;spawn windows;"
+"behavior;behaviour;memory usage;Home URL;network operations;progress dialog;"
+"trash can;delete;confirmation;"
+msgstr ""
+"konqueror;gestor de archivos;kfm;sugerencias;ventana separada; extender "
+"ventanas;comportamiento;uso de memoria; URL de inicio;operaciones de red; "
+"diálogo de progreso;papelera de reciclaje;borrar;confirmación;"
+
+#. Comment
+#: konq/filebrowser.desktop:14
+msgid "You can configure Konqueror's file manager mode here"
+msgstr "Aquí podés configurar el modo de gestor de archivos de Konqueror"
+
+#. Name
+#: konq/filepreviews.desktop:11
+msgid "Previews & Metadata"
+msgstr "Previsualizaciones & Meta-datos"
+
+#. Comment
+#: konq/filepreviews.desktop:13
+msgid "Configure how Konqueror Previews & Meta-data work"
+msgstr ""
+"Podés configurar cómo trabaja la previsualización y meta-datos de Konqueror"
+
+#. Keywords
+#: konq/filepreviews.desktop:15
+msgid "konqueror;filemanager;previews;file previews;maximum size;"
+msgstr ""
+"konqueror;gestor de archivos;previsualizaciones;previsualizaciones de "
+"archivos; tamaño máximo;"
+
+#. Name
+#: konqhtml/tdehtml_behavior.desktop:11
+msgid "Web Behavior"
+msgstr "Comportamiento"
+
+#. Comment
+#: konqhtml/tdehtml_behavior.desktop:13
+msgid "Configure the browser behavior"
+msgstr "Configuración del comportamiento del navegador"
+
+#. Keywords
+#: konqhtml/tdehtml_behavior.desktop:15
+msgid ""
+"konqueror;kfm;browser;html;web;www;fonts;colours;colors;java;javascript;"
+"cursor;links;images;charsets;character sets;encoding;"
+msgstr ""
+"konqueror;kfm;navegador;html;web;www;tipo de "
+"letra;colores;java;javascript;cursor;enlaces;imágenes;mapas de "
+"caracteres;codificación;"
+
+#. Name
+#: konqhtml/tdehtml_filter.desktop:10
+msgid "AdBlocK Filters"
+msgstr "Filtros de anuncios (AdBlock)"
+
+#. Comment
+#: konqhtml/tdehtml_filter.desktop:12
+msgid "Configure Konqueror AdBlocK filters"
+msgstr "Configuración de los filtros de anuncios de Konqueror"
+
+#. Comment
+#: konqhtml/tdehtml_fonts.desktop:13
+msgid "Configure the fonts used on web pages"
+msgstr "Configuración de los tipos de letra usados en las páginas web"
+
+#. Keywords
+#: konqhtml/tdehtml_fonts.desktop:15
+msgid ""
+"konqueror;kfm;browser;html;web;www;fonts;charsets;character sets;encoding;"
+msgstr ""
+"konqueror;kfm;navegador;html;web;www;tipos de letra;mapas de "
+"caracteres;codificación;"
+
+#. Name
+#: konqhtml/tdehtml_java_js.desktop:11
+msgid "Java & JavaScript"
+msgstr "Java y JavaScript"
+
+#. Comment
+#: konqhtml/tdehtml_java_js.desktop:13
+msgid "Configure the behavior of Java and JavaScript"
+msgstr "Configuración del comportamiento de Java y JavaScript"
+
+#. Keywords
+#: konqhtml/tdehtml_java_js.desktop:15
+msgid "konqueror;kfm;browser;html;web;www;java;javascript;"
+msgstr "konqueror;kfm;navegador;html;web;wwwjava;javascript;"
+
+#. Name
+#: konqhtml/tdehtml_userinterface.desktop:11
+msgid "User Interface"
+msgstr "Interfaz del usuario"
+
+#. Comment
+#: konqhtml/tdehtml_userinterface.desktop:13
+msgid "Configure user interface options"
+msgstr "Configuración de los parametros de la interfaz del usuario"
+
+#. Keywords
+#: konqhtml/tdehtml_userinterface.desktop:15
+msgid "konqueror;kfm;user;interface;tabbed;browsing;"
+msgstr "konqueror;kfm;usuario;interfaz;pestañas;navegacion;"
+
+#. Name
+#: konsole/kcmkonsole.desktop:10
+msgid "Konsole"
+msgstr "Konsole"
+
+#. Comment
+#: konsole/kcmkonsole.desktop:12
+msgid "Konsole configuration module"
+msgstr "Módulo de configuración de Konsole"
+
+#. Keywords
+#: konsole/kcmkonsole.desktop:14
+msgid ""
+"konsole;schema;konsole background;colors;background;terminal application;"
+"terminal;"
+msgstr ""
+"konsole;esquema;fondo de konsole;colores;fondo;programa de terminal;terminal;"
+
+#. Name
+#: kthememanager/installktheme.desktop:2
+msgid "Install TDE Theme"
+msgstr "Instalar tema de TDE"
+
+#. Comment
+#: kthememanager/kthememanager.desktop:2
+msgid "Manage global TDE visual themes"
+msgstr "Gestión global de los temas visuales de TDE"
+
+#. Keywords
+#: kthememanager/kthememanager.desktop:5
+msgid "themes;look and feel;"
+msgstr "temas;aspecto y comportamiento;"
+
+#. Name
+#: kthememanager/kthememanager.desktop:6
+msgid "Theme Manager"
+msgstr "Gestor de temas"
+
+#. Comment
+#: kthememanager/x-ktheme.desktop:3
+msgid "TDE Theme"
+msgstr "Tema de TDE"
+
+#. Name
+#: launch/kcmlaunch.desktop:12
+msgid "Launch Feedback"
+msgstr "Notificación de lanzamiento"
+
+#. Comment
+#: launch/kcmlaunch.desktop:14
+msgid "Choose application-launch feedback style"
+msgstr "Elegí el estilo de notificación de lanzamiento de los programas"
+
+#. Keywords
+#: launch/kcmlaunch.desktop:16
+msgid ""
+"application;start;launch;busy;cursor;feedback;mouse;pointer;rotating;"
+"spinning;disk;startup;program;report;"
+msgstr ""
+"programa;iniciar;lanzar;ocupado;cursor;notificación;ratón;puntero;rotación;gi"
+"ro;disco;arrancar;programa;informar;"
+
+#. Name
+#: locale/default/entry.desktop:2
+msgid "English (American)"
+msgstr "Inglés de EEUU"
+
+#. Name
+#: locale/language.desktop:12
+msgid "Country/Region & Language"
+msgstr "País/Región e idioma"
+
+#. Comment
+#: locale/language.desktop:14
+msgid "Language, numeric, and time settings for your particular region"
+msgstr ""
+"Preferencias del idioma, formato numérico y fecha/hora para tu región "
+"particular."
+
+#. Keywords
+#: locale/language.desktop:16
+msgid ""
+"language;translation;number format;currency;time;date;formats;locale;Country;"
+"charsets;character sets;Decimal symbol;Thousands separator;symbol;separator;"
+"sign;positive;negative;fractional digits;week;week start;"
+msgstr ""
+"idioma;traducción;formato numérico;moneda;hora;fecha;formatos;ambiente;País;"
+"mapas de caracteres;Símbolo decimal;Separador de "
+"miles;símbolo;separador;signo;positivo;negativo;dígitos fraccionarios;semana;"
+"inicio de la semana;"
+
+#. Name
+#: nics/nic.desktop:12
+msgid "Network Interfaces"
+msgstr "Interfaces de red"
+
+#. Comment
+#: nics/nic.desktop:14
+msgid "Network interface information"
+msgstr "Información sobre la interfaz de red"
+
+#. Name
+#: performance/kcmkonqyperformance.desktop:11
+#: performance/kcmperformance.desktop:11
+msgid "Performance"
+msgstr "Rendimiento"
+
+#. Comment
+#: performance/kcmkonqyperformance.desktop:13
+msgid "Configure settings that can improve Konqueror performance"
+msgstr "Configuraciones que pueden mejorar el rendimiento de Konqueror"
+
+#. Keywords
+#: performance/kcmkonqyperformance.desktop:15
+msgid "konqueror;reuse;preloading;"
+msgstr "konqueror;reutilización;precarga;"
+
+#. Comment
+#: performance/kcmperformance.desktop:13
+msgid "Configure settings that can improve TDE performance"
+msgstr "Configura opciones que pueden mejorar el rendimiento de TDE"
+
+#. Keywords
+#: performance/kcmperformance.desktop:15
+msgid "performance;speed;memory;improve;"
+msgstr "rendimiento;velocidad;memoria;mejora;"
+
+#. Name
+#: privacy/privacy.desktop:11
+msgid "Privacy"
+msgstr "Privacidad"
+
+#. Comment
+#: privacy/privacy.desktop:13
+msgid "Clean unwanted traces the user leaves on the system"
+msgstr "Limpiar pistas que el usuario deja en el sistema sin querer"
+
+#. Keywords
+#: privacy/privacy.desktop:15
+msgid "Privacy;privacy;"
+msgstr "Privacidad;privacidad;"
+
+#. Name
+#: randr/randr.desktop:9
+msgid "Size & Orientation"
+msgstr "Tamaño y orientación"
+
+#. Comment
+#: randr/randr.desktop:11
+msgid "Resize and Rotate your display"
+msgstr "Ajustar el tamaño y rotar la pantalla"
+
+#. Keywords
+#: randr/randr.desktop:13
+msgid "resize;rotate;display;color;depth;size;horizontal;vertical;"
+msgstr "redimensionar;rotar;mostrar;color;colores;tamaño;horizontal;vertical;"
+
+#. Name
+#: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
+msgid "TDERandRTray"
+msgstr "TDERandRTray"
+
+#. GenericName
+#: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
+msgid "Screen Resize & Rotate"
+msgstr "Redimensionar y rotar pantalla"
+
+#. Comment
+#: randr/tderandrtray-autostart.desktop:6 randr/tderandrtray.desktop:6
+msgid "Resize and rotate X screens."
+msgstr "Ajustar el tamaño y rotar las pantallas X."
+
+#. Name
+#: samba/smbstatus.desktop:12
+msgid "Samba Status"
+msgstr "Estado de Samba"
+
+#. Comment
+#: samba/smbstatus.desktop:14
+msgid "Samba status monitor"
+msgstr "Monitor de estado de Samba"
+
+#. Keywords
+#: samba/smbstatus.desktop:16
+msgid "SMB;SAMBA;Windows network;LAN;System Information;"
+msgstr "SMB;SAMBA;Red Windows;LAN;Información del sistema;"
+
+#. Name
+#: screensaver/screensaver.desktop:12
+msgid "Screen Saver"
+msgstr "Protector de patallas"
+
+#. Comment
+#: screensaver/screensaver.desktop:14
+msgid "Screen Saver Settings"
+msgstr "Preferencias del protector de pantallas"
+
+#. Keywords
+#: screensaver/screensaver.desktop:16
+msgid "screensavers;Priority;"
+msgstr "protector de pantallas;Prioridad;"
+
+#. Name
+#: smartcard/smartcard.desktop:11
+msgid "Smartcards"
+msgstr "Tarjetas inteligentes"
+
+#. Comment
+#: smartcard/smartcard.desktop:13
+msgid "Configure smartcard support"
+msgstr "Configuración del soporte para tarjetas inteligentes"
+
+#. Keywords
+#: smartcard/smartcard.desktop:15
+msgid "Smartcard;PKCS;SSL;reader;smart;card;"
+msgstr "Smartcard;tarjeta inteligente;PKCS;SSL;lector;smart;tarjeta;"
+
+#. Name
+#: smserver/kcmsmserver.desktop:12
+msgid "Session Manager"
+msgstr "Gestor de sesiones"
+
+#. Comment
+#: smserver/kcmsmserver.desktop:14
+msgid "Configure the session manager and logout settings"
+msgstr "Configura el gestor de sesiones y las opciones de salida"
+
+#. Keywords
+#: smserver/kcmsmserver.desktop:16
+msgid "ksmserver;session;logout;confirmation;save;restore;"
+msgstr "ksmserver;sesión;salida;confirmación;guardar;restaurar;"
+
+#. Name
+#: spellchecking/spellchecking.desktop:11
+msgid "Spell Checker"
+msgstr "Corrector ortográfico"
+
+#. Comment
+#: spellchecking/spellchecking.desktop:13
+msgid "Configure the spell checker"
+msgstr "Configuración del corrector ortográfico"
+
+#. Keywords
+#: spellchecking/spellchecking.desktop:15
+msgid "Spell;"
+msgstr "Ortografía;"
+
+#. Name
+#: style/style.desktop:13
+msgid "Style"
+msgstr "Estilo"
+
+#. Comment
+#: style/style.desktop:15
+msgid ""
+"Allows the manipulation of widget behavior and changing the Style for TDE"
+msgstr ""
+"Permite la manipulación del comportamiento del widget y permite cambiar el "
+"estilo para TDE"
+
+#. Keywords
+#: style/style.desktop:17
+msgid ""
+"style;styles;look;widget;icons;toolbars;text;highlight;apps;TDE applications;"
+msgstr ""
+"estilo;estilos;temas;aspecto;objeto visual;widget;texto;resaltado;botones; "
+"programas; programas TDE;"
+
+#. Name
+#: taskbar/kcmtaskbar.desktop:11
+msgid "Taskbar"
+msgstr "Barra de tareas"
+
+#. Comment
+#: taskbar/kcmtaskbar.desktop:13
+msgid "Configure the selected taskbar"
+msgstr "Configuración de la barra de tareas del panel"
+
+#. Keywords
+#: taskbar/kcmtaskbar.desktop:15
+msgid "kicker;panel;kpanel;taskbar;startbar;launchbar;windows;"
+msgstr ""
+"kicker;panel;kpanel;barra de tareas;barra de inicio;barra de "
+"lanzamiento;ventanas;"
+
+#. Name
+#: tdefontinst/installfont.desktop:6
+msgid "Install"
+msgstr "Instalar"
+
+#. Name
+#: tdefontinst/kcmfontinst/kcmfontinst.desktop:14
+msgid "Font Installer"
+msgstr "Instalador de tipografías"
+
+#. Comment
+#: tdefontinst/kcmfontinst/kcmfontinst.desktop:16
+msgid "Install & preview fonts"
+msgstr "Instalar y previsualizar tipografías"
+
+#. Keywords
+#: tdefontinst/kcmfontinst/kcmfontinst.desktop:18
+msgid "font;fonts;installer;truetype;type1;speedo;bitmap;"
+msgstr "tipografía;tiografías;fuentes;instalador;truetype;type1;speedo;bitmap;"
+
+#. Name
+#: tdefontinst/tdefile-plugin/tdefile_font.desktop:3
+msgid "Font Information"
+msgstr "Información de la tipografía"
+
+#. Comment
+#: tdefontinst/tdeio/folder.desktop:2
+msgid "Fonts Folder"
+msgstr "Carpeta de la tipografía"
+
+#. Comment
+#: tdefontinst/tdeio/package.desktop:6
+msgid "Fonts Package"
+msgstr "Paquete de tipografía"
+
+#. Comment
+#: tdefontinst/tdeio/system-folder.desktop:2
+msgid "System Fonts Folder"
+msgstr "Carpeta de tipografía del sistema"
+
+#. Name
+#: tdefontinst/thumbnail/fontthumbnail.desktop:3
+msgid "Font Files"
+msgstr "Archivos de tipografía"
+
+#. Name
+#: tdefontinst/viewpart/tdefontview.desktop:2
+msgid "TDEFontView"
+msgstr "TDEFontView"
+
+#. GenericName
+#. Name
+#: tdefontinst/viewpart/tdefontview.desktop:8
+#: tdefontinst/viewpart/tdefontviewpart.desktop:2
+msgid "Font Viewer"
+msgstr "Visor de tipografía"
+
+#. Name
+#: tdeio/cache.desktop:12
+msgid "Cache"
+msgstr "Caché"
+
+#. Comment
+#: tdeio/cache.desktop:14
+msgid "Configure web cache settings"
+msgstr "Preferencias del caché de web"
+
+#. Keywords
+#: tdeio/cache.desktop:16
+msgid "Cache;History;Browsing History;Ports;Size;"
+msgstr "Caché;Historial;Historial de navegación;Puertos;Tamaño;"
+
+#. Name
+#: tdeio/cookies.desktop:12
+msgid "Cookies"
+msgstr "Cookies"
+
+#. Comment
+#: tdeio/cookies.desktop:14
+msgid "Configure the way cookies work"
+msgstr "Configuración del funcionamiento de las cookies"
+
+#. Keywords
+#: tdeio/cookies.desktop:16
+msgid "Cookies;Browsing;Internet;WWW;Network;Policy;Domains;"
+msgstr "Cookies;Navegación;Internet;WWW;Red;Política;Dominios;"
+
+#. Name
+#: tdeio/lanbrowser.desktop:11
+msgid "Local Network Browsing"
+msgstr "Navegación por la red local"
+
+#. Comment
+#: tdeio/lanbrowser.desktop:13
+msgid "Setup lisa, reslisa and the ioslaves"
+msgstr "Configuración de lisa, reslisa y los ioslaves"
+
+#. Keywords
+#: tdeio/lanbrowser.desktop:15
+msgid "samba;smb;windows;network;"
+msgstr "samba;smb;windows;red;"
+
+#. Comment
+#: tdeio/netpref.desktop:2
+msgid "Configure generic network preferences, like timeout values"
+msgstr ""
+"Configuración de las preferencias genéricas de red, como los tiempos de "
+"desconexión"
+
+#. Keywords
+#: tdeio/netpref.desktop:5
+msgid "timeout;iopref;netpref;network preferences;ftp;"
+msgstr "timeout;iopref;netpref;red preferencias;ftp;"
+
+#. Name
+#: tdeio/netpref.desktop:6
+msgid "Connection Preferences"
+msgstr "Preferencias de conexión"
+
+#. Name
+#: tdeio/proxy.desktop:12
+msgid "Proxy"
+msgstr "Proxy"
+
+#. Comment
+#: tdeio/proxy.desktop:14
+msgid "Configure the proxy servers used"
+msgstr "Configuración de los servidores Proxy usados"
+
+#. Keywords
+#: tdeio/proxy.desktop:16
+msgid "Proxy;Proxy server;Firewall;Squid;proxy;"
+msgstr "Proxy;servidor Proxy;Cortafuegos;Squid;proxy;"
+
+#. Name
+#: tdeio/smb.desktop:12
+msgid "Windows Shares"
+msgstr "Comparticiones Windows"
+
+#. Comment
+#: tdeio/smb.desktop:14
+msgid "Use to configure which windows (SMB) filesystems you can browse"
+msgstr ""
+"Usalo para configurar qué sistemas de archivos de Windows (SMB) puede "
+"examinar"
+
+#. Keywords
+#: tdeio/smb.desktop:16
+msgid ""
+"SMB;SAMBA;SMB client;Windows network;LAN;Network;neighborhood;Server;"
+"Broadcast;WINS;Share;Login;Passwords;"
+msgstr ""
+"SMB;SAMBA;Cliente SMB;Red Windows;LAN;Red;entorno;Servidor;Broadcast;WINS;Com"
+"partición;Entrada;Acceso;Contraseñas;"
+
+#. Comment
+#: tdeio/uasprovider.desktop:4
+msgid "UserAgent Strings"
+msgstr "Cadenas del Agente de Usuario"
+
+#. Name
+#: tdeio/uasproviders/ie401onwinnt4.desktop:2
+msgid "UADescription (IE 4.01 on Win 2000)"
+msgstr "Descripción de AU (IE 4.01 en Windows 2000)"
+
+#. Name
+#: tdeio/uasproviders/ie45onwinnt5.desktop:2
+msgid "UADescription (IE 4.5 on Win 2000)"
+msgstr "Descripción de AU (IE 4.5 en Windows 2000)"
+
+#. Name
+#: tdeio/uasproviders/ie501onwinnt5.desktop:2
+msgid "UADescription (IE 5.01 on Win 2000)"
+msgstr "Descripción de AU (IE 5.01 en Windows 2000)"
+
+#. Name
+#: tdeio/uasproviders/ie50onppc.desktop:2
+msgid "UADescription (IE 5.0 on Mac PPC)"
+msgstr "Descripción de AU (IE 5.0 en Mac PPC)"
+
+#. Name
+#: tdeio/uasproviders/ie55onwin98.desktop:2
+msgid "UADescription (IE 5.5 on Win 98)"
+msgstr "Descripción de AU (IE 5.5 en Windows 98)"
+
+#. Name
+#: tdeio/uasproviders/ie55onwinnt5.desktop:2
+msgid "UADescription (IE 5.5 on Win 2000)"
+msgstr "Descripción de AU (IE 5.5 en Windows 2000)"
+
+#. Name
+#: tdeio/uasproviders/ie60oncurrent.desktop:2
+msgid "UADescription (IE 6.0 on current)"
+msgstr "UADescription (IE 6.0 en actual)"
+
+#. Name
+#: tdeio/uasproviders/ie60onwinnt51.desktop:2
+msgid "UADescription (IE 6.0 on Win XP)"
+msgstr "Descripción de AU (IE 6.0 en Win XP)"
+
+#. Name
+#: tdeio/uasproviders/lynxoncurrent.desktop:2
+msgid "UADescription (Lynx 2.8.3)"
+msgstr "Descripción de AU (Lynx 2.8.3)"
+
+#. Name
+#: tdeio/uasproviders/ns71oncurrent.desktop:2
+msgid "UADescription (Netscape 7.1 on current)"
+msgstr "UADescription (Netscape 7.1 en actual)"
+
+#. Name
+#: tdeio/uasproviders/ns71onwinnt51.desktop:2
+msgid "UADescription (Netscape 7.1 on XP)"
+msgstr "UADescription (Netscape 7.1 en XP)"
+
+#. Name
+#: tdeio/uasproviders/op75oncurrent.desktop:2
+msgid "UADescription (Opera 7.55 on current)"
+msgstr "UADescription (Opera 7.55 en actual)"
+
+#. Name
+#: tdeio/uasproviders/w3moncurrent.desktop:2
+msgid "UADescription (w3m 0.1.9)"
+msgstr "Descripción de AU (w3m 0.1.9)"
+
+#. Name
+#: tdeio/uasproviders/wgetoncurrent.desktop:2
+msgid "UADescription (Wget 1.11.4)"
+msgstr "Descripción de UA (Wget 1.11.4)"
+
+#. Name
+#: tdeio/useragent.desktop:12
+msgid "Browser Identification"
+msgstr "Identificación del navegador"
+
+#. Comment
+#: tdeio/useragent.desktop:14
+msgid "Configure the way Konqueror reports itself"
+msgstr "Configuración del modo de autoidentificación de Konqueror"
+
+#. Keywords
+#: tdeio/useragent.desktop:16
+msgid "User Agent;Browser;Internet;WWW;Network;agent;bindings;server;login;"
+msgstr ""
+"Agente de Usuario;Navegador;Internet;WWW;Red;agente;asociaciones;servidor;ent"
+"rada;acceso;"
+
+#. Name
+#: tdm/tdm.desktop:14
+msgid "Login Manager"
+msgstr "Gestor de acceso"
+
+#. Comment
+#: tdm/tdm.desktop:16
+msgid "Configure the login manager (TDM)"
+msgstr "Configura el gestor de acceso (TDM)"
+
+#. Keywords
+#: tdm/tdm.desktop:18
+msgid ""
+"tdm;display manager;xdm;users;login;greeting;Logo;styles;language;country;"
+"fonts;background;wallpapers;sessions;shutdown;restart;"
+msgstr ""
+"tdm;gestor de "
+"pantalla;xdm;usuarios;entrada;acceso;saludo;Logo;estilos;idioma;país;tipos "
+"de letra;fondo;tapices;sesiones;apagar;reiniciar;"
+
+#. Name
+#: usbview/kcmusb.desktop:10
+msgid "USB Devices"
+msgstr "Dispositivos USB"
+
+#. Comment
+#: usbview/kcmusb.desktop:12
+msgid "View the USB devices attached to this computer"
+msgstr "Muestra los dispositivos USB conectados a éste equipo"
+
+#. Keywords
+#: usbview/kcmusb.desktop:14
+msgid "USB;devices;viewer;control;"
+msgstr "USB;dispositivos;visor;control;"
+
+#. Name
+#: view1394/kcmview1394.desktop:10
+msgid "IEEE 1394 Devices"
+msgstr "Dispositivos IEEE 1394"
+
+#. Comment
+#: view1394/kcmview1394.desktop:12
+msgid "View the IEEE 1394 devices attached to this computer"
+msgstr "Muestra los dispositivos IEEE 1394 conectados a este equipo"
+
+#. Keywords
+#: view1394/kcmview1394.desktop:14
+msgid "1394;Firewire;devices;viewer;control;"
+msgstr "1394;Firewire;dispositivos;visor;control;"
+
+#. Name
+#: xinerama/xinerama.desktop:10
+msgid "Multiple Monitors"
+msgstr "Varios monitores"
+
+#. Comment
+#: xinerama/xinerama.desktop:12
+msgid "Configure TDE for multiple monitors"
+msgstr "Configuración de TDE para varios monitores"
+
+#. Keywords
+#: xinerama/xinerama.desktop:14
+msgid "Xinerama;dual head;multihead;monitor;"
+msgstr "Xinerama;doble cabezal;multicabezal;monitor;"
diff --git a/translations/desktop_files/kcontrol-desktops/et.po b/translations/desktop_files/kcontrol-desktops/et.po
index 58d5ab56e..cdb8473c8 100644
--- a/translations/desktop_files/kcontrol-desktops/et.po
+++ b/translations/desktop_files/kcontrol-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1594,6 +1594,33 @@ msgstr ""
 "lohistamine;topeltklikk;topeltklõps;asetus;paremakäeline;vasakukäeline;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Hiire seadistused"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"hiir;hiire kiirendus;hiire lävi;hiire nupud;valimine;kursori kuju;"
+"sisendseadmed;nuppude asetus;klikk;klõps;ikoonid;tagasiside;kursorid;"
+"lohistamine;topeltklikk;topeltklõps;asetus;paremakäeline;vasakukäeline;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Juhtpult"
diff --git a/translations/desktop_files/kcontrol-desktops/eu.po b/translations/desktop_files/kcontrol-desktops/eu.po
index d7a85a7fa..b16b98708 100644
--- a/translations/desktop_files/kcontrol-desktops/eu.po
+++ b/translations/desktop_files/kcontrol-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1596,6 +1596,34 @@ msgstr ""
 "ezkertiak;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Saguaren konfigurazioa"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Sagua;Saguaren azelerazioa;Saguaren atalasea;Saguarenbotoiak;Hautespena;"
+"Kurtsorearen itxura;Sarrera dispositiboak;Botoien esleipena;Klika;ikonoak;"
+"atzeraelikadura;Geziak;Arrastatu;Klik bikoitza;esleipenak; eskuinak;"
+"ezkertiak;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/fa.po b/translations/desktop_files/kcontrol-desktops/fa.po
index d2da80d5e..a686bbec5 100644
--- a/translations/desktop_files/kcontrol-desktops/fa.po
+++ b/translations/desktop_files/kcontrol-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1594,6 +1594,33 @@ msgstr ""
 "�شار دادن، نگاشت، راست‌دست، چپ‌دست;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "تنظیمات موشی"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"موشی، شتاب‌دهی موشی، آستانۀ موشی، دکمه‌های موشی، گزینش، شکل مکان‌نما، دستگاههای "
+"ورودی، نگاشت دکمه، �شار دادن، شمایلها، بازخورد، اشاره‌گرها، کشیدن، دو بار "
+"�شار دادن، نگاشت، راست‌دست، چپ‌دست;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "اهرم کنترل"
diff --git a/translations/desktop_files/kcontrol-desktops/fi.po b/translations/desktop_files/kcontrol-desktops/fi.po
index 1d5adfa94..133e4d2e1 100644
--- a/translations/desktop_files/kcontrol-desktops/fi.po
+++ b/translations/desktop_files/kcontrol-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1603,6 +1603,33 @@ msgstr ""
 "Osoittimet;Vedä;Tuplanapsautus;järjestys;oikeakätinen;vasenkätinen;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Hiiriasetukset"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Hiiri;Hiiren kiihdytys;Hiiren raja-arvo;Hiiren painikkeet;Valinta;Osoittimen "
+"muoto;Syöttölaitteet;Painikkeiden järjestys;Napsautus;kuvakkeet;palaute;"
+"Osoittimet;Vedä;Tuplanapsautus;järjestys;oikeakätinen;vasenkätinen;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Peliohjain"
diff --git a/translations/desktop_files/kcontrol-desktops/fo.po b/translations/desktop_files/kcontrol-desktops/fo.po
index 18ee3eb63..feddcb81a 100644
--- a/translations/desktop_files/kcontrol-desktops/fo.po
+++ b/translations/desktop_files/kcontrol-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1553,6 +1553,24 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+msgid "Touchpad settings"
+msgstr "Lituppseting"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/fr.po b/translations/desktop_files/kcontrol-desktops/fr.po
index 99eac4611..10080e341 100644
--- a/translations/desktop_files/kcontrol-desktops/fr.po
+++ b/translations/desktop_files/kcontrol-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1624,6 +1624,33 @@ msgstr ""
 "gaucher;droitier;double clic;simple clic;clic gauche;clic droit;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Configuration de la souris"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"souris;accélération de la souris;seuil de la souris;boutons de la souris;"
+"sélection;forme du curseur;périphériques d'entrée;curseur;clic;icônes;"
+"gaucher;droitier;double clic;simple clic;clic gauche;clic droit;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/fy.po b/translations/desktop_files/kcontrol-desktops/fy.po
index 1c8b032e5..7fafae4a2 100644
--- a/translations/desktop_files/kcontrol-desktops/fy.po
+++ b/translations/desktop_files/kcontrol-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1615,6 +1615,33 @@ msgstr ""
 "slepe;dûbelklikken;loftshandich;rjochtshandich.râneapparaten;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Mûsynstellings"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mûs;Mûs fluggens;Mûsknoppen;seleksje;rinnerke-úterlik;ynfier devices;"
+"ynfierapparaten;knopyndieling;klikken;Ikoanen;icons;Oanwizers;pointers;drag;"
+"slepe;dûbelklikken;loftshandich;rjochtshandich.râneapparaten;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ga.po b/translations/desktop_files/kcontrol-desktops/ga.po
index addd5aa9d..d35f7a45c 100644
--- a/translations/desktop_files/kcontrol-desktops/ga.po
+++ b/translations/desktop_files/kcontrol-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1590,6 +1590,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Socruithe luiche"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Luamhán Stiúrtha"
diff --git a/translations/desktop_files/kcontrol-desktops/gl.po b/translations/desktop_files/kcontrol-desktops/gl.po
index b4abd024f..2cf74b519 100644
--- a/translations/desktop_files/kcontrol-desktops/gl.po
+++ b/translations/desktop_files/kcontrol-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1596,6 +1596,33 @@ msgstr ""
 "Ponteiros;Arrastar;DobreClic;mapear;dereiteiro;esquerdeiro;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Configuración do rato"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Rato;Aceleración do rato;Umbral do rato;botóns do rato;Selección;Forma do "
+"Cursores;Dispositivos de Entrada;Mapa do botón;Clic;iconas;indicador;"
+"Ponteiros;Arrastar;DobreClic;mapear;dereiteiro;esquerdeiro;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/gu.po b/translations/desktop_files/kcontrol-desktops/gu.po
index 796e088ba..547258c2b 100644
--- a/translations/desktop_files/kcontrol-desktops/gu.po
+++ b/translations/desktop_files/kcontrol-desktops/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/he.po b/translations/desktop_files/kcontrol-desktops/he.po
index 0d56ca52d..9b0ee92b9 100644
--- a/translations/desktop_files/kcontrol-desktops/he.po
+++ b/translations/desktop_files/kcontrol-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1635,6 +1635,35 @@ msgstr ""
 "mapping;right handed;left handed;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "שינוי הגדרות העכבר"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"עכבר;ת�וצת עכבר;סף עכבר;לחצני עכבר;בחירה;צורת מצביע;התקני קלט;לחיצה;סמלי�;"
+"תגובה;מצביעי�;גרירה;לחיצה כפולה;תצורה;ימני;שמ�לי;תצורת לחצני�; Mouse;Mouse "
+"acceleration;Mouse threshold;Mouse buttons;Selection;Cursor Shape;Input "
+"Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;DoubleClick;"
+"mapping;right handed;left handed;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "ג'ויסטיק"
diff --git a/translations/desktop_files/kcontrol-desktops/hi.po b/translations/desktop_files/kcontrol-desktops/hi.po
index cee072b6c..539b39c0a 100644
--- a/translations/desktop_files/kcontrol-desktops/hi.po
+++ b/translations/desktop_files/kcontrol-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1580,6 +1580,32 @@ msgstr ""
 "प�रतीक;फ़ीडबैक;प�वाइंटर�स;खींचें;डबल-क�लिक;मैपिंग;दाहिने हाथ वाला; खब�बू(बा�� हाथ वाला);"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "माउस विन�यास"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"माउस;माउस त�वरण;माउस दहलीज;माउस बटन;चयन;संकेतक आकार;इनप�ट औज़ार;बटन मैपिंग;क�लिक;"
+"प�रतीक;फ़ीडबैक;प�वाइंटर�स;खींचें;डबल-क�लिक;मैपिंग;दाहिने हाथ वाला; खब�बू(बा�� हाथ वाला);"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "जॉयस�टिक"
diff --git a/translations/desktop_files/kcontrol-desktops/hne.po b/translations/desktop_files/kcontrol-desktops/hne.po
index 3406b6a3d..a1b86a9d3 100644
--- a/translations/desktop_files/kcontrol-desktops/hne.po
+++ b/translations/desktop_files/kcontrol-desktops/hne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/hr.po b/translations/desktop_files/kcontrol-desktops/hr.po
index f2944c1d7..eb090c4b4 100644
--- a/translations/desktop_files/kcontrol-desktops/hr.po
+++ b/translations/desktop_files/kcontrol-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1627,6 +1627,36 @@ msgstr ""
 "desnoruk;ljevoruk;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Postavke miša"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;Miš;Ubrzavanje miša;Prag miša;"
+"Tipke miša;Odabir;Oblik pokaziva�a;Ulazni uređaji;Mapiranje tipki;Klikanje;"
+"ikone;povratni podaci;Pokaziva�i;Prevla�enje;Dvostruki klik;mapiranje;"
+"desnoruk;ljevoruk;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Igraća palica"
diff --git a/translations/desktop_files/kcontrol-desktops/hsb.po b/translations/desktop_files/kcontrol-desktops/hsb.po
index 90d3a118e..d70bb1198 100644
--- a/translations/desktop_files/kcontrol-desktops/hsb.po
+++ b/translations/desktop_files/kcontrol-desktops/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1546,6 +1546,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/hu.po b/translations/desktop_files/kcontrol-desktops/hu.po
index d3ead1882..b8e8d9135 100644
--- a/translations/desktop_files/kcontrol-desktops/hu.po
+++ b/translations/desktop_files/kcontrol-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1597,6 +1597,33 @@ msgstr ""
 "húzás;dupla kattintás;hozzárendelés;jobbkezes;balkezes;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Az egér beállításai"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"egér;egérgyorsítás;egérérzékenység;egérgombok;kiválasztás;kurzoralak;"
+"beviteli eszközök;gombhozzárendelés;kattintás;ikonok;visszajelzés;mutatók;"
+"húzás;dupla kattintás;hozzárendelés;jobbkezes;balkezes;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Botkormány"
diff --git a/translations/desktop_files/kcontrol-desktops/ia.po b/translations/desktop_files/kcontrol-desktops/ia.po
index c8ba1a3d3..24be1f540 100644
--- a/translations/desktop_files/kcontrol-desktops/ia.po
+++ b/translations/desktop_files/kcontrol-desktops/ia.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# giovanni <assecoibalcu@yahoo.it>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2025-10-14 16:16+0000\n"
+"Last-Translator: giovanni <assecoibalcu@yahoo.it>\n"
+"Language-Team: Interlingua <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kcontrol-desktop-files/ia/>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: access/kaccess.desktop:3
 msgid "Accessibility Tool"
-msgstr ""
+msgstr "Instrumento de Accessibilitate"
 
 #. Name
 #: access/kcmaccess.desktop:12
 msgid "Accessibility"
-msgstr ""
+msgstr "Accessibilitate"
 
 #. Comment
 #: access/kcmaccess.desktop:14
@@ -59,7 +60,7 @@ msgstr ""
 #. Name
 #: background/background.desktop:12
 msgid "Background"
-msgstr ""
+msgstr "Fundo"
 
 #. Comment
 #: background/background.desktop:14
@@ -76,7 +77,7 @@ msgstr ""
 #. Name
 #: bell/bell.desktop:13
 msgid "System Bell"
-msgstr ""
+msgstr "Campana de systema"
 
 #. Comment
 #: bell/bell.desktop:15
@@ -91,12 +92,12 @@ msgstr ""
 #. Name
 #: clock/clock.desktop:13
 msgid "Date & Time"
-msgstr ""
+msgstr "Date & Tempore"
 
 #. Comment
 #: clock/clock.desktop:15
 msgid "Date and time settings"
-msgstr ""
+msgstr "Preferentias de Data e Tempore"
 
 #. Keywords
 #: clock/clock.desktop:17
@@ -106,12 +107,12 @@ msgstr ""
 #. Name
 #: colors/colors.desktop:12
 msgid "Colors"
-msgstr ""
+msgstr "Colores"
 
 #. Comment
 #: colors/colors.desktop:14
 msgid "Color settings"
-msgstr ""
+msgstr "Preferentias de color"
 
 #. Keywords
 #: colors/colors.desktop:16
@@ -152,7 +153,7 @@ msgstr ""
 #. Name
 #: componentchooser/componentservices/kcm_browser.desktop:1
 msgid "Web Browser"
-msgstr ""
+msgstr "Navigator Web"
 
 #. Comment
 #: componentchooser/componentservices/kcm_browser.desktop:3
@@ -165,7 +166,7 @@ msgstr ""
 #: componentchooser/componentservices/kcm_filemanager.desktop:1
 #: konq/filebrowser.desktop:12
 msgid "File Manager"
-msgstr ""
+msgstr "Gerente de File"
 
 #. Comment
 #: componentchooser/componentservices/kcm_filemanager.desktop:3
@@ -178,7 +179,7 @@ msgstr ""
 #. Name
 #: componentchooser/componentservices/kcm_kemail.desktop:1
 msgid "Email Client"
-msgstr ""
+msgstr "Cliente de E-Posta"
 
 #. Comment
 #: componentchooser/componentservices/kcm_kemail.desktop:3
@@ -191,7 +192,7 @@ msgstr ""
 #. Name
 #: componentchooser/componentservices/kcm_terminal.desktop:1
 msgid "Terminal Emulator"
-msgstr ""
+msgstr "Emulator de terminal"
 
 #. Comment
 #: componentchooser/componentservices/kcm_terminal.desktop:3
@@ -204,7 +205,7 @@ msgstr ""
 #. Name
 #: crypto/crypto.desktop:10
 msgid "Crypto"
-msgstr ""
+msgstr "Crypto"
 
 #. Comment
 #: crypto/crypto.desktop:12
@@ -221,27 +222,27 @@ msgstr ""
 #. Name
 #: css/kcmcss.desktop:12
 msgid "Stylesheets"
-msgstr ""
+msgstr "Stylesheets (Folios de stilo)"
 
 #. Comment
 #: css/kcmcss.desktop:14
 msgid "Configure the stylesheets used to render web pages"
-msgstr ""
+msgstr "Configura le folios de stilo usate pro render paginas web"
 
 #. Keywords
 #: css/kcmcss.desktop:16
 msgid "CSS;HTML;style;stylesheet;accessibility;"
-msgstr ""
+msgstr "CSS,HTML,stilo,folio de stilo,accessibilitate;"
 
 #. Name
 #: display/display.desktop:11
 msgid "Display"
-msgstr ""
+msgstr "Monstrator"
 
 #. Comment
 #: display/display.desktop:13
 msgid "Display Settings"
-msgstr ""
+msgstr "Preferentias de monstrator"
 
 #. Name
 #: displayconfig/displayconfig.desktop:12
@@ -251,7 +252,7 @@ msgstr ""
 #. Comment
 #: displayconfig/displayconfig.desktop:14
 msgid "Configure display"
-msgstr ""
+msgstr "Configura Monstrator"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
@@ -271,7 +272,7 @@ msgstr ""
 #. Name
 #: ebrowsing/ebrowsing.desktop:12
 msgid "Web Shortcuts"
-msgstr ""
+msgstr "Vias Breve de web"
 
 #. Comment
 #: ebrowsing/ebrowsing.desktop:14
@@ -298,12 +299,12 @@ msgstr ""
 #. Comment
 #: ebrowsing/plugins/ikws/searchprovider.desktop:4
 msgid "Search Engine"
-msgstr ""
+msgstr "Motor de cerca"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3
 msgid "Acronym Database"
-msgstr ""
+msgstr "Base de Datos Acronym"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6
@@ -354,7 +355,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:4
 msgid "All Music Guide"
-msgstr ""
+msgstr "All Music Guide"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:5
@@ -364,7 +365,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:3
 msgid "KDE App Search"
-msgstr ""
+msgstr "Cerca de KDE App"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:6
@@ -384,7 +385,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3
 msgid "Debian Backports Search"
-msgstr ""
+msgstr "Cerca de Debian Backports"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4
@@ -416,7 +417,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/call.desktop:5
 msgid "QRZ.com Callsign Database"
-msgstr ""
+msgstr "QRZ.com base de datos Callsign"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/call.desktop:6
@@ -439,7 +440,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:5
 msgid "CiteSeer: Scientific Literature Digital Library"
-msgstr ""
+msgstr "CiteSeer: Libreria Digital de litteratura Scientific"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:6
@@ -450,6 +451,8 @@ msgstr ""
 #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:3
 msgid "CPAN - Comprehensive Perl Archive Network"
 msgstr ""
+"CPAN - Comprehensive Perl Archive Network (Rete Comprehensive de Archivo de "
+"Perl)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:4
@@ -461,6 +464,8 @@ msgstr ""
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:3
 msgid "CTAN - Comprehensive TeX Archive Network"
 msgstr ""
+"CTAN - Comprehensive TeX Archive Network (Rete Comprehensive de Archivo de "
+"TeX)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:4
@@ -472,7 +477,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3
 msgid "CTAN Catalog"
-msgstr ""
+msgstr "Catalogo CTAN"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:4
@@ -483,7 +488,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:3
 msgid "Debian BTS Bug Search"
-msgstr ""
+msgstr "Cerca de Bug Debian BTS"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:4
@@ -493,7 +498,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5
 msgid "dict.cc Translation: German to English"
-msgstr ""
+msgstr "dict.cc Traduction: Germano a Anglese"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6
@@ -504,7 +509,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3
 msgid "LEO - Translate Between German and French"
-msgstr ""
+msgstr "LEO - Traducer inter Germano e Francese"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:6
@@ -515,7 +520,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:3
 msgid "Debian Package Search"
-msgstr ""
+msgstr "Cerca de Pacchetto Debian"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:4
@@ -525,7 +530,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:3
 msgid "Open Directory"
-msgstr ""
+msgstr "Aperi directorio"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
@@ -535,7 +540,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
 msgid "DocBook - The Definitive Guide"
-msgstr ""
+msgstr "DocBook - Le Guida Definitive"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:6
@@ -545,7 +550,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:5
 msgid "Digital Object Identifier"
-msgstr ""
+msgstr "Identificator de Objecto Digital"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:6
@@ -555,12 +560,12 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5
 msgid "dict.cc Translation: English to German"
-msgstr ""
+msgstr "dict.cc Traduction: Anglese a Germano"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:5
 msgid "WordReference.com Translation: English to Spanish"
-msgstr ""
+msgstr "WordReference.com Traduction: Anglese a Espaniol"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:6
@@ -570,7 +575,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:5
 msgid "WordReference.com Translation: English to French"
-msgstr ""
+msgstr "WordReference.com Traduction: Anglese a Francese"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:6
@@ -580,7 +585,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:5
 msgid "WordReference.com Translation: English to Italian"
-msgstr ""
+msgstr "WordReference.com Traduction: Anglese a Italiano"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:6
@@ -590,7 +595,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:5
 msgid "WordReference.com Translation: Spanish to English"
-msgstr ""
+msgstr "WordReference.com Traduction: Espaniol a Anglese"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:6
@@ -610,7 +615,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:3
 msgid "Feedster"
-msgstr ""
+msgstr "Feedster"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:6
@@ -621,6 +626,8 @@ msgstr ""
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:3
 msgid "Free On-Line Dictionary of Computing"
 msgstr ""
+"Free On-Line Dictionary of Computing (Dictionario gratuite in linea de "
+"Computatores)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:6
@@ -630,12 +637,12 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:3
 msgid "LEO - Translate Between French and German"
-msgstr ""
+msgstr "LEO - Traduce inter Francese e Germano"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:5
 msgid "WordReference.com Translation: French to English"
-msgstr ""
+msgstr "WordReference.com Traduction: Francese a Anglese"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:6
@@ -645,12 +652,12 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:3
 msgid "FreeDB"
-msgstr ""
+msgstr "FreeDB"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:6
 msgid "http://www.freedb.org/freedb_search.php?words=\\{@}"
-msgstr ""
+msgstr "http://www.freedb.org/freedb_search.php?words=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:3
@@ -675,7 +682,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:3
 msgid "FSF/UNESCO Free Software Directory"
-msgstr ""
+msgstr "FSF/UNESCO Free Software Directory (Directorio de software libere)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:6
@@ -685,7 +692,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:3
 msgid "Google"
-msgstr ""
+msgstr "Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:6
@@ -695,7 +702,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:3
 msgid "Google Advanced Search"
-msgstr ""
+msgstr "Google Advanced Search : cerca avantiate de Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:4
@@ -710,7 +717,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3
 msgid "Google Groups"
-msgstr ""
+msgstr "Google Groups : Gruppos de Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:6
@@ -720,7 +727,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:3
 msgid "Google Image Search"
-msgstr ""
+msgstr "Google Image Search : cerca de Imagine de Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:6
@@ -730,7 +737,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:3
 msgid "Google (I'm Feeling Lucky)"
-msgstr ""
+msgstr "Google (Io sente me fortunate)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:6
@@ -743,7 +750,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:3
 msgid "Google Movies"
-msgstr ""
+msgstr "Google Movies"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:6
@@ -753,7 +760,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:3
 msgid "Google News"
-msgstr ""
+msgstr "Google News - Novas de Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:6
@@ -773,7 +780,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5
 msgid "Great Dictionary of the Catalan Language (GRan Enciclopèdia  Catalana)"
-msgstr ""
+msgstr "Grande Dictionario del Linguage Catalan (GRan Enciclopèdia  Catalana)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:6
@@ -793,27 +800,27 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:3
 msgid "HyperDictionary.com"
-msgstr ""
+msgstr "HyperDictionary.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:6
 msgid "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
-msgstr ""
+msgstr "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:3
 msgid "HyperDictionary.com Thesaurus"
-msgstr ""
+msgstr "HyperDictionary.com Thesauro"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:6
 msgid "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
-msgstr ""
+msgstr "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:3
 msgid "Internet Movie Database"
-msgstr ""
+msgstr "Base de datos de internet de films"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:6
@@ -823,7 +830,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:5
 msgid "WordReference.com Translation: Italian to English"
-msgstr ""
+msgstr "WordReference.com Traduction: Italiano a Anglese"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:6
@@ -833,7 +840,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:3
 msgid "Ask Jeeves"
-msgstr ""
+msgstr "Ask Jeeves"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:6
@@ -855,7 +862,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:5
 msgid "KDE API Documentation"
-msgstr ""
+msgstr "Documentation de KDE API"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:6
@@ -875,7 +882,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:3
 msgid "LEO-Translate"
-msgstr ""
+msgstr "LEO-Traduce"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:6
@@ -905,7 +912,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:3
 msgid "MetaCrawler"
-msgstr ""
+msgstr "MetaCrawler"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:6
@@ -918,7 +925,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3
 msgid "Microsoft Developer Network Search"
-msgstr ""
+msgstr "Microsoft Developer Network Search"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:6
@@ -931,7 +938,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:3
 msgid "Netcraft"
-msgstr ""
+msgstr "Netcraft"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:6
@@ -941,7 +948,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:2
 msgid "Telephonebook Search Provider"
-msgstr ""
+msgstr "Fornitor de cerca Telephonebook"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:6
@@ -956,7 +963,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:2
 msgid "Teletekst Search Provider"
-msgstr ""
+msgstr "Fornitor de cerca Teletekst"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:6
@@ -966,7 +973,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:3
 msgid "OpenPGP Key Search"
-msgstr ""
+msgstr "Cerca de clave OpenPGP"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:4
@@ -976,7 +983,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/php.desktop:3
 msgid "PHP Search"
-msgstr ""
+msgstr "Cerca PHP"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/php.desktop:4
@@ -986,7 +993,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/python.desktop:5
 msgid "Python Reference Manual"
-msgstr ""
+msgstr "Manual de referentia de Python"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/python.desktop:6
@@ -1009,7 +1016,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:5
 msgid "Qt3 Online Documentation"
-msgstr ""
+msgstr "Documentation in linea de Qt3"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:6
@@ -1019,7 +1026,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:5
 msgid "Dictionary of the Spanish Academy (RAE)"
-msgstr ""
+msgstr "Dictionario del Academia Espaniol (RAE)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:6
@@ -1031,7 +1038,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3
 msgid "IETF Requests for Comments"
-msgstr ""
+msgstr "IETF Requestas pro Commentos"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:4
@@ -1041,7 +1048,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:3
 msgid "RPM-Find"
-msgstr ""
+msgstr "RPM-Find"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:6
@@ -1051,7 +1058,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:3
 msgid "Ruby Application Archive"
-msgstr ""
+msgstr "Archivo de application de Ruby"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:6
@@ -1073,7 +1080,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3
 msgid "SourceForge"
-msgstr ""
+msgstr "SourceForge"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:4
@@ -1085,7 +1092,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
 msgid "Technorati"
-msgstr ""
+msgstr "Technorati"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
@@ -1095,7 +1102,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:3
 msgid "Technorati Tags"
-msgstr ""
+msgstr "Technorati Etiquettas"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:6
@@ -1105,7 +1112,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:3
 msgid "Merriam-Webster Thesaurus"
-msgstr ""
+msgstr "Merriam-Webster Thesauro"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:6
@@ -1115,7 +1122,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:4
 msgid "TV Tome"
-msgstr ""
+msgstr "TV Tome"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:6
@@ -1125,7 +1132,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:5
 msgid "U.S. Patent Database"
-msgstr ""
+msgstr "U.S. Patent Database"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:6
@@ -1133,6 +1140,8 @@ msgid ""
 "http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}"
 "&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 msgstr ""
+"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\"
+"{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3
@@ -1150,7 +1159,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:3
 msgid "Voila"
-msgstr ""
+msgstr "Voila"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:6
@@ -1162,7 +1171,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:3
 msgid "Merriam-Webster Dictionary"
-msgstr ""
+msgstr "Merriam-Webster Dictionario"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:6
@@ -1183,7 +1192,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:3
 msgid "Wikipedia - The Free Encyclopedia"
-msgstr ""
+msgstr "Wikipedia - Le Encyclopedia Libere e Gratuite"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:6
@@ -1193,7 +1202,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3
 msgid "Wiktionary - The Free Dictionary"
-msgstr ""
+msgstr "Wiktionary - Le Dictionario Libere e Gratuite"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6
@@ -1203,7 +1212,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:5
 msgid "WordReference.com English Dictionary"
-msgstr ""
+msgstr "WordReference.com Dictionario Anglese"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:6
@@ -1238,28 +1247,30 @@ msgstr ""
 #. Name
 #: filetypes/filetypes.desktop:12
 msgid "File Associations"
-msgstr ""
+msgstr "Associationes de file"
 
 #. Comment
 #: filetypes/filetypes.desktop:14
 msgid "Configure file associations"
-msgstr ""
+msgstr "Configura associationes de file"
 
 #. Keywords
 #: filetypes/filetypes.desktop:16
 msgid "Filetypes;File Associations;Mime Types;File Patterns;Files;Pattern;"
 msgstr ""
+"Typos de file;Associationes de file;Typos Mime;Patronos de "
+"File;Files;Patrono;"
 
 #. Name
 #: fonts/fonts.desktop:12 konqhtml/tdehtml_fonts.desktop:11
 #: tdefontinst/tdeio/fonts.desktop:5
 msgid "Fonts"
-msgstr ""
+msgstr "Fonts"
 
 #. Comment
 #: fonts/fonts.desktop:14
 msgid "Font settings"
-msgstr ""
+msgstr "Preferentias de font"
 
 #. Keywords
 #: fonts/fonts.desktop:16
@@ -1313,12 +1324,12 @@ msgstr ""
 #. Name
 #: iccconfig/iccconfig.desktop:18
 msgid "Color Profile"
-msgstr ""
+msgstr "Profilo de Color"
 
 #. Name
 #: icons/icons.desktop:12
 msgid "Icons"
-msgstr ""
+msgstr "Icones"
 
 #. Comment
 #: icons/icons.desktop:14
@@ -1348,7 +1359,7 @@ msgstr ""
 #. Name
 #: info/devices.desktop:13
 msgid "Devices"
-msgstr ""
+msgstr "Dispositivos"
 
 #. Comment
 #: info/devices.desktop:15
@@ -1378,17 +1389,17 @@ msgstr ""
 #. Name
 #: info/interrupts.desktop:13
 msgid "Interrupts"
-msgstr ""
+msgstr "Interruptiones"
 
 #. Comment
 #: info/interrupts.desktop:15
 msgid "Interrupt information"
-msgstr ""
+msgstr "Information de Interrupt"
 
 #. Keywords
 #: info/interrupts.desktop:17
 msgid "Interrupts;IRQ;System Information;"
-msgstr ""
+msgstr "Interruptiones;IRQ;Information de systema;"
 
 #. Name
 #: info/ioports.desktop:13
@@ -1408,12 +1419,12 @@ msgstr ""
 #. Name
 #: info/memory.desktop:12
 msgid "Memory"
-msgstr ""
+msgstr "Memoria"
 
 #. Comment
 #: info/memory.desktop:14
 msgid "Memory information"
-msgstr ""
+msgstr "Information de memoria"
 
 #. Keywords
 #: info/memory.desktop:16
@@ -1425,12 +1436,12 @@ msgstr ""
 #. Name
 #: info/opengl.desktop:13
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
 #. Comment
 #: info/opengl.desktop:15
 msgid "OpenGL information"
-msgstr ""
+msgstr "Information de OpenGL"
 
 #. Keywords
 #: info/opengl.desktop:17
@@ -1438,6 +1449,8 @@ msgid ""
 "OpenGL;DRI;GLX;3D;VideoCard;Hardware Acceleration;Graphics;X;X11;Xserver;X-"
 "Server;XFree86;Display;"
 msgstr ""
+"OpenGL;DRI;GLX;3D;Scheda video;Acceleration "
+"hardware;Graphiches;X;X11;XServer;Servitor de X;XFree86;Monstrator;"
 
 #. Name
 #: info/partitions.desktop:13
@@ -1457,22 +1470,22 @@ msgstr ""
 #. Name
 #: info/pci.desktop:12
 msgid "PCI"
-msgstr ""
+msgstr "PCI"
 
 #. Comment
 #: info/pci.desktop:14
 msgid "PCI information"
-msgstr ""
+msgstr "Information de PCI"
 
 #. Keywords
 #: info/pci.desktop:16
 msgid "PCI;PCI-Devices;PCI-Bus;System Information;"
-msgstr ""
+msgstr "PCI;Dispositivos PCI;Bus PCI;Information de systema;"
 
 #. Name
 #: info/processor.desktop:12
 msgid "Processor"
-msgstr ""
+msgstr "Processor"
 
 #. Comment
 #: info/processor.desktop:14
@@ -1487,7 +1500,7 @@ msgstr ""
 #. Name
 #: info/scsi.desktop:12
 msgid "SCSI"
-msgstr ""
+msgstr "SCSI"
 
 #. Comment
 #: info/scsi.desktop:14
@@ -1502,7 +1515,7 @@ msgstr ""
 #. Name
 #: info/sound.desktop:12
 msgid "Sound"
-msgstr ""
+msgstr "Sono"
 
 #. Comment
 #: info/sound.desktop:14
@@ -1517,22 +1530,23 @@ msgstr ""
 #. Name
 #: info/xserver.desktop:12
 msgid "X-Server"
-msgstr ""
+msgstr "Servitor-X"
 
 #. Comment
 #: info/xserver.desktop:14
 msgid "X-Server information"
-msgstr ""
+msgstr "Information de Servitor X"
 
 #. Keywords
 #: info/xserver.desktop:16
 msgid "X;X-Server;XServer;XFree86;Display;VideoCard;System Information;"
 msgstr ""
+"X;Servitor-X;XServer;XFree86;Monstrator;Scheda video;Information de systema;"
 
 #. Name
 #: input/mouse.desktop:13
 msgid "Mouse"
-msgstr ""
+msgstr "Mus"
 
 #. Comment
 #: input/mouse.desktop:15
@@ -1548,6 +1562,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Touchpad"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "Preferentias de Touchpad (pannello tactile)"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
@@ -1586,7 +1617,7 @@ msgstr ""
 #. Name
 #: keys/keys.desktop:12
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Vias breve de claviero"
 
 #. Comment
 #: keys/keys.desktop:14
@@ -1603,7 +1634,7 @@ msgstr ""
 #. Name
 #: kicker/kicker_config.desktop:11
 msgid "Layout"
-msgstr ""
+msgstr "Disposition"
 
 #. Comment
 #: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13
@@ -1625,7 +1656,7 @@ msgstr ""
 #. Name
 #: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11
 msgid "Appearance"
-msgstr ""
+msgstr "Apparentia"
 
 #. Comment
 #: kicker/kicker_config_appearance.desktop:13
@@ -1635,7 +1666,7 @@ msgstr ""
 #. Name
 #: kicker/kicker_config_arrangement.desktop:11
 msgid "Arrangement"
-msgstr ""
+msgstr "Arrangiamento"
 
 #. Name
 #: kicker/kicker_config_hiding.desktop:11
@@ -1650,7 +1681,7 @@ msgstr ""
 #. Name
 #: kicker/kicker_config_menus.desktop:11
 msgid "Menus"
-msgstr ""
+msgstr "Minus"
 
 #. Comment
 #: kicker/kicker_config_menus.desktop:13
@@ -1660,7 +1691,7 @@ msgstr ""
 #. Name
 #: kicker/panel.desktop:10
 msgid "Panels"
-msgstr ""
+msgstr "Pannellos"
 
 #. Comment
 #: kicker/panel.desktop:12
@@ -1670,7 +1701,7 @@ msgstr ""
 #. Name
 #: knotify/kcmnotify.desktop:11
 msgid "System Notifications"
-msgstr ""
+msgstr "Notificationes de Systema"
 
 #. Comment
 #: knotify/kcmnotify.desktop:13
@@ -1700,7 +1731,7 @@ msgstr ""
 #. Name
 #: konq/desktopbehavior.desktop:12 konq/filebehavior.desktop:11
 msgid "Behavior"
-msgstr ""
+msgstr "Comportamento"
 
 #. Comment
 #: konq/desktopbehavior.desktop:14
@@ -1717,7 +1748,7 @@ msgstr ""
 #. Name
 #: konq/desktoppath.desktop:11
 msgid "Paths"
-msgstr ""
+msgstr "Percursos"
 
 #. Comment
 #: konq/desktoppath.desktop:13
@@ -1777,12 +1808,12 @@ msgstr ""
 #. Name
 #: konqhtml/tdehtml_behavior.desktop:11
 msgid "Web Behavior"
-msgstr ""
+msgstr "Comportamento de Web"
 
 #. Comment
 #: konqhtml/tdehtml_behavior.desktop:13
 msgid "Configure the browser behavior"
-msgstr ""
+msgstr "Configura le comportamento de web"
 
 #. Keywords
 #: konqhtml/tdehtml_behavior.desktop:15
@@ -1794,12 +1825,12 @@ msgstr ""
 #. Name
 #: konqhtml/tdehtml_filter.desktop:10
 msgid "AdBlocK Filters"
-msgstr ""
+msgstr "Filtros AdBlock"
 
 #. Comment
 #: konqhtml/tdehtml_filter.desktop:12
 msgid "Configure Konqueror AdBlocK filters"
-msgstr ""
+msgstr "Configura le filtros AdBlock de Konqueror"
 
 #. Comment
 #: konqhtml/tdehtml_fonts.desktop:13
@@ -1815,12 +1846,12 @@ msgstr ""
 #. Name
 #: konqhtml/tdehtml_java_js.desktop:11
 msgid "Java & JavaScript"
-msgstr ""
+msgstr "Java & JavaScript"
 
 #. Comment
 #: konqhtml/tdehtml_java_js.desktop:13
 msgid "Configure the behavior of Java and JavaScript"
-msgstr ""
+msgstr "Configura le comportamento de Java e JavaScript"
 
 #. Keywords
 #: konqhtml/tdehtml_java_js.desktop:15
@@ -1830,7 +1861,7 @@ msgstr ""
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
 msgid "User Interface"
-msgstr ""
+msgstr "Interfacie de usator"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
@@ -1845,7 +1876,7 @@ msgstr ""
 #. Name
 #: konsole/kcmkonsole.desktop:10
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Comment
 #: konsole/kcmkonsole.desktop:12
@@ -1887,7 +1918,7 @@ msgstr ""
 #. Name
 #: launch/kcmlaunch.desktop:12
 msgid "Launch Feedback"
-msgstr ""
+msgstr "Retorno de lanceamento"
 
 #. Comment
 #: launch/kcmlaunch.desktop:14
@@ -1927,23 +1958,23 @@ msgstr ""
 #. Name
 #: nics/nic.desktop:12
 msgid "Network Interfaces"
-msgstr ""
+msgstr "Interfacies de rete"
 
 #. Comment
 #: nics/nic.desktop:14
 msgid "Network interface information"
-msgstr ""
+msgstr "Information de interfacie de rete"
 
 #. Name
 #: performance/kcmkonqyperformance.desktop:11
 #: performance/kcmperformance.desktop:11
 msgid "Performance"
-msgstr ""
+msgstr "Prestation"
 
 #. Comment
 #: performance/kcmkonqyperformance.desktop:13
 msgid "Configure settings that can improve Konqueror performance"
-msgstr ""
+msgstr "Configura preferentias que pote meliorar le prestation de Konqueror"
 
 #. Keywords
 #: performance/kcmkonqyperformance.desktop:15
@@ -2008,12 +2039,12 @@ msgstr ""
 #. Name
 #: samba/smbstatus.desktop:12
 msgid "Samba Status"
-msgstr ""
+msgstr "Stato de Samba"
 
 #. Comment
 #: samba/smbstatus.desktop:14
 msgid "Samba status monitor"
-msgstr ""
+msgstr "Monitor de stato de Samba"
 
 #. Keywords
 #: samba/smbstatus.desktop:16
@@ -2023,7 +2054,7 @@ msgstr ""
 #. Name
 #: screensaver/screensaver.desktop:12
 msgid "Screen Saver"
-msgstr ""
+msgstr "Salvator de schermo"
 
 #. Comment
 #: screensaver/screensaver.desktop:14
@@ -2038,7 +2069,7 @@ msgstr ""
 #. Name
 #: smartcard/smartcard.desktop:11
 msgid "Smartcards"
-msgstr ""
+msgstr "Smartcards"
 
 #. Comment
 #: smartcard/smartcard.desktop:13
@@ -2053,7 +2084,7 @@ msgstr ""
 #. Name
 #: smserver/kcmsmserver.desktop:12
 msgid "Session Manager"
-msgstr ""
+msgstr "Gerente de session"
 
 #. Comment
 #: smserver/kcmsmserver.desktop:14
@@ -2068,7 +2099,7 @@ msgstr ""
 #. Name
 #: spellchecking/spellchecking.desktop:11
 msgid "Spell Checker"
-msgstr ""
+msgstr "Controlator Orthographic"
 
 #. Comment
 #: spellchecking/spellchecking.desktop:13
@@ -2083,7 +2114,7 @@ msgstr ""
 #. Name
 #: style/style.desktop:13
 msgid "Style"
-msgstr ""
+msgstr "Stilo"
 
 #. Comment
 #: style/style.desktop:15
@@ -2100,7 +2131,7 @@ msgstr ""
 #. Name
 #: taskbar/kcmtaskbar.desktop:11
 msgid "Taskbar"
-msgstr ""
+msgstr "Barra de Carga"
 
 #. Comment
 #: taskbar/kcmtaskbar.desktop:13
@@ -2115,12 +2146,12 @@ msgstr ""
 #. Name
 #: tdefontinst/installfont.desktop:6
 msgid "Install"
-msgstr ""
+msgstr "Installa"
 
 #. Name
 #: tdefontinst/kcmfontinst/kcmfontinst.desktop:14
 msgid "Font Installer"
-msgstr ""
+msgstr "Installator de Font"
 
 #. Comment
 #: tdefontinst/kcmfontinst/kcmfontinst.desktop:16
@@ -2155,7 +2186,7 @@ msgstr ""
 #. Name
 #: tdefontinst/thumbnail/fontthumbnail.desktop:3
 msgid "Font Files"
-msgstr ""
+msgstr "Files de font"
 
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:2
@@ -2172,7 +2203,7 @@ msgstr ""
 #. Name
 #: tdeio/cache.desktop:12
 msgid "Cache"
-msgstr ""
+msgstr "Cache"
 
 #. Comment
 #: tdeio/cache.desktop:14
@@ -2187,12 +2218,12 @@ msgstr ""
 #. Name
 #: tdeio/cookies.desktop:12
 msgid "Cookies"
-msgstr ""
+msgstr "Cookies"
 
 #. Comment
 #: tdeio/cookies.desktop:14
 msgid "Configure the way cookies work"
-msgstr ""
+msgstr "Configura le modo de functionar del cookies"
 
 #. Keywords
 #: tdeio/cookies.desktop:16
@@ -2218,6 +2249,8 @@ msgstr ""
 #: tdeio/netpref.desktop:2
 msgid "Configure generic network preferences, like timeout values"
 msgstr ""
+"Configura le preferentia de rete generic, como valores pro expirationes de "
+"tempore"
 
 #. Keywords
 #: tdeio/netpref.desktop:5
@@ -2227,17 +2260,17 @@ msgstr ""
 #. Name
 #: tdeio/netpref.desktop:6
 msgid "Connection Preferences"
-msgstr ""
+msgstr "Preferentias de connexion"
 
 #. Name
 #: tdeio/proxy.desktop:12
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #. Comment
 #: tdeio/proxy.desktop:14
 msgid "Configure the proxy servers used"
-msgstr ""
+msgstr "Configura le servitores de proxy usate"
 
 #. Keywords
 #: tdeio/proxy.desktop:16
@@ -2273,15 +2306,13 @@ msgstr "UADescription (IE 4.01 super Win 2000)"
 
 #. Name
 #: tdeio/uasproviders/ie45onwinnt5.desktop:2
-#, fuzzy
 msgid "UADescription (IE 4.5 on Win 2000)"
-msgstr "UADescription (IE 5.5 super Win 2000)"
+msgstr "Description de AU (IE 4.5 super Win 2000)"
 
 #. Name
 #: tdeio/uasproviders/ie501onwinnt5.desktop:2
-#, fuzzy
 msgid "UADescription (IE 5.01 on Win 2000)"
-msgstr "UADescription (IE 4.01 super Win 2000)"
+msgstr "Description de AU (IE 5.01 super Win 2000)"
 
 #. Name
 #: tdeio/uasproviders/ie50onppc.desktop:2
@@ -2290,9 +2321,8 @@ msgstr "UADescription (IE 5.0 super Mac PPC)"
 
 #. Name
 #: tdeio/uasproviders/ie55onwin98.desktop:2
-#, fuzzy
 msgid "UADescription (IE 5.5 on Win 98)"
-msgstr "UADescription (IE 5.5 super Win 2000)"
+msgstr "Description de AU (IE 5.5 super Win 98)"
 
 #. Name
 #: tdeio/uasproviders/ie55onwinnt5.desktop:2
@@ -2326,9 +2356,8 @@ msgstr "UADescription (Netscape 7.1 super XP)"
 
 #. Name
 #: tdeio/uasproviders/op75oncurrent.desktop:2
-#, fuzzy
 msgid "UADescription (Opera 7.55 on current)"
-msgstr "UADescription (Netscape 7.1 super le currente)"
+msgstr "Description de AU (Opera 7.55 super le currente)"
 
 #. Name
 #: tdeio/uasproviders/w3moncurrent.desktop:2
@@ -2343,7 +2372,7 @@ msgstr "UADescritpion (Wget 1.11.4)"
 #. Name
 #: tdeio/useragent.desktop:12
 msgid "Browser Identification"
-msgstr ""
+msgstr "Identification de Navigator"
 
 #. Comment
 #: tdeio/useragent.desktop:14
@@ -2375,7 +2404,7 @@ msgstr ""
 #. Name
 #: usbview/kcmusb.desktop:10
 msgid "USB Devices"
-msgstr ""
+msgstr "Dispositivos USB"
 
 #. Comment
 #: usbview/kcmusb.desktop:12
diff --git a/translations/desktop_files/kcontrol-desktops/id.po b/translations/desktop_files/kcontrol-desktops/id.po
index a93d034cd..45e8ee291 100644
--- a/translations/desktop_files/kcontrol-desktops/id.po
+++ b/translations/desktop_files/kcontrol-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1564,6 +1564,33 @@ msgstr ""
 "DoubleClick;mapping;right handed;left handed;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Seting Mouse"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input DevicesButton Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/is.po b/translations/desktop_files/kcontrol-desktops/is.po
index 1413534d6..710d8e2b0 100644
--- a/translations/desktop_files/kcontrol-desktops/is.po
+++ b/translations/desktop_files/kcontrol-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1584,6 +1584,32 @@ msgstr ""
 "bendill;tvísmella;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Stillingar músar"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Næmni músar;bendill;inntakstæki;hröðun;örvhentur;rétthentur;smella;tákn;"
+"bendill;tvísmella;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Stýripinnar"
diff --git a/translations/desktop_files/kcontrol-desktops/it.po b/translations/desktop_files/kcontrol-desktops/it.po
index 8c6005e3c..df7dd8b15 100644
--- a/translations/desktop_files/kcontrol-desktops/it.po
+++ b/translations/desktop_files/kcontrol-desktops/it.po
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Leandro Nini <drfiemost@email.it>, 2021.
-# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2022-01-19 02:00+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2024-09-26 03:10+0000\n"
 "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kcontrol-desktop-files/it/>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -81,8 +81,8 @@ msgid ""
 "background;desktops;colors;colours;images;wallpapers;blending;balance;cache;"
 "multiple wallpapers;pixmap;"
 msgstr ""
-"sfondo;desktop;colori;colori;immagini;immagini di "
-"sfondo;sfumature;bilanciamento;cache;sfondi multipli;pixmap;"
+"sfondo;desktop;colori;colori;immagini;immagini di sfondo;sfumature;"
+"bilanciamento;cache;sfondi multipli;pixmap;"
 
 #. Name
 #: bell/bell.desktop:13
@@ -506,8 +506,8 @@ msgid ""
 "http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename="
 "\\{ at }"
 msgstr ""
-"http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=\\{ "
-"at }"
+"http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename="
+"\\{ at }"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3
@@ -747,11 +747,11 @@ msgid ""
 "\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\"}"
 "&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
 msgstr ""
-"http://www.google.com/search?as_q=\\{all,@}&num=\\{num,\"10\""
-"}&btnG=Google+Search&as_epq=\\{exact,\"\"}&as_oq=\\{any,\"\"}&as_eq=\\"
-"{without,\"\"}&lr=\\{lang,\"\"}&as_ft=\\{ft,\"i\"}&as_filetype=\\{filetype,\""
-"\"}&as_qdr=\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\""
-"}&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
+"http://www.google.com/search?as_q=\\{all,@}&num=\\{num,\"10\"}&btnG=Google"
+"+Search&as_epq=\\{exact,\"\"}&as_oq=\\{any,\"\"}&as_eq=\\{without,\"\"}&lr="
+"\\{lang,\"\"}&as_ft=\\{ft,\"i\"}&as_filetype=\\{filetype,\"\"}&as_qdr="
+"\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\"}"
+"&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3
@@ -889,8 +889,8 @@ msgid ""
 "http://www.ask.com/main/askJeeves.asp?"
 "origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
 msgstr ""
-"http://www.ask.com/main/askJeeves."
-"asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
+"http://www.ask.com/main/askJeeves.asp?"
+"origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:3
@@ -964,9 +964,9 @@ msgid ""
 "&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-"
 "search&refer=mc-search"
 msgstr ""
-"http://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=m"
-"etaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&t"
-"heme=classic&refer=mc-search&refer=mc-search"
+"http://search.metacrawler.com/crawler?general=\\{@}"
+"&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-"
+"search&refer=mc-search"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3
@@ -980,8 +980,8 @@ msgid ""
 "handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
 "asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
 msgstr ""
-"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff."
-"asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
+"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff.asp?"
+"handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
 "asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
 
 #. Name
@@ -1008,10 +1008,11 @@ msgid ""
 "&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription=&country=&catcode=&dcity="
 "\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
 msgstr ""
-"http://www.detelefoongids.nl/tginl.dll?action=white&type=search&resultsperpag"
-"e=25&pagestart=1&source=searchcategory&name2=\\{1}&name=&initials=&city=\\{2}"
-"&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription="
-"&country=&catcode=&dcity=\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
+"http://www.detelefoongids.nl/tginl.dll?"
+"action=white&type=search&resultsperpage=25&pagestart=1&source=searchcategory&name2="
+"\\{1}&name=&initials=&city=\\{2}"
+"&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription=&country=&catcode=&dcity="
+"\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:2
@@ -1055,8 +1056,8 @@ msgid ""
 "http://www.google.com/search?sourceid=python-search&q=\\{@}"
 "&submit=Search&q=site%3Apython.org"
 msgstr ""
-"http://www.google.com/search?sourceid=python-search&q=\\"
-"{@}&submit=Search&q=site%3Apython.org"
+"http://www.google.com/search?sourceid=python-search&q=\\{@}"
+"&submit=Search&q=site%3Apython.org"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/qt.desktop:5
@@ -1089,8 +1090,8 @@ msgid ""
 "http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}"
 "&FORMATO=ampliado"
 msgstr ""
-"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\"
-"{@}&FORMATO=ampliado"
+"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}"
+"&FORMATO=ampliado"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3
@@ -1133,8 +1134,8 @@ msgid ""
 "http://www.go.com/Titles?col=WW&qt=\\{@}"
 "&svx=home_searchbox&sv=IS&lk=noframeso"
 msgstr ""
-"http://www.go.com/Titles?col=WW&qt=\\"
-"{@}&svx=home_searchbox&sv=IS&lk=noframeso"
+"http://www.go.com/Titles?col=WW&qt=\\{@}"
+"&svx=home_searchbox&sv=IS&lk=noframeso"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3
@@ -1147,8 +1148,8 @@ msgid ""
 "http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact="
 "\\{exact,\"0\"}&words=\\{@}"
 msgstr ""
-"http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact=\\"
-"{exact,\"0\"}&words=\\{@}"
+"http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact="
+"\\{exact,\"0\"}&words=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
@@ -1201,8 +1202,8 @@ msgid ""
 "http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}"
 "&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 msgstr ""
-"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\"
-"{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
+"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}"
+"&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3
@@ -1230,8 +1231,8 @@ msgid ""
 "http://search.ke.voila.fr/S/voila?"
 "lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
 msgstr ""
-"http://search.ke.voila.fr/S/"
-"voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
+"http://search.ke.voila.fr/S/voila?"
+"lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:3
@@ -1325,7 +1326,8 @@ msgstr "Configura associazioni dei file"
 #. Keywords
 #: filetypes/filetypes.desktop:16
 msgid "Filetypes;File Associations;Mime Types;File Patterns;Files;Pattern;"
-msgstr "tipi di file;associazioni file;tipi MIME;pattern dei file;file;pattern;"
+msgstr ""
+"tipi di file;associazioni file;tipi MIME;pattern dei file;file;pattern;"
 
 #. Name
 #: fonts/fonts.desktop:12 konqhtml/tdehtml_fonts.desktop:11
@@ -1640,6 +1642,25 @@ msgstr ""
 "puntatori;trascinamento;doppio clic;mouse per mancini;mancini;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Touchpad"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "Impostazioni del touchpad"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"touchpad;tocca per fare clic;mouse;pulsanti del mouse;dispositivi di input;"
+"mappatura pulsanti;tocca;clic;mappatura;mano destra;mano sinistra;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Joystick"
@@ -1940,8 +1961,8 @@ msgstr "Configura il comportamento di Java e JavaScript"
 #: konqhtml/tdehtml_java_js.desktop:15
 msgid "konqueror;kfm;browser;html;web;www;java;javascript;"
 msgstr ""
-"konqueror;kfm;browser;html;web;www;caratteri;colori;set di "
-"caratteri;charset;codifica;"
+"konqueror;kfm;browser;html;web;www;caratteri;colori;set di caratteri;charset;"
+"codifica;"
 
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
@@ -2222,8 +2243,8 @@ msgstr ""
 msgid ""
 "style;styles;look;widget;icons;toolbars;text;highlight;apps;TDE applications;"
 msgstr ""
-"stile;stili;aspetto;widget;icone;barre degli "
-"strumenti;testo;evidenziazione;applicazioni;applicazioni TDE;"
+"stile;stili;aspetto;widget;icone;barre degli strumenti;testo;evidenziazione;"
+"applicazioni;applicazioni TDE;"
 
 #. Name
 #: taskbar/kcmtaskbar.desktop:11
diff --git a/translations/desktop_files/kcontrol-desktops/ja.po b/translations/desktop_files/kcontrol-desktops/ja.po
index 0ee0c507e..a5d1c589e 100644
--- a/translations/desktop_files/kcontrol-desktops/ja.po
+++ b/translations/desktop_files/kcontrol-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1614,6 +1614,33 @@ msgstr ""
 "ラッグ;ダブルクリック;割り当�;�利�;左利�;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "マウス�設定"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"マウス;マウス�加速;マウス����;マウスボタン;�択;カーソル�形;入力デ�イ"
+"ス;入力デ�イス;ボタン�割り当�;クリック;アイコン;フィード�ック;�インタ;ド"
+"ラッグ;ダブルクリック;割り当�;�利�;左利�;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "ジョイスティック"
diff --git a/translations/desktop_files/kcontrol-desktops/ka.po b/translations/desktop_files/kcontrol-desktops/ka.po
index 07f231685..a3da177d8 100644
--- a/translations/desktop_files/kcontrol-desktops/ka.po
+++ b/translations/desktop_files/kcontrol-desktops/ka.po
@@ -1,35 +1,36 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2024-12-13 07:11+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kcontrol-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
 msgid "Accessibility Tool"
-msgstr "ს სპეცეცი�ლური შეს�ძლებლ�ბების ხელს�წყ�ები"
+msgstr "წვდ�მ�დ�ბის პრ�გრ�მ�"
 
 #. Name
 #: access/kcmaccess.desktop:12
 msgid "Accessibility"
-msgstr "სპეცი�ლური შეს�ძლბლ�ბები"
+msgstr "წვდ�მ�დ�ბ�"
 
 #. Comment
 #: access/kcmaccess.desktop:14
 msgid "Improve accessibility for disabled persons"
-msgstr "ფიზიკური ნ�კლ�ვ�ნებბის მქ�ნი ხ�ლხისთვის სპეცი�ლური შეს�ძლბლ�ბები"
+msgstr "წვდ�მ�დ�ბის გ�უმჯ�ბესებ� შშმ პირებისთვის"
 
 #. Keywords
 #: access/kcmaccess.desktop:16
@@ -37,6 +38,9 @@ msgid ""
 "access;accessibility;deaf;impaired;bell;audible bell;visible bell;Keyboard;"
 "keys;sticky keys;bounce keys;slow keys;mouse navigation;num pad;"
 msgstr ""
+"access;accessibility;deaf;impaired;bell;audible bell;visible "
+"bell;Keyboard;keys;sticky keys;bounce keys;slow keys;mouse navigation;num "
+"pad;წვდ�მ�დ�ბ�;შშმ;ზ�რი;კლ�ვი�ტურ�;"
 
 #. Name
 #: arts/arts.desktop:12
@@ -46,7 +50,7 @@ msgstr "ხმის სისტემ�"
 #. Comment
 #: arts/arts.desktop:14
 msgid "Sound System Configuration"
-msgstr "ხმის სისტემის კ�ნფიგურ�ცი� "
+msgstr "ხმის სისტემის მ�რგებ�"
 
 #. Keywords
 #: arts/arts.desktop:16
@@ -75,51 +79,55 @@ msgid ""
 "background;desktops;colors;colours;images;wallpapers;blending;balance;cache;"
 "multiple wallpapers;pixmap;"
 msgstr ""
+"background;desktops;colors;colours;images;wallpapers;blending;balance;cache;"
+"multiple wallpapers;pixmap;ფ�ნი;ფ�ნისსურ�თი;კეში;"
 
 #. Name
 #: bell/bell.desktop:13
 msgid "System Bell"
-msgstr "სისტემის ხმ�ვ�ნი სიგნ�ლი"
+msgstr "სისტემური ზ�რი"
 
 #. Comment
 #: bell/bell.desktop:15
 msgid "System Bell Configuration"
-msgstr "სისტემის ხმ�ვ�ნი სიგნ�ლის კ�ნფიგურ�ცი�"
+msgstr "სისტემური ზ�რის მ�რგებ�"
 
 #. Keywords
 #: bell/bell.desktop:17
 msgid "Bell;Audio;Sound;Volume;Pitch;Duration;"
-msgstr "ზ�რი; �უდი�; ხმ�; ხმ�; მიწ�დებ�; ხ�ნგრძლივ�ბ�;"
+msgstr "ზ�რი;�უდი�;ხმ�;მიწ�დებ�;ხ�ნგრძლივ�ბ�;"
 
 #. Name
 #: clock/clock.desktop:13
 msgid "Date & Time"
-msgstr "თ�რიღი დ� დრ�"
+msgstr "დრ� დ� თ�რიღი"
 
 #. Comment
 #: clock/clock.desktop:15
 msgid "Date and time settings"
-msgstr "თ�რიღის� დ� დრ�ის კ�ნფიგურ�ცი�"
+msgstr "თ�რიღის� დ� დრ�ის მ�რგებ�"
 
 #. Keywords
 #: clock/clock.desktop:17
 msgid "clock;date;time;time zone;"
-msgstr "ს��თი; თ�რიღი; დრ�; დრ�იტი ს�რტყელი;"
+msgstr "ს��თი; თ�რიღი; დრ�; დრ�ის ს�რტყელი;"
 
 #. Name
 #: colors/colors.desktop:12
 msgid "Colors"
-msgstr "ცვეტები"
+msgstr "ფერები"
 
 #. Comment
 #: colors/colors.desktop:14
 msgid "Color settings"
-msgstr "ფერების კ�ნფიგურ�ცი�"
+msgstr "ფერის მ�რგებ�"
 
 #. Keywords
 #: colors/colors.desktop:16
 msgid "colors;colours;scheme;contrast;Widget colors;Color Scheme;"
 msgstr ""
+"colors;colours;scheme;contrast;Widget colors;Color Scheme;კ�ნტრ�სტი;ფერები;"
+"ფერის სქემ�;"
 
 #. Name
 #: componentchooser/EXAMPLE.desktop:1
@@ -130,16 +138,18 @@ msgstr "მშვენიერი სáƒ�ხელიáƒ� ინტერფეá
 #: componentchooser/EXAMPLE.desktop:2
 msgid "A helpful description of the interface for the top right info box"
 msgstr ""
+"ს�ს�რგებლ� ინტერფეისის �ღწერ� რ�მელიც ინფ�რმ�ციის ფ�ნჯრის ზედ� მ�რჯვენ� "
+"კუთხეში გ�მ�ჩნდებ�"
 
 #. Name
 #: componentchooser/componentchooser.desktop:10
 msgid "Default Applications"
-msgstr ""
+msgstr "ნ�გულისხმევი �პლიკ�ციები"
 
 #. Comment
 #: componentchooser/componentchooser.desktop:12
 msgid "Choose the default components for various services"
-msgstr "თ�ვდ�პირველი კ�მპ�ნენტების �რჩევ� სხვ� დ� სხვ� მ�მს�ხურე�ბებისთვის"
+msgstr "�ირჩიეთ ნ�გულისხმევი კ�მპ�ნენტები სხვ�დ�სხვ� სერვისებისთვის"
 
 #. Keywords
 #: componentchooser/componentchooser.desktop:14
@@ -148,6 +158,10 @@ msgid ""
 "client;text editor;instant messenger;terminal emulator;web browser;file "
 "manager;URL;hyperlinks;"
 msgstr ""
+"default applications;components;component chooser;resources;e-mail;email "
+"client;text editor;instant messenger;terminal emulator;web browser;file "
+"manager;URL;hyperlinks;ჰიპერბმულები;�პლიკ�ცი�;ნ�გულისხმევი "
+"�პლიკ�ცი�;კ�მპ�ნენტები;ტექსტური რედ�ქტ�რი;"
 
 #. Name
 #: componentchooser/componentservices/kcm_browser.desktop:1
@@ -160,30 +174,30 @@ msgid ""
 "Here you can configure your default web browser. All TDE applications in "
 "which you can select hyperlinks should honor this setting."
 msgstr ""
-"�ქ შეიძლებ� სტ�ნდ�რტული ვებ ბრ�უზერის დ�კ�ნფიგურირებ�. TDE-ს ყველ� პრ�გრ�მ�, "
-"ვის�ც შეუძლი� ბმულების გ�მ�ძ�ხებ�, გ�ითვ�ლისწინებენ �მ პ�რ�მეტრს"
+"�ქ შეგიძლი�თ, თქვენი ნ�გულისხმევი ბრ�უზერი მიუთით�თ. ყველ� TDE-ის �პლიკ�ცი�, "
+"ს�დ�ც ჰიპერბმულებზე დ�წკ�პუნებ� შეგიძლი�თ, იყენებს �მ პ�რ�მეტრს."
 
 #. Name
 #: componentchooser/componentservices/kcm_filemanager.desktop:1
 #: konq/filebrowser.desktop:12
 msgid "File Manager"
-msgstr "ფ�ილთ� მენჯერი"
+msgstr "ფ�ილების მმ�რთველი"
 
 #. Comment
 #: componentchooser/componentservices/kcm_filemanager.desktop:3
-#, fuzzy
 msgid ""
 "This service allows you to configure your default file manager. All TDE "
 "applications which invoke a file manager application should honor this "
 "setting."
 msgstr ""
-"Comment=�ქ შეიძლებ� სტ�ნდ�რტული ტერმინ�ლის ემულ�ტ�რის დ�კ�ნფიგურირებ�. TDE-ს "
-"ყველ� პრ�გრ�მ�, ვის�ც სჭირდებ� ფ�სტ�, გ�ითვ�ლისწინებენ �მ პ�რ�მეტრს"
+"ეს სერვისის ს�შუ�ლებ�ს გ�ძლევთ, თქვენი ნ�გულისხმევი ფ�ილების მმ�რთველი "
+"მ�ირგ�თ. ყველ� TDE-ის �პლიკ�ცი�, რ�მელიც ფ�ილების მმ�რთველს იყენებს, "
+"ითვ�ლისწინებს �მ პ�რ�მეტრს."
 
 #. Name
 #: componentchooser/componentservices/kcm_kemail.desktop:1
 msgid "Email Client"
-msgstr "ს�ფ�სტ� კლიენტი"
+msgstr "ელფ�სტის კლიენტი"
 
 #. Comment
 #: componentchooser/componentservices/kcm_kemail.desktop:3
@@ -192,8 +206,8 @@ msgid ""
 "applications which need access to an email client application should honor "
 "this setting."
 msgstr ""
-"�ქ შეიძლებ� სტ�ნდ�რტული ს�ფ�სტ� კლიენტის დ�კ�ნფიგურირებ�. TDE-ს ყველ� "
-"პრ�გრ�მ�, ვის�ც სჭირდებ� ფ�სტ�, გ�ითვ�ლისწინებენ �მ პ�რ�მეტრს"
+"�ქ ნ�გულისხმევი ელფ�სტის კლიენტის მ�რგებ� შეგიძლი�თ. TDE-ს ყველ� პრ�გრ�მ�, "
+"ვის�ც სჭირდებ� ფ�სტ�, გ�ითვ�ლისწინებენ �მ პ�რ�მეტრს."
 
 #. Name
 #: componentchooser/componentservices/kcm_terminal.desktop:1
@@ -207,8 +221,9 @@ msgid ""
 "applications which invoke a terminal emulator application should honor this "
 "setting."
 msgstr ""
-"Comment=�ქ შეიძლებ� სტ�ნდ�რტული ტერმინ�ლის ემულ�ტ�რის დ�კ�ნფიგურირებ�. TDE-ს "
-"ყველ� პრ�გრ�მ�, ვის�ც სჭირდებ� ფ�სტ�, გ�ითვ�ლისწინებენ �მ პ�რ�მეტრს"
+"ეს სერვისი ს�შუ�ლებ�ს გ�ძლევთ, ნ�გულისხმევი ტერმინ�ლის ემულ�ტ�რი მ�ირგ�თ. "
+"ყველ� TDE-ის �პლიკ�ცი�, რ�მელს�ც კ�ნს�ლი სჭირდებ�, ითვ�ლისწინებს �მ "
+"პ�რ�მეტრს."
 
 #. Name
 #: crypto/crypto.desktop:10
@@ -218,9 +233,7 @@ msgstr "კრიპტ�გრ�ფი�"
 #. Comment
 #: crypto/crypto.desktop:12
 msgid "Configure SSL, manage certificates, and other cryptography settings"
-msgstr ""
-"SSL კ�ნფიგურ�ცი�, სერთიფიკ�ტის მენეჯმენტი დ� სხვ� კრიპტ�გრ�ფიული ელემენტების "
-"კ�ნფიგურ�ცი�"
+msgstr "მ�ირგეთ SSL, მ�რთეთ სერტიფიკ�ტები დ� სხვ� კრიპტ�გრ�ფიის პ�რ�მეტრები"
 
 #. Keywords
 #: crypto/crypto.desktop:14
@@ -228,69 +241,70 @@ msgid ""
 "Crypto;Krypto;Cryptography;encryption;SSL;https;certificates;ciphers;TLS;"
 "secure;security;"
 msgstr ""
+"Crypto;Krypto;Cryptography;encryption;SSL;https;certificates;ciphers;TLS;secu"
+"re;security;უს�ფრთხ�ებ�;კრიპტ�გრ�ფი�;"
 
 #. Name
 #: css/kcmcss.desktop:12
-#, fuzzy
 msgid "Stylesheets"
-msgstr "სტილი"
+msgstr "სტილის ცხრილები"
 
 #. Comment
 #: css/kcmcss.desktop:14
 msgid "Configure the stylesheets used to render web pages"
-msgstr "CSS კ�ნფიგურ�ცი� ვებ გვერდების �ს�ხვისთვის"
+msgstr "ვებგვერდების რენდერისთვის გ�მ�ყენებული სტილის ფურცლების მ�რგებ�"
 
 #. Keywords
 #: css/kcmcss.desktop:16
 msgid "CSS;HTML;style;stylesheet;accessibility;"
 msgstr ""
+"CSS;HTML;style;stylesheet;accessibility;სტილების ცხრილი;სტილის "
+"ცხრილები;წვდ�მ�დ�ბ�;"
 
 #. Name
 #: display/display.desktop:11
 msgid "Display"
-msgstr "ჩვენებ�"
+msgstr "ეკრ�ნი"
 
 #. Comment
 #: display/display.desktop:13
 msgid "Display Settings"
-msgstr "დისპლეის კ�ნფიგურირებ�"
+msgstr "ეკრ�ნის მ�რგებ�"
 
 #. Name
 #: displayconfig/displayconfig.desktop:12
 msgid "Monitor & Display"
-msgstr ""
+msgstr "ეკრ�ნი & ჩვენებ�"
 
 #. Comment
 #: displayconfig/displayconfig.desktop:14
-#, fuzzy
 msgid "Configure display"
-msgstr "სერვისის �რმ�ჩენის კ�ნფიგურირებ�"
+msgstr "ეკრ�ნის მ�რგებ�"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "monitor;resolution;display;ეკრ�ნი;გ�ფ�რთ�ებ�;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
 msgid "Zeroconf Service Discovery"
-msgstr "სერვისის �ღმ�ჩენ�"
+msgstr "Zeroconf-ის სერვისის �ღმ�ჩენ�"
 
 #. Comment
 #: dnssd/kcm_tdednssd.desktop:20
 msgid "Configure service discovery"
-msgstr "სერვისის �რმ�ჩენის კ�ნფიგურირებ�"
+msgstr "სერვისის �ღმ�ჩენის მ�რგებ�"
 
 #. Name
 #: ebrowsing/ebrowsing.desktop:12
 msgid "Web Shortcuts"
-msgstr "ვებგვერდების მ�ლს�ხმ�ბი "
+msgstr "ვების მ�ლს�ხმ�ბები"
 
 #. Comment
 #: ebrowsing/ebrowsing.desktop:14
-#, fuzzy
 msgid "Configure enhanced browsing"
-msgstr "ვებ კეშის პ�რ�მეტრების კ�ნფიგურ�ცი�"
+msgstr "ბრ�უზერის დ�მ�ტებითი კ�ნფიგურ�ცი�"
 
 #. Keywords
 #: ebrowsing/ebrowsing.desktop:16
@@ -298,11 +312,14 @@ msgid ""
 "Enhanced Browsing;Browsing;WWW;Internet;Internet Keywords;Internet Filters;"
 "Network;Search Engines;Shortcuts;"
 msgstr ""
+"Enhanced Browsing;Browsing;WWW;Internet;Internet Keywords;Internet "
+"Filters;Network;Search "
+"Engines;Shortcuts;მ�ლს�ხმ�ბები;ქსელი;ძებნ�;ბრ�უზერი;ინტერნეტი;"
 
 #. Name
 #: ebrowsing/plugins/ikws/kuriikwsfilter.desktop:3
 msgid "InternetKeywordsFilter"
-msgstr "ინტერნეტ ს�კვ�ნძ� სიტყვების ფილტრი"
+msgstr "ინტერნეტის ს�კვ�ნძ� სიტყვების ფილტრი"
 
 #. Name
 #: ebrowsing/plugins/ikws/kurisearchfilter.desktop:3
@@ -317,99 +334,99 @@ msgstr "ს�ძიებ� სისტემ�"
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3
 msgid "Acronym Database"
-msgstr "�კრ�ნიმთ� ბ�ზ�"
+msgstr "�კრ�ნიმების ბ�ზ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6
 msgid "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
-msgstr ""
+msgstr "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3
 msgid "Alexa"
-msgstr ""
+msgstr "�ლექს�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
 msgid "http://info.alexa.com/search?q=\\{@}"
-msgstr ""
+msgstr "http://info.alexa.com/search?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:3
 msgid "Alexa URL"
-msgstr ""
+msgstr "Alexa-ის ბმული"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:6
 msgid "http://info.alexa.com/data/details?url=\\{@}"
-msgstr ""
+msgstr "http://info.alexa.com/data/details?url=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:3
 msgid "AllTheWeb fast"
-msgstr ""
+msgstr "AllTheWeb სწრ�ფი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:6
 msgid ""
 "http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web"
 msgstr ""
+"http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:3
 msgid "AltaVista"
-msgstr ""
+msgstr "AltaVista"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:6
 msgid "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}"
-msgstr ""
+msgstr "http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:4
 msgid "All Music Guide"
-msgstr ""
+msgstr "ყველ� მუსიკის გიდი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:5
 msgid "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}"
-msgstr ""
+msgstr "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:3
 msgid "KDE App Search"
-msgstr "KDE–ს პრ�გრ�მების ძებნ�"
+msgstr "KDE-ის �პის ძებნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/appsy.desktop:6
 msgid "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}"
-msgstr ""
+msgstr "http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:3
 msgid "AustroNaut"
-msgstr ""
+msgstr "AustroNaut"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:6
 msgid "http://austronaut.at/page.php?begriff=\\{@}&wo=at"
-msgstr ""
+msgstr "http://austronaut.at/page.php?begriff=\\{@}&wo=at"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3
-#, fuzzy
 msgid "Debian Backports Search"
-msgstr "Debian-ის პ�კეტის ძიებ�"
+msgstr "ძებნ� Debian Backports-ში"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4
 msgid "http://www.backports.org/package.php?search=\\{@}"
-msgstr ""
+msgstr "http://www.backports.org/package.php?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:3
 msgid "KDE Bug Database Fulltext Search"
-msgstr "KDE–ს შეცდ�მების ძებნ� სრული ტექსტით"
+msgstr "ძებნ� KDE–ის შეცდ�მებში სრული ტექსტით"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:4
@@ -417,31 +434,33 @@ msgid ""
 "http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+"
 "\\{5}+\\{6}+\\{7}+\\{8}+\\{9}"
 msgstr ""
+"http://bugs.trinitydesktop.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+"
+"\\{5}+\\{6}+\\{7}+\\{8}+\\{9}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:3
 msgid "TDE Bug Database Bug Number Search"
-msgstr "TDE–ს შეცდ�მების ძებნ� ნ�მრების მიხედვით"
+msgstr "TDE–ის შეცდ�მების ძებნ� ნ�მრების მიხედვით"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:4
 msgid "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}"
-msgstr ""
+msgstr "http://bugs.trinitydesktop.org/show_bug.cgi?id=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/call.desktop:5
 msgid "QRZ.com Callsign Database"
-msgstr ""
+msgstr "QRZ.com-ის Callsign ბ�ზ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/call.desktop:6
 msgid "http://www.qrz.com/database?callsign=\\{@}"
-msgstr ""
+msgstr "http://www.qrz.com/database?callsign=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/cia.desktop:4
 msgid "CIA World Factbook"
-msgstr "CIA მს�ფლი� ფ�ქტები"
+msgstr "CIA-ის მს�ფლი� ფ�ქტები"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/cia.desktop:5
@@ -450,32 +469,35 @@ msgid ""
 "http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww."
 "cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky"
 msgstr ""
+"http://www.google.com/search?q=allintitle%3A\\{@}+world+factbook+site%3Awww."
+"cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:5
 msgid "CiteSeer: Scientific Literature Digital Library"
-msgstr ""
+msgstr "CiteSeer: ს�მეცნიერ� ლიტერ�ტ�რის ციფრული ბიბლი�თეკ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:6
 msgid "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1"
-msgstr ""
+msgstr "http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:3
 msgid "CPAN - Comprehensive Perl Archive Network"
-msgstr ""
+msgstr "CPAN - ყ�ვლისმ�მცველი Perl-ის �რქივის ქსელი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:4
 msgid ""
 "http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}"
 msgstr ""
+"http://search.cpan.org/search?mode=\\{mode,2,\"dist\"}&query=\\{query,q,1}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:3
 msgid "CTAN - Comprehensive TeX Archive Network"
-msgstr ""
+msgstr "CTAN - TeX-ის ყ�ვლისმ�მცველი �რქივი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:4
@@ -483,6 +505,8 @@ msgid ""
 "http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename="
 "\\{ at }"
 msgstr ""
+"http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=\\{ "
+"at }"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3
@@ -494,230 +518,224 @@ msgstr "CTAN კ�ტ�ლ�გი"
 msgid ""
 "http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}"
 msgstr ""
+"http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:3
-#, fuzzy
 msgid "Debian BTS Bug Search"
-msgstr "Debian-ის პ�კეტის ძიებ�"
+msgstr "შეცდ�მის ძებნ� Debian BTS-ში"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:4
 msgid "http://bugs.debian.org/\\{@}"
-msgstr ""
+msgstr "http://bugs.debian.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5
-#, fuzzy
 msgid "dict.cc Translation: German to English"
-msgstr "dict.cc თ�რგმნ�: ინგლისურ-გერმ�ნული"
+msgstr "dict.cc-ის თ�რგმ�ნი: გერმ�ნულიდ�ნ ინგლისურზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:6
 msgid "http://www.dict.cc/?s=\\{@}"
-msgstr ""
+msgstr "http://www.dict.cc/?s=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3
 msgid "LEO - Translate Between German and French"
-msgstr "LEO - გერმ�ნულ-ფრ�ნგული მთ�რგმნელი"
+msgstr "LEO - თ�რგმ�ნი გერმ�ნულს� დ� ფრ�ნგულს შ�რის"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:6
 #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:6
 msgid "http://dict.leo.org/?lp=frde&search=\\{@}"
-msgstr ""
+msgstr "http://dict.leo.org/?lp=frde&search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:3
 msgid "Debian Package Search"
-msgstr "Debian-ის პ�კეტის ძიებ�"
+msgstr "Debian-ის პ�კეტების ძებნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/deb.desktop:4
 msgid "http://packages.debian.org/\\{@}"
-msgstr ""
+msgstr "http://packages.debian.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:3
 msgid "Open Directory"
-msgstr "ღი� კ�ტ�ლ�გები"
+msgstr "ს�ქ�ღ�ლდის გ�ხსნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
 msgid "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
-msgstr ""
+msgstr "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
 msgid "DocBook - The Definitive Guide"
-msgstr "DocBook - გ�ნს�ზღვრებები"
+msgstr "DocBook - სრული ს�ხელმძღვ�ნელ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:6
 msgid "http://www.docbook.org/tdg/en/html/\\{1}.html"
-msgstr ""
+msgstr "http://www.docbook.org/tdg/en/html/\\{1}.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:5
 msgid "Digital Object Identifier"
-msgstr "ციფრული �ბიექტის �მ�მცნ�ბი"
+msgstr "ციფრული �ბიექტის იდენტიფიკ�ტ�რი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:6
 msgid "http://dx.doi.org/\\{@}"
-msgstr ""
+msgstr "http://dx.doi.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5
 msgid "dict.cc Translation: English to German"
-msgstr "dict.cc თ�რგმნ�: ინგლისურ-გერმ�ნული"
+msgstr "dict.cc თ�რგმ�ნი: ინგლისურიდ�ნ გერმ�ნულზე"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:5
-#, fuzzy
 msgid "WordReference.com Translation: English to Spanish"
-msgstr "dict.cc თ�რგმნ�: ინგლისურ-გერმ�ნული"
+msgstr "WordReference.com თ�რგმ�ნი: ინგლისურიდ�ნ ესპ�ნურზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:6
 msgid "http://www.wordreference.com/es/translation.asp?tranword=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/es/translation.asp?tranword=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:5
-#, fuzzy
 msgid "WordReference.com Translation: English to French"
-msgstr "dict.cc თ�რგმნ�: ინგლისურ-გერმ�ნული"
+msgstr "WordReference.com თ�რგმ�ნი: ინგლისურიდ�ნ ფრ�ნგულზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:6
 msgid "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:5
-#, fuzzy
 msgid "WordReference.com Translation: English to Italian"
-msgstr "dict.cc თ�რგმნ�: ინგლისურ-გერმ�ნული"
+msgstr "WordReference.com თ�რგმ�ნი: ინგლისურიდ�ნ იტ�ლიურზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:6
 msgid "http://www.wordreference.com/it/translation.asp?enit=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/it/translation.asp?enit=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:5
-#, fuzzy
 msgid "WordReference.com Translation: Spanish to English"
-msgstr "dict.cc თ�რგმნ�: ინგლისურ-გერმ�ნული"
+msgstr "WordReference.com თ�რგმ�ნი: ესპ�ნურიდ�ნ ინგლისურზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/es2en.desktop:6
 msgid "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/es/en/translation.asp?spen=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:3
 msgid "Excite"
-msgstr ""
+msgstr "Excite"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:6
 msgid "http://search.excite.com/search.gw?search=\\{@}"
-msgstr ""
+msgstr "http://search.excite.com/search.gw?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:3
 msgid "Feedster"
-msgstr ""
+msgstr "Feedster"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:6
 msgid "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:3
 msgid "Free On-Line Dictionary of Computing"
-msgstr "თ�ვისუფ�ლი კ�მპიუტერული წებ ლექსიკ�ნი"
+msgstr "გ�მ�თვლითი ტექნიკის უფ�ს� �ნლ�ინ-ლექსიკ�ნი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:6
 msgid "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}"
-msgstr ""
+msgstr "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:3
 msgid "LEO - Translate Between French and German"
-msgstr "LEO - ფრ�ნგულ-გერმ�ნული მთ�რგმნელი"
+msgstr "LEO - თ�რგმ�ნი ფრ�ნგულს� დ� გერმ�ნულს შ�რის"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:5
 msgid "WordReference.com Translation: French to English"
-msgstr ""
+msgstr "WordReference.com თ�რგმ�ნი: ფრ�ნგულიდ�ნ ინგლისურზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:6
 msgid "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:3
 msgid "FreeDB"
-msgstr ""
+msgstr "FreeDB"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:6
 msgid "http://www.freedb.org/freedb_search.php?words=\\{@}"
-msgstr ""
+msgstr "http://www.freedb.org/freedb_search.php?words=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:3
 msgid "Freshmeat"
-msgstr ""
+msgstr "Freshmeat"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:6
 msgid "http://freshmeat.net/search/?q=\\{@}"
-msgstr ""
+msgstr "http://freshmeat.net/search/?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:3
 msgid "Froogle"
-msgstr ""
+msgstr "Froogle"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:6
 msgid "http://froogle.google.com/froogle?q=\\{@}"
-msgstr ""
+msgstr "http://froogle.google.com/froogle?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:3
 msgid "FSF/UNESCO Free Software Directory"
-msgstr "FSF/UNESCO თ�ვისუფ�ლი პრ�გრ�მების კ�ტ�ლ�გი"
+msgstr "FSF/UNESCO უფ�ს� პრ�გრ�მული უზრუნველყ�ფის კ�ტ�ლ�გი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:6
 msgid "http://directory.fsf.org/search/?query=\\{@}"
-msgstr ""
+msgstr "http://directory.fsf.org/search/?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:3
-#, fuzzy
 msgid "Google"
-msgstr "Google სი�ხლეები"
+msgstr "Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:6
 msgid "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:3
 msgid "Google Advanced Search"
-msgstr "Google დეტ�ლური ძიებ�"
+msgstr "Google გ�ფ�რთ�ებული ძებნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop:4
@@ -728,6 +746,11 @@ msgid ""
 "\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\"}"
 "&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
 msgstr ""
+"http://www.google.com/search?as_q=\\{all,@}&num=\\{num,\"10\""
+"}&btnG=Google+Search&as_epq=\\{exact,\"\"}&as_oq=\\{any,\"\"}&as_eq=\\"
+"{without,\"\"}&lr=\\{lang,\"\"}&as_ft=\\{ft,\"i\"}&as_filetype=\\{filetype,\""
+"\"}&as_qdr=\\{date,\"all\"}&as_occt=\\{occ,\"any\"}&as_dt=\\{siteop,\"i\""
+"}&as_sitesearch=\\{site}&safe=\\{safe,\"active\"}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3
@@ -737,22 +760,22 @@ msgstr "Google ჯგუფები"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:6
 msgid "http://groups.google.com/groups?oi=djq&as_q=\\{@}"
-msgstr ""
+msgstr "http://groups.google.com/groups?oi=djq&as_q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:3
 msgid "Google Image Search"
-msgstr "Google ნ�ხ�ტის ძიებ�"
+msgstr "Google სურ�თების ძებნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:6
 msgid "http://images.google.com/images?q=\\{@}"
-msgstr ""
+msgstr "http://images.google.com/images?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:3
 msgid "Google (I'm Feeling Lucky)"
-msgstr "Google (გ�მიმ�რთლ�)"
+msgstr "Google (იღბ�ლ� ვ�რ)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:6
@@ -761,6 +784,8 @@ msgid ""
 "http://www.google.com/search?q=\\{@}&btnI=I%27m+Feeling"
 "+Lucky&ie=UTF-8&oe=UTF-8"
 msgstr ""
+"http://www.google.com/search?q=\\"
+"{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:3
@@ -770,7 +795,7 @@ msgstr "Google ფილმები"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_movie.desktop:6
 msgid "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:3
@@ -780,84 +805,82 @@ msgstr "Google სი�ხლეები"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:6
 msgid "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
+msgstr "http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:3
 msgid "Gracenote"
-msgstr ""
+msgstr "Gracenote"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:6
 msgid "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
-msgstr ""
+msgstr "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5
 msgid "Great Dictionary of the Catalan Language (GRan Enciclopèdia  Catalana)"
-msgstr ""
+msgstr "კ�ტ�ლ�ნური ენი დიდი ლექსიკ�ნი (GRan Enciclopèdia  Catalana)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:6
 msgid "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}"
-msgstr ""
+msgstr "http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:3
 msgid "Hotbot"
-msgstr ""
+msgstr "Hotbot"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:6
 msgid "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2"
-msgstr ""
+msgstr "http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:3
-#, fuzzy
 msgid "HyperDictionary.com"
-msgstr "Тезауру� HyperDictionary.com"
+msgstr "HyperDictionary.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:6
 msgid "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
-msgstr ""
+msgstr "http://www.hyperdictionary.com/search.aspx?define=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:3
 msgid "HyperDictionary.com Thesaurus"
-msgstr "Тезауру� HyperDictionary.com"
+msgstr "თეზ�ურუსი HyperDictionary.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:6
 msgid "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
-msgstr ""
+msgstr "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:3
-#, fuzzy
 msgid "Internet Movie Database"
-msgstr "�შშ პ�ტენტების მ�ნ�ცემთ� ბ�ზ�"
+msgstr "ინტერნეტის ფილმების ბ�ზ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/imdb.desktop:6
 msgid "http://imdb.com/Find?\\{@}"
-msgstr ""
+msgstr "http://imdb.com/Find?\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:5
 msgid "WordReference.com Translation: Italian to English"
-msgstr ""
+msgstr "WordReference.com თ�რგმ�ნი: იტ�ლიურიდ�ნ ინგლისურზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:6
 msgid "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/it/en/translation.asp?iten=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:3
 msgid "Ask Jeeves"
-msgstr ""
+msgstr "ჰკითხეთ Jeeves-ს"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/jeeves.desktop:6
@@ -865,72 +888,73 @@ msgid ""
 "http://www.ask.com/main/askJeeves.asp?"
 "origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
 msgstr ""
+"http://www.ask.com/main/askJeeves."
+"asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:3
 msgid "KataTudo"
-msgstr ""
+msgstr "KataTudo"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:6
 msgid "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar"
-msgstr ""
+msgstr "http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:5
-#, fuzzy
 msgid "KDE API Documentation"
-msgstr "Qt3 ინტერნეტ დ�კუმენტ�ცი�"
+msgstr "KDE API-ის დ�კუმენტ�ცი�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:6
 msgid "http://api.kde.org/classmapper.php?class=\\{@}"
-msgstr ""
+msgstr "http://api.kde.org/classmapper.php?class=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:3
 msgid "KDE WebSVN"
-msgstr ""
+msgstr "KDE WebSVN"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop:6
 msgid "http://websvn.kde.org/\\{@}"
-msgstr ""
+msgstr "http://websvn.kde.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:3
 msgid "LEO-Translate"
-msgstr ""
+msgstr "LEO-თ�რგმ�ნი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:6
 msgid "http://dict.leo.org/?search=\\{@}"
-msgstr ""
+msgstr "http://dict.leo.org/?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:3
 msgid "Lycos"
-msgstr ""
+msgstr "Lycos"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:6
 msgid "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}"
-msgstr ""
+msgstr "http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:3
 msgid "Mamma - Mother of all Search Engines"
-msgstr ""
+msgstr "Mamma - ყველ� ს�ძიებ� სისტემის მშ�ბელი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:6
 msgid "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}"
-msgstr ""
+msgstr "http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:3
 msgid "MetaCrawler"
-msgstr ""
+msgstr "MetaCrawler"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:6
@@ -939,11 +963,14 @@ msgid ""
 "&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-"
 "search&refer=mc-search"
 msgstr ""
+"http://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=m"
+"etaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&t"
+"heme=classic&refer=mc-search&refer=mc-search"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3
 msgid "Microsoft Developer Network Search"
-msgstr ""
+msgstr "ძებნ� Microsoft Developer Network-ში"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:6
@@ -952,22 +979,24 @@ msgid ""
 "handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
 "asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
 msgstr ""
+"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff."
+"asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault."
+"asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:3
 msgid "Netcraft"
-msgstr ""
+msgstr "Netcraft"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:6
 msgid "http://uptime.netcraft.com/up/graph?site=\\{@}"
-msgstr ""
+msgstr "http://uptime.netcraft.com/up/graph?site=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:2
-#, fuzzy
 msgid "Telephonebook Search Provider"
-msgstr "Teletekst ძიების პრ�ვ�იდერი"
+msgstr "ს�ძიებ� სისტემ� Telephonebook"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:6
@@ -978,41 +1007,45 @@ msgid ""
 "&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription=&country=&catcode=&dcity="
 "\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
 msgstr ""
+"http://www.detelefoongids.nl/tginl.dll?action=white&type=search&resultsperpag"
+"e=25&pagestart=1&source=searchcategory&name2=\\{1}&name=&initials=&city=\\{2}"
+"&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription="
+"&country=&catcode=&dcity=\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid="
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:2
 msgid "Teletekst Search Provider"
-msgstr "Teletekst ძიების პრ�ვ�იდერი"
+msgstr "ს�ძიებ� სისტემ� Teletekst"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop:6
 msgid "http://teletekst.nos.nl/gif/\\{@}-01.html"
-msgstr ""
+msgstr "http://teletekst.nos.nl/gif/\\{@}-01.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:3
 msgid "OpenPGP Key Search"
-msgstr "OpenPGP კ�დის ძიებ�"
+msgstr "OpenPGP გ�ს�ღების ძებნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop:4
 msgid "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex"
-msgstr ""
+msgstr "http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/php.desktop:3
 msgid "PHP Search"
-msgstr "PHP ძიებ�"
+msgstr "PHP ძებნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/php.desktop:4
 msgid "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}"
-msgstr ""
+msgstr "http://www.php.net/search.php?show=\\{mode,\"manual\"}&pattern=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/python.desktop:5
 msgid "Python Reference Manual"
-msgstr ""
+msgstr "Python-ის ს�ხელმძღვ�ნელ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/python.desktop:6
@@ -1021,17 +1054,18 @@ msgid ""
 "http://www.google.com/search?sourceid=python-search&q=\\{@}"
 "&submit=Search&q=site%3Apython.org"
 msgstr ""
+"http://www.google.com/search?sourceid=python-search&q=\\"
+"{@}&submit=Search&q=site%3Apython.org"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/qt.desktop:5
-#, fuzzy
 msgid "Latest Qt Online Documentation"
-msgstr "Qt3 ინტერნეტ დ�კუმენტ�ცი�"
+msgstr "Qt-ის �ნლ�ინ დ�კუმენტ�ცი�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/qt.desktop:6
 msgid "http://doc.trolltech.com/latest/\\{@}.html"
-msgstr ""
+msgstr "http://doc.trolltech.com/latest/\\{@}.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:5
@@ -1041,12 +1075,12 @@ msgstr "Qt3 ინტერნეტ დ�კუმენტ�ცი�"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/qt3.desktop:6
 msgid "http://doc.trolltech.com/3.3/\\{@}.html"
-msgstr ""
+msgstr "http://doc.trolltech.com/3.3/\\{@}.html"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:5
 msgid "Dictionary of the Spanish Academy (RAE)"
-msgstr ""
+msgstr "ესპ�ნეთის მეცნიერებ�თ� �კ�დემიის(RAE) ლექსიკ�ნი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:6
@@ -1054,41 +1088,43 @@ msgid ""
 "http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}"
 "&FORMATO=ampliado"
 msgstr ""
+"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\"
+"{@}&FORMATO=ampliado"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3
 msgid "IETF Requests for Comments"
-msgstr ""
+msgstr "IETF კ�მენტ�რების მ�თხ�ვნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:4
 msgid "http://www.ietf.org/rfc/rfc\\{@}.txt"
-msgstr ""
+msgstr "http://www.ietf.org/rfc/rfc\\{@}.txt"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:3
 msgid "RPM-Find"
-msgstr "RPM-პ�ვნ�"
+msgstr "RPM-Find"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:6
 msgid "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}"
-msgstr ""
+msgstr "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:3
 msgid "Ruby Application Archive"
-msgstr ""
+msgstr "Ruby-ის �პლიკ�ციების �რქივი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:6
 msgid "http://raa.ruby-lang.org/search.rhtml?search=\\{@}"
-msgstr ""
+msgstr "http://raa.ruby-lang.org/search.rhtml?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:3
 msgid "GO.com"
-msgstr ""
+msgstr "GO.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:6
@@ -1096,11 +1132,13 @@ msgid ""
 "http://www.go.com/Titles?col=WW&qt=\\{@}"
 "&svx=home_searchbox&sv=IS&lk=noframeso"
 msgstr ""
+"http://www.go.com/Titles?col=WW&qt=\\"
+"{@}&svx=home_searchbox&sv=IS&lk=noframeso"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3
 msgid "SourceForge"
-msgstr ""
+msgstr "SourceForge"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:4
@@ -1108,53 +1146,53 @@ msgid ""
 "http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact="
 "\\{exact,\"0\"}&words=\\{@}"
 msgstr ""
+"http://sourceforge.net/search/?type_of_search=\\{type,\"soft\"}&exact=\\"
+"{exact,\"0\"}&words=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
-#, fuzzy
 msgid "Technorati"
-msgstr "Technorati-ს ჭდეები"
+msgstr "სტ�ტიები Technorati-ზე"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
 msgid "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}"
-msgstr ""
+msgstr "http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:3
 msgid "Technorati Tags"
-msgstr "Technorati-ს ჭდეები"
+msgstr "Technorati-ის ჭდეები"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop:6
 msgid "http://technorati.com/tag/\\{@}?sourceid=kde-search"
-msgstr ""
+msgstr "http://technorati.com/tag/\\{@}?sourceid=kde-search"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:3
-#, fuzzy
 msgid "Merriam-Webster Thesaurus"
-msgstr "Словарь Merriam-Webster"
+msgstr "თეზ�ურუსი Merriam-Webster"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop:6
 msgid "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}"
-msgstr ""
+msgstr "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:4
 msgid "TV Tome"
-msgstr ""
+msgstr "TV Tome"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/tvtome.desktop:6
 msgid "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0"
-msgstr ""
+msgstr "http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:5
 msgid "U.S. Patent Database"
-msgstr "�შშ პ�ტენტების მ�ნ�ცემთ� ბ�ზ�"
+msgstr "�შშ პ�ტენტების ბ�ზ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/uspto.desktop:6
@@ -1162,11 +1200,13 @@ msgid ""
 "http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}"
 "&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 msgstr ""
+"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\"
+"{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3
 msgid "Vivisimo"
-msgstr "ვივისიმ�"
+msgstr "Vivisimo"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:6
@@ -1175,11 +1215,13 @@ msgid ""
 "http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD"
 "%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16"
 msgstr ""
+"http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD"
+"%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:3
 msgid "Voila"
-msgstr ""
+msgstr "Voila"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:6
@@ -1187,67 +1229,70 @@ msgid ""
 "http://search.ke.voila.fr/S/voila?"
 "lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
 msgstr ""
+"http://search.ke.voila.fr/S/"
+"voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:3
 msgid "Merriam-Webster Dictionary"
-msgstr "Словарь Merriam-Webster"
+msgstr "Merriam-Webster-ის ლექსიკ�ნი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/webster.desktop:6
 msgid "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}"
-msgstr ""
+msgstr "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:3
 msgid "Whatis Query"
-msgstr "მ�თხ�ვნ� - რ� �რის"
+msgstr "Whatis მ�თხ�ვნ�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:6
 msgid ""
 "http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}"
 msgstr ""
+"http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:3
 msgid "Wikipedia - The Free Encyclopedia"
-msgstr "ვიკიპედი� - ღი� ენციკლ�პედი�"
+msgstr "Wikipedia - უფ�ს� ენციკლ�პედი�"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:6
 msgid "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
-msgstr ""
+msgstr "http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3
 msgid "Wiktionary - The Free Dictionary"
-msgstr "Wiktionary - თ�ვისუფ�ლი ლექსიკ�ნი"
+msgstr "Wiktionary - უფ�ს� ლექსიკ�ნი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6
 msgid "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
-msgstr ""
+msgstr "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:5
 msgid "WordReference.com English Dictionary"
-msgstr ""
+msgstr "WordReference.com ინგლისური ლექსიკ�ნი"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wordref.desktop:6
 msgid "http://www.wordreference.com/english/definition.asp?en=\\{@}"
-msgstr ""
+msgstr "http://www.wordreference.com/english/definition.asp?en=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/localdomain/localdomainurifilter.desktop:3
 msgid "LocalDomainFilter"
-msgstr ""
+msgstr "გ�ფილტვრ� დ�მენით local"
 
 #. Name
 #: ebrowsing/plugins/shorturi/tdeshorturifilter.desktop:3
 msgid "ShortURIFilter"
-msgstr ""
+msgstr "მ�კლე URL-ის ფილტრი"
 
 #. Name
 #: energy/energy.desktop:11
@@ -1257,7 +1302,7 @@ msgstr "კვების კ�ნტრ�ლი"
 #. Comment
 #: energy/energy.desktop:13
 msgid "Settings for display power management"
-msgstr "დისპლეის კვების მ�ნეჯმენტის კ�ნფიგურ�ცი�"
+msgstr "პ�რ�მეტრები ეკრ�ნის კვების ს�მ�რთ�ვ�დ"
 
 #. Keywords
 #: energy/energy.desktop:15
@@ -1269,17 +1314,19 @@ msgstr ""
 #. Name
 #: filetypes/filetypes.desktop:12
 msgid "File Associations"
-msgstr "ფ�ილთ� მიბმ�"
+msgstr "ფ�ილის �ს�ცი�ციები"
 
 #. Comment
 #: filetypes/filetypes.desktop:14
 msgid "Configure file associations"
-msgstr "ფ�ილთ� მიბმის კ�ნფიგურირებ�"
+msgstr "ფ�ილის �ს�ცი�ციების მ�რგებ�"
 
 #. Keywords
 #: filetypes/filetypes.desktop:16
 msgid "Filetypes;File Associations;Mime Types;File Patterns;Files;Pattern;"
 msgstr ""
+"Filetypes;File Associations;Mime Types;File Patterns;Files;Pattern;ნიმუში;"
+"ფ�ილის ნიმუშები;ფ�ილის �ს�ცი�ცი�;"
 
 #. Name
 #: fonts/fonts.desktop:12 konqhtml/tdehtml_fonts.desktop:11
@@ -1290,7 +1337,7 @@ msgstr "ფ�ნტები"
 #. Comment
 #: fonts/fonts.desktop:14
 msgid "Font settings"
-msgstr "ფ�ნტების კ�ნფიგურ�ცი�"
+msgstr "ფ�ნტის პ�რ�მეტრები"
 
 #. Keywords
 #: fonts/fonts.desktop:16
@@ -1305,52 +1352,49 @@ msgstr ""
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:2
 msgid "tdehwdevicetray"
-msgstr ""
+msgstr "tdehwdevicetray"
 
 #. GenericName
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2
 #: hwmanager/hwdevicetray.desktop:4
-#, fuzzy
 msgid "Device Monitor"
-msgstr "რ�მდენიმე მ�ნიტ�რი"
+msgstr "მ�წყ�ბილ�ბის მ�ნიტ�რი"
 
 #. Comment
 #: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
 msgid "Monitor hardware devices from the system tray"
-msgstr ""
+msgstr "�პ�რ�ტურული მ�წყ�ბილ�ბების მ�ნიტ�რინგი სისტემურ ს��თთ�ნ"
 
 #. Name
 #: hwmanager/hwmanager.desktop:11
-#, fuzzy
 msgid "Device Manager"
-msgstr "სერვის მენეჯერი"
+msgstr "მ�წყ�ბილ�ბის მმ�რთველი"
 
 #. Comment
 #: hwmanager/hwmanager.desktop:13
-#, fuzzy
 msgid "Configure hardware devices"
-msgstr "ბრ�უზერის ქცევის კ�ნფიგურ�ცი�"
+msgstr "�პ�რ�ტურული მ�წყ�ბილ�ბების მ�რგებ�"
 
 #. Keywords
 #: hwmanager/hwmanager.desktop:15
 msgid "hardware;devices;manager;"
-msgstr ""
+msgstr "hardware;devices;manager;�პ�რ�ტურ�;მ�რთვ�;მ�წყ�ბილ�ბ�;"
 
 #. Comment
 #: iccconfig/iccconfig.desktop:14
 msgid "Configure display ICC color profile"
-msgstr ""
+msgstr "ეკრ�ნის ICC ფერი პრ�ფილის მ�რგებ�"
 
 #. Keywords
 #: iccconfig/iccconfig.desktop:16
 msgid "ICC;display;color;profile;"
-msgstr ""
+msgstr "ICC;display;color;profile;ეკრ�ნი;ფერი;პრ�ფილი;"
 
 #. Name
 #: iccconfig/iccconfig.desktop:18
 msgid "Color Profile"
-msgstr ""
+msgstr "ფერის პრ�ფილი"
 
 #. Name
 #: icons/icons.desktop:12
@@ -1360,7 +1404,7 @@ msgstr "ხ�ტულები"
 #. Comment
 #: icons/icons.desktop:14
 msgid "Customize TDE Icons"
-msgstr "TDE–ს ხ�ტულების კ�ნფიგურ�ცი�"
+msgstr "TDE–ის ხ�ტულების მ�რგებ�"
 
 #. Keywords
 #: icons/icons.desktop:16
@@ -1369,19 +1413,20 @@ msgstr "ხ�ტულები;ეფექტები;ზ�მ�;მ�ღ
 
 #. Name
 #: info/cdinfo.desktop:12
-#, fuzzy
 msgid "CD-ROM Information"
-msgstr "ინფ�რმ�ცი� DMA–ს შეს�ხებ"
+msgstr "ინფ�რმ�ცი� CD-ROM–ის შეს�ხებ"
 
 #. Comment
 #: info/cdinfo.desktop:14
 msgid "CD/DVD Drive Capabilites"
-msgstr ""
+msgstr "CD/DVD �მძრ�ვის შეს�ძლებლ�ბები"
 
 #. Keywords
 #: info/cdinfo.desktop:16
 msgid "CD-ROM Information;CD-ROM;CD;CD Drive;Writer Capabilities;"
 msgstr ""
+"CD-ROM Information;CD-ROM;CD;CD Drive;Writer "
+"Capabilities;შეს�ძლებლ�ბ�;ჩ�მწერი;"
 
 #. Name
 #: info/devices.desktop:13
@@ -1391,13 +1436,14 @@ msgstr "მ�წყ�ბილ�ბები"
 #. Comment
 #: info/devices.desktop:15
 msgid "Attached devices information"
-msgstr "ცნ�ბები მიერთებულ მ�წყ�ბილ�ბებზე"
+msgstr "ინფ�რმ�ცი� მიერთებულ მ�წყ�ბილ�ბებზე"
 
 #. Keywords
 #: info/devices.desktop:17
-#, fuzzy
 msgid "dev;Devices;System Information;Information;"
-msgstr "dma;DMA-�რხები;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
+msgstr ""
+"dev;Devices;System Information;Information;ინფ�რმ�ცი� სისტემის "
+"შეს�ხებ;ინფ�რმ�ცი�;"
 
 #. Name
 #: info/dma.desktop:13
@@ -1407,7 +1453,7 @@ msgstr "DMA �რხები"
 #. Comment
 #: info/dma.desktop:15
 msgid "DMA information"
-msgstr "ინფ�რმ�ცი� DMA–ს შეს�ხებ"
+msgstr "ინფ�რმ�ცი� DMA–ის შეს�ხებ"
 
 #. Keywords
 #: info/dma.desktop:17
@@ -1417,17 +1463,17 @@ msgstr "dma;DMA-áƒ�რხები;ინფáƒ�რმáƒ�ციáƒ� სისტáƒ
 #. Name
 #: info/interrupts.desktop:13
 msgid "Interrupts"
-msgstr "წყვიტ�ვს"
+msgstr "წყვეტები"
 
 #. Comment
 #: info/interrupts.desktop:15
 msgid "Interrupt information"
-msgstr "ინფ�რმ�ცი� შეწყვეტყის შეს�ხებ"
+msgstr "ინფ�რმ�ცი� წყვეტებზე"
 
 #. Keywords
 #: info/interrupts.desktop:17
 msgid "Interrupts;IRQ;System Information;"
-msgstr "წყვიტ�ვს;IRQ;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
+msgstr "წყვეტები;IRQ;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
 
 #. Name
 #: info/ioports.desktop:13
@@ -1443,6 +1489,8 @@ msgstr "ინფáƒ�რმáƒ�ციáƒ� IO–პáƒ�რტების შესáƒ
 #: info/ioports.desktop:17
 msgid "IO;I/O;IO-Ports;I/O-Ports;Ports;IO-Range;I/O-Range;System Information;"
 msgstr ""
+"IO;I/O;IO-Ports;I/O-Ports;Ports;IO-Range;I/O-Range;System "
+"Information;IO-შუ�ლედი;IO პ�რტები;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
 
 #. Name
 #: info/memory.desktop:12
@@ -1466,12 +1514,12 @@ msgstr ""
 #. Name
 #: info/opengl.desktop:13
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
 #. Comment
 #: info/opengl.desktop:15
 msgid "OpenGL information"
-msgstr "ცნ�ბები OpenGL -ს შეს�ხებ"
+msgstr "ინფ�რმ�ცი� OpenGL ის შეს�ხებ"
 
 #. Keywords
 #: info/opengl.desktop:17
@@ -1485,34 +1533,34 @@ msgstr ""
 #. Name
 #: info/partitions.desktop:13
 msgid "Partitions"
-msgstr "გ�ნ�ყ�ფები"
+msgstr "დ�ნ�ყ�ფები"
 
 #. Comment
 #: info/partitions.desktop:15
 msgid "Partition information"
-msgstr "ცნ�ბები გ�მ�ყენებული რესურსების შეს�ხებ"
+msgstr "ცნ�ბები დ�ნ�ყ�ფების შეს�ხებ"
 
 #. Keywords
 #: info/partitions.desktop:17
-#, fuzzy
 msgid "Partitions;Harddrive;HD;System Information;"
-msgstr "პრ�ცეს�რი;CPU;FPU;MHz;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
+msgstr "დ�ნ�ყ�ფი;მყ�რი დისკი;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
 
 #. Name
 #: info/pci.desktop:12
 msgid "PCI"
-msgstr ""
+msgstr "PCI"
 
 #. Comment
 #: info/pci.desktop:14
 msgid "PCI information"
-msgstr "ცნ�ბები PCI მ�წყ�ბილ�ბების შეს�ხებ"
+msgstr "ინფ�რმ�ცი� PCI მ�წყ�ბილ�ბების შეს�ხებ"
 
 #. Keywords
 #: info/pci.desktop:16
-#, fuzzy
 msgid "PCI;PCI-Devices;PCI-Bus;System Information;"
-msgstr "წყვიტ�ვს;IRQ;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
+msgstr ""
+"PCI;PCI-Devices;PCI-Bus;System Information;ინფ�რმ�ცი� სისტემის შეს�ხებ;PCI "
+"მ�წყ�ბილ�ბები;"
 
 #. Name
 #: info/processor.desktop:12
@@ -1532,18 +1580,17 @@ msgstr "პრáƒ�ცესáƒ�რი;CPU;FPU;MHz;ინფáƒ�რმáƒ�ციáƒ� á
 #. Name
 #: info/scsi.desktop:12
 msgid "SCSI"
-msgstr ""
+msgstr "SCSI"
 
 #. Comment
 #: info/scsi.desktop:14
 msgid "SCSI information"
-msgstr "ინფ�რმ�ცი� SCSI–ს შეს�ხებ"
+msgstr "ინფ�რმ�ცი� SCSI–ის შეს�ხებ"
 
 #. Keywords
 #: info/scsi.desktop:16
-#, fuzzy
 msgid "SCSI;SCSI-Bus;System Information;"
-msgstr "წყვიტ�ვს;IRQ;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
+msgstr "SCSI;SCSI-Bus;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
 
 #. Name
 #: info/sound.desktop:12
@@ -1563,12 +1610,12 @@ msgstr "ხმ�;�უდი�;�უდი�დ�ბ�;MIDI;OSS;ინფ
 #. Name
 #: info/xserver.desktop:12
 msgid "X-Server"
-msgstr "X-სერვერი"
+msgstr "X-Server"
 
 #. Comment
 #: info/xserver.desktop:14
 msgid "X-Server information"
-msgstr "ინფ�რმ�ცი� X-სერვერის შეს�ხებ"
+msgstr "ინფ�რმ�ცი� X-Server-ის შეს�ხებ"
 
 #. Keywords
 #: info/xserver.desktop:16
@@ -1579,12 +1626,12 @@ msgstr ""
 #. Name
 #: input/mouse.desktop:13
 msgid "Mouse"
-msgstr "თ�გვი"
+msgstr "თ�გუნ�"
 
 #. Comment
 #: input/mouse.desktop:15
 msgid "Mouse settings"
-msgstr "თ�გვის კ�ნფიგურ�ცი�"
+msgstr "თ�გუნ�ს მ�რგებ�"
 
 #. Keywords
 #: input/mouse.desktop:17
@@ -1593,6 +1640,31 @@ msgid ""
 "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
 "DoubleClick;mapping;right handed;left handed;"
 msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button "
+"Mapping;Click;icons;feedback;Pointers;Drag;DoubleClick;mapping;right handed;"
+"left handed;ც�ცი�;თ�გუნ�;თ�გუნ�ს �ჩქ�რებ�;თ�გუნ�ს პ�რ�მეტრები;მ�ნიშვნ�;"
+"კურს�რის ფ�რმ�;ღილ�კების მინიჭებ�;დ�წკ�პუნებ�;უკუკ�ვშირი;კურს�რი;"
+
+#. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "თ�ჩპედი"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "თ�ჩპედის მ�რგებ�"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button "
+"Mapping;Tap;Click;mapping;right handed;left handed;ც�ცი�;თ�ჩპედი;შეყვ�ნის "
+"მ�წყ�ბილ�ბები;თ�გუნ�;მ�რცხენ� წკ�პი;"
 
 #. Name
 #: joystick/joystick.desktop:12
@@ -1602,43 +1674,43 @@ msgstr "ჯ�ისტიკი"
 #. Comment
 #: joystick/joystick.desktop:14
 msgid "Joystick - a kcontrol module to test Joysticks"
-msgstr "Joystick -  kcontrol მ�დული ჯ�ისტიკის ტესტირებისთვის"
+msgstr "Joystick - kcontrol მ�დული ჯ�ისტიკის დ�ს�ტესტ�დ"
 
 #. Keywords
 #: joystick/joystick.desktop:16
 msgid "joystick;gamepad;"
-msgstr ""
+msgstr "joystick;gamepad;ჯ�ისტიკი;გეიმპ�დი;"
 
 #. Name
 #: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8
 #: kcontrol/tde-kcontrol.desktop:8
 msgid "Trinity Control Center"
-msgstr "ს�კ�ნტრ�ლ� ცენტრი"
+msgstr "Trinity-ის კ�ნტრ�ლის ცენტრი"
 
 #. Name
 #: kded/kcmkded.desktop:11
 msgid "Service Manager"
-msgstr "სერვის მენეჯერი"
+msgstr "სერვისების მმ�რთველი"
 
 #. Comment
 #: kded/kcmkded.desktop:13
 msgid "System Services Configuration"
-msgstr "სისტემური სერვისების კ�ნფიგურ�ცი�"
+msgstr "სისტემური სერვისების მ�რგებ�"
 
 #. Keywords
 #: kded/kcmkded.desktop:15
 msgid "KDED;Daemon;Services;"
-msgstr ""
+msgstr "KDED;Daemon;Services;დემ�ნი;სერვისები;"
 
 #. Name
 #: keys/keys.desktop:12
 msgid "Keyboard Shortcuts"
-msgstr "კლ�ვიშების მ�ლს�ხმ�ბი"
+msgstr "კლ�ვი�ტურის მ�ლს�ხმ�ბები"
 
 #. Comment
 #: keys/keys.desktop:14
 msgid "Configuration of keybindings"
-msgstr "კლ�ვიშთ� წყვილების კ�ნფიგურ�ცი�"
+msgstr "ღილ�კების �ს�ხვის მ�რგებ�"
 
 #. Keywords
 #: keys/keys.desktop:16
@@ -1646,6 +1718,8 @@ msgid ""
 "Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application "
 "shortcuts;"
 msgstr ""
+"Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application "
+"shortcuts;მ�ლს�ხმ�ბები;ღილ�კები;ღილ�კების სქემ�;"
 
 #. Name
 #: kicker/kicker_config.desktop:11
@@ -1655,7 +1729,7 @@ msgstr "გ�ნლ�გებ�"
 #. Comment
 #: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13
 msgid "Configure the arrangement of the panel"
-msgstr "�ქ შეგიძლი�თ პ�ნელის თ�ნმიმდევრულ�ბის კ�ნფიგურ�ცი�"
+msgstr "პ�ნელის გ�ნლ�გების მ�რგებ�"
 
 #. Keywords
 #: kicker/kicker_config.desktop:15 kicker/kicker_config_appearance.desktop:15
@@ -1668,6 +1742,11 @@ msgid ""
 "bookmarks;recent documents;quickbrowser;browser menu;menu;icons;tiles;"
 "applets;startup;highlight;handles;zooming icons;"
 msgstr ""
+"kicker;panel;kpanel;taskbar;startbar;launchbar;location;size;auto "
+"hide;hide;buttons;animation;background;themes;menu cache;cache;hidden;TDE "
+"Menu;bookmarks;recent documents;quickbrowser;browser "
+"menu;menu;icons;tiles;applets;startup;highlight;handles;zooming icons;ხ�ტულებ"
+"ი;პ�ნელი;�ნიმ�ცი�;ფ�ნი;მენიუ;ს�ნიშნეები;ბრ�უზერი;�ვტ�დ�მ�ლვ�;მდებ�რე�ბ�;"
 
 #. Name
 #: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11
@@ -1677,22 +1756,22 @@ msgstr "გ�რეგნ�ბ�"
 #. Comment
 #: kicker/kicker_config_appearance.desktop:13
 msgid "Configure the appearance of the panel"
-msgstr "�ქ შეგიძლი�თ პ�ნელის გ�რეგნ�ბის კ�ნფიგურ�ცი�"
+msgstr "პ�ნელის გ�რეგნ�ბის მ�რგებ�"
 
 #. Name
 #: kicker/kicker_config_arrangement.desktop:11
 msgid "Arrangement"
-msgstr "გ�ნთ�ვსებ�"
+msgstr "გ�ნლ�გებ�"
 
 #. Name
 #: kicker/kicker_config_hiding.desktop:11
 msgid "Hiding"
-msgstr "დ�მ�ლვ�"
+msgstr "დ�მ�ლული"
 
 #. Comment
 #: kicker/kicker_config_hiding.desktop:13
 msgid "Configure the hiding of the panel"
-msgstr "�ქ შეგიძლი�თ პ�ნელის დ�მ�ლვის მითითებ�"
+msgstr "პ�ნელის დ�მ�ლვის მ�რგებ�"
 
 #. Name
 #: kicker/kicker_config_menus.desktop:11
@@ -1702,7 +1781,7 @@ msgstr "მენიუები"
 #. Comment
 #: kicker/kicker_config_menus.desktop:13
 msgid "Configure the menus of the panel"
-msgstr "�ქ შეგიძლი�თ პ�ნელის მენიუების გ�მ�რთვ�"
+msgstr "პ�ნელის მენიუების მ�რგებ�"
 
 #. Name
 #: kicker/panel.desktop:10
@@ -1712,7 +1791,7 @@ msgstr "პ�ნელები"
 #. Comment
 #: kicker/panel.desktop:12
 msgid "Configure the arrangement of the panels"
-msgstr "პ�ნელის თ�ნმიმდევრულ�ბის კ�ნფიგურ�ცი�"
+msgstr "პ�ნელები გ�ნლ�გების მ�რგებ�"
 
 #. Name
 #: knotify/kcmnotify.desktop:11
@@ -1722,7 +1801,7 @@ msgstr "სისტემური შეტყ�ბინებები"
 #. Comment
 #: knotify/kcmnotify.desktop:13
 msgid "System Notification Configuration"
-msgstr "სისტემური შეტყ�ბინებების კ�ნფიგურ�ცი�"
+msgstr "სისტემური შეტყ�ბინებების მ�რგებ�"
 
 #. Keywords
 #: knotify/kcmnotify.desktop:15
@@ -1732,12 +1811,12 @@ msgstr "სისტემის ხმები;áƒ�უდიáƒ�;ხმáƒ�;შáƒ
 #. Name
 #: konq/desktop.desktop:11
 msgid "Multiple Desktops"
-msgstr "მრ�ვ�ლ დ�ფი�ნი რეჟიმი"
+msgstr "ერთზე მეტი ს�მუშ�� მ�გიდ�"
 
 #. Comment
 #: konq/desktop.desktop:13
 msgid "You can configure how many virtual desktops there are"
-msgstr "თქვენ შეგიძლი�თ ვირტუ�ლური ს�მუშ�� მ�გიდების რ��დენ�ბის კ�ნფიგურ�ცი�"
+msgstr "შეგიძლი�თ, მ�ირგ�თ, რ�მდენი ვირტუ�ლური ს�მუშ�� მ�გიდ� �რსებ�ბს"
 
 #. Keywords
 #: konq/desktop.desktop:15
@@ -1752,7 +1831,7 @@ msgstr "ქცევ�"
 #. Comment
 #: konq/desktopbehavior.desktop:14
 msgid "You can configure how the desktop behaves here"
-msgstr "ს�მუშ�� დ�ფის ქცვის კ�ნფიგურ�ცი�"
+msgstr "�ქ შეგიძლი�თ, მ�ირგ�თ, რ�გ�რ იქცევ� ს�მუშ�� მ�გიდ�"
 
 #. Keywords
 #: konq/desktopbehavior.desktop:16
@@ -1760,26 +1839,31 @@ msgid ""
 "konqueror;filemanager;kfm;tips;file tips;separate window;spawn windows;"
 "behavior;behaviour;memory usage;Home URL;"
 msgstr ""
+"konqueror;filemanager;kfm;tips;file tips;separate window;spawn "
+"windows;behavior;behaviour;memory usage;Home URL;ს�წყისი ბმული;ქცევ�;"
+"მეხსიერების გ�მ�ყენებ�;ფ�ილების მ�რთვ�;"
 
 #. Name
 #: konq/desktoppath.desktop:11
 msgid "Paths"
-msgstr "ბილიკი"
+msgstr "ბილიკები"
 
 #. Comment
 #: konq/desktoppath.desktop:13
 msgid "Change the location important files are stored"
-msgstr "მნიშვნელ�ვ�ნი ფ�ილბის გეზის ცვლილებ� შენ�ხული�"
+msgstr "მნიშვნელ�ვ�ნი ფ�ილების მდებ�რე�ბის შეცვლ�"
 
 #. Keywords
 #: konq/desktoppath.desktop:15
 msgid "konqueror;filemanager;paths;desktop;directories;autostart;"
 msgstr ""
+"konqueror;filemanager;paths;desktop;directories;autostart;ფ�ილების "
+"მმ�რთველი;ბილიკები;ს�ქ�ღ�ლდეები;�ვტ�გ�შვებ�;"
 
 #. Comment
 #: konq/fileappearance.desktop:13
 msgid "Configure how Konqueror looks as a file manager"
-msgstr "Konqueror-ის, რ�გ�რც ფ�ილური მენეჯერის, იერის კ�ნფიგურირებ�"
+msgstr "მ�ირგეთ, რ�გ�რ გ�მ�იყურებ� Konqueror ფ�ილების მმ�რთველის რ�ლში"
 
 #. Keywords
 #: konq/fileappearance.desktop:15 konq/filebrowser.desktop:16
@@ -1787,11 +1871,14 @@ msgid ""
 "konqueror;filemanager;word wrap;wrap;underline;display;filesize;bytes;font;"
 "color;colour;"
 msgstr ""
+"konqueror;filemanager;word "
+"wrap;wrap;underline;display;filesize;bytes;font;color;colour;ფერები;ეკრ�ნი;"
+"ფ�ილის ზ�მ�;ხ�ზგ�სმ�;ხ�ზის გ�დ�ტ�ნ�;"
 
 #. Comment
 #: konq/filebehavior.desktop:13
 msgid "Configure how Konqueror behaves as a file manager"
-msgstr "Konqueror-ის, რ�გ�რც ფ�ილური მენეჯერის, ქცევის კ�ნფიგურირებ�"
+msgstr "მ�ირგეთ, რ�გ�რ იქცევ� Konqueror, რ�გ�რც ფ�ილების მმ�რთველი"
 
 #. Keywords
 #: konq/filebehavior.desktop:15
@@ -1800,36 +1887,42 @@ msgid ""
 "behavior;behaviour;memory usage;Home URL;network operations;progress dialog;"
 "trash can;delete;confirmation;"
 msgstr ""
+"konqueror;filemanager;kfm;tips;file tips;separate window;spawn "
+"windows;behavior;behaviour;memory usage;Home URL;network operations;progress "
+"dialog;trash can;delete;confirmation;დ�დ�სტურებ�;წ�შლ�;ქცევ�;მეხსიერებ�;"
+"ფ�ილების მ�რთვ�;"
 
 #. Comment
 #: konq/filebrowser.desktop:14
 msgid "You can configure Konqueror's file manager mode here"
-msgstr "�ქ შეგიძლი�თ დ��კ�ნფიგურირ�თ Konqueror ფ�ილური მენეჯერის რეჟიმი"
+msgstr "�ქ შეგიძლი�თ, Konqueror-ის ფ�ილების მმ�რთველის რეჟიმი მ�ირგ�თ"
 
 #. Name
 #: konq/filepreviews.desktop:11
 msgid "Previews & Metadata"
-msgstr "წინ�სწ�რ ხედვ� დ� მეტ� მ�ნ�ცემები"
+msgstr "მინი�ტურები დ� მეტ�მ�ნ�ცემები"
 
 #. Comment
 #: konq/filepreviews.desktop:13
 msgid "Configure how Konqueror Previews & Meta-data work"
-msgstr "წინ�სწ�რ ხედვის დ� მეტ� მ�ნ�ცემების კ�ნფიგურირებ� Konqueror-ში"
+msgstr "მ�ირგეთ, რ�გ�რ მუშ��ბს მინი�ტურები დ� მეტ�მ�ნ�ცემები Konqueror-ში"
 
 #. Keywords
 #: konq/filepreviews.desktop:15
 msgid "konqueror;filemanager;previews;file previews;maximum size;"
 msgstr ""
+"konqueror;filemanager;previews;file previews;maximum size;მ�ქსიმ�ლური "
+"ზ�მ�;მინი�ტურ�;ფ�ილების მ�რთვ�;"
 
 #. Name
 #: konqhtml/tdehtml_behavior.desktop:11
 msgid "Web Behavior"
-msgstr "წევ ქცევ�"
+msgstr "ვების ქცევ�"
 
 #. Comment
 #: konqhtml/tdehtml_behavior.desktop:13
 msgid "Configure the browser behavior"
-msgstr "ბრ�უზერის ქცევის კ�ნფიგურ�ცი�"
+msgstr "ბრ�უზერის ქცევის მ�რგებ�"
 
 #. Keywords
 #: konqhtml/tdehtml_behavior.desktop:15
@@ -1837,69 +1930,74 @@ msgid ""
 "konqueror;kfm;browser;html;web;www;fonts;colours;colors;java;javascript;"
 "cursor;links;images;charsets;character sets;encoding;"
 msgstr ""
+"konqueror;kfm;browser;html;web;www;fonts;colours;colors;java;javascript;curso"
+"r;links;images;charsets;character "
+"sets;encoding;კ�დირებ�;სიმბ�ლ�ები;კურს�რი;ფ�ნტები;ვები;ბრ�უზერი;ბმულები;"
 
 #. Name
 #: konqhtml/tdehtml_filter.desktop:10
 msgid "AdBlocK Filters"
-msgstr "AdBlocK ფილტრები"
+msgstr "AdBlocK -ის ფილტრები"
 
 #. Comment
 #: konqhtml/tdehtml_filter.desktop:12
 msgid "Configure Konqueror AdBlocK filters"
-msgstr "Configure Konqueror AdBlocK ფილტრები"
+msgstr "Konqueror-ის AdBlock-ის ფილტრების მ�რგებ�"
 
 #. Comment
 #: konqhtml/tdehtml_fonts.desktop:13
 msgid "Configure the fonts used on web pages"
-msgstr "ვებ გვერდების შრიფტების კ�ნფიგურ�ცი�"
+msgstr "ვებგვერდების გ�მ�ყენებული ფ�ნტების მ�რგებ�"
 
 #. Keywords
 #: konqhtml/tdehtml_fonts.desktop:15
 msgid ""
 "konqueror;kfm;browser;html;web;www;fonts;charsets;character sets;encoding;"
 msgstr ""
+"konqueror;kfm;browser;html;web;www;fonts;charsets;character "
+"sets;encoding;კ�დირებ�;ფ�ნტები;ვები;"
 
 #. Name
 #: konqhtml/tdehtml_java_js.desktop:11
 msgid "Java & JavaScript"
-msgstr "Java დ� JavaScript"
+msgstr "Java & JavaScript"
 
 #. Comment
 #: konqhtml/tdehtml_java_js.desktop:13
 msgid "Configure the behavior of Java and JavaScript"
-msgstr "Java დ� JavaScript -ის ქცევის კ�ნფიგურ�ცი�"
+msgstr "Java-ის დ� JavaScript-ის ქცევის მ�რგებ�"
 
 #. Keywords
 #: konqhtml/tdehtml_java_js.desktop:15
 msgid "konqueror;kfm;browser;html;web;www;java;javascript;"
-msgstr ""
+msgstr "konqueror;kfm;browser;html;web;www;java;javascript;ვები;"
 
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
-#, fuzzy
 msgid "User Interface"
-msgstr "ქსელური ინტერფეისები"
+msgstr "მ�მხმ�რებლის ინტერფეისი"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
-#, fuzzy
 msgid "Configure user interface options"
-msgstr "ვებ კეშის პ�რ�მეტრების კ�ნფიგურ�ცი�"
+msgstr "მ�მხმ�რებლის ინტერფეისის მ�რგებ�"
 
 #. Keywords
 #: konqhtml/tdehtml_userinterface.desktop:15
 msgid "konqueror;kfm;user;interface;tabbed;browsing;"
 msgstr ""
+"konqueror;kfm;user;interface;tabbed;browsing;ბრ�უზერი;მ�მხმ�რებელი;ინტერფეისი"
+";"
 
 #. Name
 #: konsole/kcmkonsole.desktop:10
 msgid "Konsole"
-msgstr "კ�ნს�ლი"
+msgstr "Konsole"
 
 #. Comment
 #: konsole/kcmkonsole.desktop:12
 msgid "Konsole configuration module"
-msgstr "კ�ნს�ლის კ�ნფიგურ�ციის მ�დული"
+msgstr "Konsole-ის კ�ნფიგურ�ციის მ�დული"
 
 #. Keywords
 #: konsole/kcmkonsole.desktop:14
@@ -1907,6 +2005,8 @@ msgid ""
 "konsole;schema;konsole background;colors;background;terminal application;"
 "terminal;"
 msgstr ""
+"konsole;schema;konsole background;colors;background;terminal "
+"application;terminal;ტერმინ�ლი;ფერები;ფ�ნი;ტერმინ�ლის �პლიკ�ცი�;"
 
 #. Name
 #: kthememanager/installktheme.desktop:2
@@ -1916,27 +2016,27 @@ msgstr "TDE-ს თემების დ�ყენებ�"
 #. Comment
 #: kthememanager/kthememanager.desktop:2
 msgid "Manage global TDE visual themes"
-msgstr "TDE-ს ვიზუ�ლური თემბის გლ�ბ�ლური მენეჯმენტი"
+msgstr "გლ�ბ�ლური TDE-ს ვიზუ�ლური თემების მ�რთვ�"
 
 #. Keywords
 #: kthememanager/kthememanager.desktop:5
 msgid "themes;look and feel;"
-msgstr ""
+msgstr "themes;look and feel;თემ�;გ�რეგნ�ბ�;"
 
 #. Name
 #: kthememanager/kthememanager.desktop:6
 msgid "Theme Manager"
-msgstr "თემების მენეჯერი"
+msgstr "თემების მმ�რთველი"
 
 #. Comment
 #: kthememanager/x-ktheme.desktop:3
 msgid "TDE Theme"
-msgstr "TDE-ს თემ�"
+msgstr "TDE-ის თემ�"
 
 #. Name
 #: launch/kcmlaunch.desktop:12
 msgid "Launch Feedback"
-msgstr "პრ�გრ�მის გ�შვებ�"
+msgstr "უკუკ�ვშირის გ�შვებ�"
 
 #. Comment
 #: launch/kcmlaunch.desktop:14
@@ -1949,6 +2049,9 @@ msgid ""
 "application;start;launch;busy;cursor;feedback;mouse;pointer;rotating;"
 "spinning;disk;startup;program;report;"
 msgstr ""
+"application;start;launch;busy;cursor;feedback;mouse;pointer;rotating;spinning"
+";disk;startup;program;report;�ნგ�რიში;შებრუნებ�;გ�შვებ�;პრ�გრ�მ�;დ�კ�ვებული;კ"
+"ურს�რი;უკუკ�ვშირი;თ�გუნ�;კურს�რი;"
 
 #. Name
 #: locale/default/entry.desktop:2
@@ -1963,7 +2066,7 @@ msgstr "ქვეყ�ნ�/რეგი�ნი დ� ენ�"
 #. Comment
 #: locale/language.desktop:14
 msgid "Language, numeric, and time settings for your particular region"
-msgstr "თქვენი რეგი�ნისთვის ენის, თ�რიღის დ� ციფრული ფ�რმ�ტის კ�ნფიგურ�ცი�"
+msgstr "ენის, თ�რიღის დ� რიცხვის ფ�რმ�ტის მ�რგებ� თქვენი რეგი�ნისთვის"
 
 #. Keywords
 #: locale/language.desktop:16
@@ -1972,16 +2075,22 @@ msgid ""
 "charsets;character sets;Decimal symbol;Thousands separator;symbol;separator;"
 "sign;positive;negative;fractional digits;week;week start;"
 msgstr ""
+"language;translation;number "
+"format;currency;time;date;formats;locale;Country;charsets;character sets;"
+"Decimal symbol;Thousands separator;symbol;separator;sign;positive;negative;"
+"fractional digits;week;week start;ენ�;თ�რგმ�ნი;რიცხვის "
+"ფ�რმ�ტი;ვ�ლუტ�;დრ�;თ�რიღი;ფ�რმ�ტი;ქვეყ�ნ�;კ�დირებ�;წილ�დის გ�მყ�ფი;�თ�სების "
+"გ�მყ�ფი;გ�მყ�ფი სიმბ�ლ�;"
 
 #. Name
 #: nics/nic.desktop:12
 msgid "Network Interfaces"
-msgstr "ქსელური ინტერფეისები"
+msgstr "ქსელის ინტერფეისები"
 
 #. Comment
 #: nics/nic.desktop:14
 msgid "Network interface information"
-msgstr "ცნ�ბები ქსელური ინტერფეისების შეს�ხებ"
+msgstr "ინფ�რმ�ცი� ქსელის ინტერფეისის შეს�ხებ"
 
 #. Name
 #: performance/kcmkonqyperformance.desktop:11
@@ -1992,12 +2101,12 @@ msgstr "წ�რმ�დ�ბ�"
 #. Comment
 #: performance/kcmkonqyperformance.desktop:13
 msgid "Configure settings that can improve Konqueror performance"
-msgstr "Konqueror-ის სისწრ�ფეზე მ�ქმედი პ�რ�მეტრების კ�ნფიგურ�ცი�"
+msgstr "Konqueror-ის წ�რმ�დ�ბის პ�რ�მეტრების მ�რგებ�"
 
 #. Keywords
 #: performance/kcmkonqyperformance.desktop:15
 msgid "konqueror;reuse;preloading;"
-msgstr ""
+msgstr "konqueror;reuse;preloading;წინ�სწ�რ ჩ�ტვირთვ�;"
 
 #. Comment
 #: performance/kcmperformance.desktop:13
@@ -2008,11 +2117,12 @@ msgstr "TDE-ს სისწრáƒ�ფეზე მáƒ�ქმედი პáƒ�რáƒ
 #: performance/kcmperformance.desktop:15
 msgid "performance;speed;memory;improve;"
 msgstr ""
+"performance;speed;memory;improve;წ�რმ�დ�ბ�;სიჩქ�რე;მეხსიერებ�;გ�უმჯ�ბესებ�;"
 
 #. Name
 #: privacy/privacy.desktop:11
 msgid "Privacy"
-msgstr "კ�ნფიდენცი�ლურ�ბ�"
+msgstr "კ�ნფიდენცი�ლ�ბ�"
 
 #. Comment
 #: privacy/privacy.desktop:13
@@ -2021,9 +2131,8 @@ msgstr "წმენდს მáƒ�მხმáƒ�რებლის áƒ�რáƒ�სáƒ�á
 
 #. Keywords
 #: privacy/privacy.desktop:15
-#, fuzzy
 msgid "Privacy;privacy;"
-msgstr "კ�ნფიდენცი�ლურ�ბ�"
+msgstr "კ�ნფიდენცი�ლ�ბ�;პირ�დი;"
 
 #. Name
 #: randr/randr.desktop:9
@@ -2033,105 +2142,107 @@ msgstr "ზ�მ� დ� �რიენტ�ცი�"
 #. Comment
 #: randr/randr.desktop:11
 msgid "Resize and Rotate your display"
-msgstr "ეკრ�ნის ზ�მის დ� �რიენტ�ციის შეცვლ�"
+msgstr "ეკრ�ნის ზ�მის� დ� �რიენტ�ციის შეცვლ�"
 
 #. Keywords
 #: randr/randr.desktop:13
 msgid "resize;rotate;display;color;depth;size;horizontal;vertical;"
 msgstr ""
+"resize;rotate;display;color;depth;size;horizontal;vertical;ზ�მის "
+"შეცვლ�;შებრუნებ�;ეკრ�ნი;ფერი;ზ�მ�;სიღრმე;ჰ�რიზ�ნტ�ლური;ვერტიკ�ლური;"
 
 #. Name
 #: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
 msgid "TDERandRTray"
-msgstr ""
+msgstr "TDERandRTray"
 
 #. GenericName
 #: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
 msgid "Screen Resize & Rotate"
-msgstr "ეკრ�ნის ზ�მ� დ� �რიენტ�ცი�"
+msgstr "ეკრ�ნის ზ�მის შეცვლ� დ� შებრუნებ�"
 
 #. Comment
 #: randr/tderandrtray-autostart.desktop:6 randr/tderandrtray.desktop:6
 msgid "Resize and rotate X screens."
-msgstr "ეკრ�ნის ზ�მის დ� �რიენტ�ციის შეცვლ�"
+msgstr "X-ის ეკრ�ნის ზ�მის შეცვლ� დ� შებრუნებ�."
 
 #. Name
 #: samba/smbstatus.desktop:12
 msgid "Samba Status"
-msgstr "Samba-ს სტ�ტუსი"
+msgstr "Samba-ის სტ�ტუსი"
 
 #. Comment
 #: samba/smbstatus.desktop:14
 msgid "Samba status monitor"
-msgstr "Samba-ს სტ�ტუსის მ�ნიტ�რი"
+msgstr "Samba-ის სტ�ტუსის მ�ნიტ�რი"
 
 #. Keywords
 #: samba/smbstatus.desktop:16
-#, fuzzy
 msgid "SMB;SAMBA;Windows network;LAN;System Information;"
-msgstr "dma;DMA-�რხები;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
+msgstr ""
+"SMB;SAMBA;Windows network;LAN;System Information;ინფ�რმ�ცი� სისტემის შეს�ხებ;"
 
 #. Name
 #: screensaver/screensaver.desktop:12
-#, fuzzy
 msgid "Screen Saver"
-msgstr "Screen Saver-ის კ�ნფიგურ�ცი�"
+msgstr "ეკრ�ნის დ�ცვ�"
 
 #. Comment
 #: screensaver/screensaver.desktop:14
 msgid "Screen Saver Settings"
-msgstr "Screen Saver-ის კ�ნფიგურ�ცი�"
+msgstr "ეკრ�ნის დ�ცვის მ�რგებ�"
 
 #. Keywords
 #: screensaver/screensaver.desktop:16
 msgid "screensavers;Priority;"
-msgstr ""
+msgstr "screensavers;Priority;ეკრ�ნის დ�ცვ�;პრი�რიტეტი;"
 
 #. Name
 #: smartcard/smartcard.desktop:11
 msgid "Smartcards"
-msgstr "სხ�რტი ბ�რ�თები"
+msgstr "სმ�რტ ბ�რ�თები"
 
 #. Comment
 #: smartcard/smartcard.desktop:13
-#, fuzzy
 msgid "Configure smartcard support"
-msgstr "სერვისის �რმ�ჩენის კ�ნფიგურირებ�"
+msgstr "სმ�რტ ბ�რ�თების მხ�რდ�ჭერის მ�რგებ�"
 
 #. Keywords
 #: smartcard/smartcard.desktop:15
 msgid "Smartcard;PKCS;SSL;reader;smart;card;"
-msgstr ""
+msgstr "Smartcard;PKCS;SSL;reader;smart;card;სმ�რტ;ბ�რ�თი;"
 
 #. Name
 #: smserver/kcmsmserver.desktop:12
 msgid "Session Manager"
-msgstr "სე�ნსების მენეჯერი"
+msgstr "სესიები მმ�რთველი"
 
 #. Comment
 #: smserver/kcmsmserver.desktop:14
 msgid "Configure the session manager and logout settings"
-msgstr "სე�ნსების მენეჯერის დ� სისტემიდ�ნ გ�მ�სვლის კ�ნფიგურ�ცი�"
+msgstr "სესიების მმ�რთველის� დ� გ�სვლის პ�რ�მეტრების მ�რგებ�"
 
 #. Keywords
 #: smserver/kcmsmserver.desktop:16
 msgid "ksmserver;session;logout;confirmation;save;restore;"
 msgstr ""
+"ksmserver;session;logout;confirmation;save;restore;სესი�;შენ�ხვ�;გ�სვლ�;�ღდგე"
+"ნ�;"
 
 #. Name
 #: spellchecking/spellchecking.desktop:11
 msgid "Spell Checker"
-msgstr "მ�რლთწერის შემ�წმებ�"
+msgstr "მ�რთლწერის შემ�წმებ�"
 
 #. Comment
 #: spellchecking/spellchecking.desktop:13
 msgid "Configure the spell checker"
-msgstr "მ�რლთწერის სემ�წმების კ�ნფიგურ�ცი�"
+msgstr "მ�რთლწერის შემ�წმების მ�რგებ�"
 
 #. Keywords
 #: spellchecking/spellchecking.desktop:15
 msgid "Spell;"
-msgstr ""
+msgstr "მ�რთლწერ�;"
 
 #. Name
 #: style/style.desktop:13
@@ -2142,38 +2253,40 @@ msgstr "სტილი"
 #: style/style.desktop:15
 msgid ""
 "Allows the manipulation of widget behavior and changing the Style for TDE"
-msgstr "TDE-ს ელემენტების სტილი დ� იერს�ხე"
+msgstr "ს�შუ�ლებ�ს გ�ძლევთ, შეცვ�ლ�თ ვიჯეტის ქცევ� დ� მისი სტილი TDE-სთვის"
 
 #. Keywords
 #: style/style.desktop:17
 msgid ""
 "style;styles;look;widget;icons;toolbars;text;highlight;apps;TDE applications;"
 msgstr ""
+"style;styles;look;widget;icons;toolbars;text;highlight;apps;TDE "
+"applications;სტილები;გ�რეგნ�ბ�;პ�ნელები;გ�მ�კვეთ�;�პები;�პლიკ�ციები;"
 
 #. Name
 #: taskbar/kcmtaskbar.desktop:11
 msgid "Taskbar"
-msgstr "�მ�ც�ნ�თ� პ�ნელი"
+msgstr "�მ�ც�ნების პ�ნელი"
 
 #. Comment
 #: taskbar/kcmtaskbar.desktop:13
 msgid "Configure the selected taskbar"
-msgstr "�მ�ც�ნ�თ� პ�ნელის კ�ნფიგურ�ცი�"
+msgstr "�მ�ც�ნების პ�ნელის მ�რგებ�"
 
 #. Keywords
 #: taskbar/kcmtaskbar.desktop:15
 msgid "kicker;panel;kpanel;taskbar;startbar;launchbar;windows;"
-msgstr ""
+msgstr "kicker;panel;kpanel;taskbar;startbar;launchbar;windows;პ�ნელი;ფ�ნჯრები;"
 
 #. Name
 #: tdefontinst/installfont.desktop:6
 msgid "Install"
-msgstr "ინსტ�ლ�ცი�"
+msgstr "დ�ყენებ�"
 
 #. Name
 #: tdefontinst/kcmfontinst/kcmfontinst.desktop:14
 msgid "Font Installer"
-msgstr "ფ�ნტების დ�ყენებ�"
+msgstr "ფ�ნტმყენებელი"
 
 #. Comment
 #: tdefontinst/kcmfontinst/kcmfontinst.desktop:16
@@ -2198,7 +2311,7 @@ msgstr "ფ�ნტების ს�ქ�ღ�ლდე"
 #. Comment
 #: tdefontinst/tdeio/package.desktop:6
 msgid "Fonts Package"
-msgstr "შრიფტების პ�კეტი"
+msgstr "ფ�ნტების პ�კეტი"
 
 #. Comment
 #: tdefontinst/tdeio/system-folder.desktop:2
@@ -2208,30 +2321,29 @@ msgstr "სისტემური ფáƒ�ნტების სáƒ�ქáƒ�ღáƒ�á
 #. Name
 #: tdefontinst/thumbnail/fontthumbnail.desktop:3
 msgid "Font Files"
-msgstr "ფ�ნტების ფ�ილები"
+msgstr "ფ�ნტის ფ�ილები"
 
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:2
-#, fuzzy
 msgid "TDEFontView"
-msgstr "პრ�გრ�მ� ფ�ნტების ს�ნ�ხ�ვ�დ"
+msgstr "TDEFontView"
 
 #. GenericName
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:8
 #: tdefontinst/viewpart/tdefontviewpart.desktop:2
 msgid "Font Viewer"
-msgstr "პრ�გრ�მ� ფ�ნტების ს�ნ�ხ�ვ�დ"
+msgstr "ფ�ნტის გ�დ�ხედვ�"
 
 #. Name
 #: tdeio/cache.desktop:12
 msgid "Cache"
-msgstr "ქეში"
+msgstr "კეში"
 
 #. Comment
 #: tdeio/cache.desktop:14
 msgid "Configure web cache settings"
-msgstr "ვებ კეშის პ�რ�მეტრების კ�ნფიგურ�ცი�"
+msgstr "ვებ კეშის პ�რ�მეტრების მ�რგებ�"
 
 #. Keywords
 #: tdeio/cache.desktop:16
@@ -2241,13 +2353,12 @@ msgstr "ქეში;ისტ�რი�;მიმ�ხილვის ის
 #. Name
 #: tdeio/cookies.desktop:12
 msgid "Cookies"
-msgstr "ქუქები"
+msgstr "ქუქიები"
 
 #. Comment
 #: tdeio/cookies.desktop:14
-#, fuzzy
 msgid "Configure the way cookies work"
-msgstr "მ�რლთწერის სემ�წმების კ�ნფიგურ�ცი�"
+msgstr "მ�ირგეთ ქუქიების მუშ��ბის სტილი"
 
 #. Keywords
 #: tdeio/cookies.desktop:16
@@ -2257,7 +2368,7 @@ msgstr "ქუქები;მიმáƒ�ხილვáƒ�;ინტერნეტá
 #. Name
 #: tdeio/lanbrowser.desktop:11
 msgid "Local Network Browsing"
-msgstr "ლ�კ�ლური ქსელის მიმ�ხილვ�"
+msgstr "ლ�კ�ლური ქსელის დ�თვ�ლიერებ�"
 
 #. Comment
 #: tdeio/lanbrowser.desktop:13
@@ -2267,22 +2378,23 @@ msgstr "lisa, reslisa დ� ioslaves -ს კ�ნფიგურ�ცი�"
 #. Keywords
 #: tdeio/lanbrowser.desktop:15
 msgid "samba;smb;windows;network;"
-msgstr ""
+msgstr "samba;smb;windows;network;ქსელი;"
 
 #. Comment
 #: tdeio/netpref.desktop:2
 msgid "Configure generic network preferences, like timeout values"
-msgstr "ქსელის ზ�გ�დი პ�რ�მეტრები, ისეთი რ�გ�რიც�� ტ�იმ�უტი"
+msgstr "ქსელის ზ�გ�დი პ�რ�მეტრების მ�რგებ�. მ�გ: მ�ლ�დინის ვ�დის მნიშვნელ�ბები"
 
 #. Keywords
 #: tdeio/netpref.desktop:5
 msgid "timeout;iopref;netpref;network preferences;ftp;"
 msgstr ""
+"timeout;iopref;netpref;network preferences;ftp;მ�ლ�დინისდრ�;ქსელის მ�რგებ�;"
 
 #. Name
 #: tdeio/netpref.desktop:6
 msgid "Connection Preferences"
-msgstr "კ�ვშირის თვისებები"
+msgstr "კ�ვშირის პ�რ�მეტრები"
 
 #. Name
 #: tdeio/proxy.desktop:12
@@ -2292,7 +2404,7 @@ msgstr "პრ�ქსი"
 #. Comment
 #: tdeio/proxy.desktop:14
 msgid "Configure the proxy servers used"
-msgstr "გ�მ�ყენებული პრ�ქსების კ�ნფიგურ�ცი�"
+msgstr "პრ�ქსი სერვერის მ�რგებ�"
 
 #. Keywords
 #: tdeio/proxy.desktop:16
@@ -2302,12 +2414,14 @@ msgstr "პრ�ქსი;პრ�ქსი სერვერი;ფ�ირ
 #. Name
 #: tdeio/smb.desktop:12
 msgid "Windows Shares"
-msgstr "Windows ს�ზი�რ�"
+msgstr "Windows-ის ზი�რები"
 
 #. Comment
 #: tdeio/smb.desktop:14
 msgid "Use to configure which windows (SMB) filesystems you can browse"
-msgstr "გ�მ�იყენებ� windows (SMB) ფ�ილური სისტემების ჩვენების მის�თითებლ�დ"
+msgstr ""
+"გ�მ�იყენეთ, რ�მ მიუთით�თ, რ�მელი Windows (SMB) ფ�ილური სისტემების "
+"დ�თვ�ლიერებ� შეგიძლი�თ"
 
 #. Keywords
 #: tdeio/smb.desktop:16
@@ -2315,11 +2429,13 @@ msgid ""
 "SMB;SAMBA;SMB client;Windows network;LAN;Network;neighborhood;Server;"
 "Broadcast;WINS;Share;Login;Passwords;"
 msgstr ""
+"SMB;SAMBA;SMB client;Windows network;LAN;Network;neighborhood;Server;Broadcas"
+"t;WINS;Share;Login;Passwords;შესვლ�;პ�რ�ლი;სერვერი;მ�უწყებლ�ბ�;ქსელი;"
 
 #. Comment
 #: tdeio/uasprovider.desktop:4
 msgid "UserAgent Strings"
-msgstr "Строки UserAgent"
+msgstr "მ�მხმ�რებლის �გენტის სტრიქ�ნები"
 
 #. Name
 #: tdeio/uasproviders/ie401onwinnt4.desktop:2
@@ -2359,7 +2475,7 @@ msgstr "UADescription (IE 6.0 მიმდინáƒ�რე სისტემáƒ�á
 #. Name
 #: tdeio/uasproviders/ie60onwinnt51.desktop:2
 msgid "UADescription (IE 6.0 on Win XP)"
-msgstr "UADescription (IE 5.0 Win 95-ში)"
+msgstr "UADescription (IE 6.0 Win XP-ზე)"
 
 #. Name
 #: tdeio/uasproviders/lynxoncurrent.desktop:2
@@ -2374,7 +2490,7 @@ msgstr "UADescription (Netscape 7.1 მიმდინáƒ�რე სისტეá
 #. Name
 #: tdeio/uasproviders/ns71onwinnt51.desktop:2
 msgid "UADescription (Netscape 7.1 on XP)"
-msgstr "UADescription (Netscape 7.1 XP-ში)"
+msgstr "UADescription (Netscape 7.1 XP-ზე)"
 
 #. Name
 #: tdeio/uasproviders/op75oncurrent.desktop:2
@@ -2388,34 +2504,35 @@ msgstr "UADescription (w3m 0.1.9)"
 
 #. Name
 #: tdeio/uasproviders/wgetoncurrent.desktop:2
-#, fuzzy
 msgid "UADescription (Wget 1.11.4)"
-msgstr "UADescription (w3m 0.1.9)"
+msgstr "UADescription (wget 1.11.4)"
 
 #. Name
 #: tdeio/useragent.desktop:12
 msgid "Browser Identification"
-msgstr "ბრ�უზერის ინდენტიფიკ�ცი�"
+msgstr "ბრ�უზერის იდენტიფიკ�ტ�რი"
 
 #. Comment
 #: tdeio/useragent.desktop:14
 msgid "Configure the way Konqueror reports itself"
-msgstr "Konqueror-ის იდენტიფიკ�ციის კ�ნფიგურირებ�"
+msgstr "Konqueror-ის იდენტიფიკ�ციის მ�რგებ�"
 
 #. Keywords
 #: tdeio/useragent.desktop:16
 msgid "User Agent;Browser;Internet;WWW;Network;agent;bindings;server;login;"
 msgstr ""
+"User Agent;Browser;Internet;WWW;Network;agent;bindings;server;login;"
+"მ�მხმ�რებლის �გენტი;სერვერი;შესვლ�;"
 
 #. Name
 #: tdm/tdm.desktop:14
 msgid "Login Manager"
-msgstr "შესვლის მენეჯერი"
+msgstr "შესვლის მმ�რთველი"
 
 #. Comment
 #: tdm/tdm.desktop:16
 msgid "Configure the login manager (TDM)"
-msgstr "შევლის მენეჯერის კ�ნფიგურირებ� (TDM)"
+msgstr "შევლის მმ�რთველის მ�რგებ� (TDM)"
 
 #. Keywords
 #: tdm/tdm.desktop:18
@@ -2423,6 +2540,9 @@ msgid ""
 "tdm;display manager;xdm;users;login;greeting;Logo;styles;language;country;"
 "fonts;background;wallpapers;sessions;shutdown;restart;"
 msgstr ""
+"tdm;display manager;xdm;users;login;greeting;Logo;styles;language;country;fon"
+"ts;background;wallpapers;sessions;shutdown;restart;გ�დ�ტვირთვ�;გ�სვლ�;გ�მ�რთვ"
+"�;ენ�;ქვეყ�ნ�;მის�ლმებ�;"
 
 #. Name
 #: usbview/kcmusb.desktop:10
@@ -2432,12 +2552,12 @@ msgstr "USB მ�წყ�ბილ�ბები"
 #. Comment
 #: usbview/kcmusb.desktop:12
 msgid "View the USB devices attached to this computer"
-msgstr "თქვენი კ�მპიუტერის USB მ�წყ�ბილ�ბები"
+msgstr "თქვენს კ�მპიუტერზე მიერთებული USB მ�წყ�ბილ�ბები"
 
 #. Keywords
 #: usbview/kcmusb.desktop:14
 msgid "USB;devices;viewer;control;"
-msgstr ""
+msgstr "USB;მ�წყ�ბილ�ბები;მ�რთვ�;"
 
 #. Name
 #: view1394/kcmview1394.desktop:10
@@ -2452,7 +2572,7 @@ msgstr "�მ კ�მპიუტერზე შეერთებული
 #. Keywords
 #: view1394/kcmview1394.desktop:14
 msgid "1394;Firewire;devices;viewer;control;"
-msgstr ""
+msgstr "1394;Firewire;devices;viewer;control;მ�რთვ�;მ�წყ�ბილ�ბ�;"
 
 #. Name
 #: xinerama/xinerama.desktop:10
@@ -2462,9 +2582,9 @@ msgstr "რ�მდენიმე მ�ნიტ�რი"
 #. Comment
 #: xinerama/xinerama.desktop:12
 msgid "Configure TDE for multiple monitors"
-msgstr "რ�მდენიმე მ�ნიტ�რისთვის TDE -ს კ�ნფიგურ�ცი�"
+msgstr "TDE -ის მ�რგებ� რ�მდენიმე მ�ნიტ�რისთვის"
 
 #. Keywords
 #: xinerama/xinerama.desktop:14
 msgid "Xinerama;dual head;multihead;monitor;"
-msgstr ""
+msgstr "Xinerama;dual head;multihead;monitor;�რი ეკრ�ნი;"
diff --git a/translations/desktop_files/kcontrol-desktops/kcontrol-desktops.pot b/translations/desktop_files/kcontrol-desktops/kcontrol-desktops.pot
index bd54efcf3..33a0c635f 100644
--- a/translations/desktop_files/kcontrol-desktops/kcontrol-desktops.pot
+++ b/translations/desktop_files/kcontrol-desktops/kcontrol-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/kk.po b/translations/desktop_files/kcontrol-desktops/kk.po
index 5c0261d63..db4d4f657 100644
--- a/translations/desktop_files/kcontrol-desktops/kk.po
+++ b/translations/desktop_files/kcontrol-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1568,6 +1568,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Тышқан баптаулары"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Джой�тик"
diff --git a/translations/desktop_files/kcontrol-desktops/km.po b/translations/desktop_files/kcontrol-desktops/km.po
index ff1871003..b719d9584 100644
--- a/translations/desktop_files/kcontrol-desktops/km.po
+++ b/translations/desktop_files/kcontrol-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1578,6 +1578,32 @@ msgstr ""
 "ប៊ូ�ុង;ចុច;រូប�ំណាង;ម�ិ​រិះគន់;ទ្រនិច;អូស;ចុច​ទ្វ�ដង;ធ្វើ​ប្លង់;ដៃ​ស្ដាំ;ដៃ​ឆ្វ�ង;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "ការ​កំណ�់​កណ្ដុរ"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"កណ្ដុរ;ការ​បង្កើន​ល្បឿង​កណ្ដុរ;កម្រិ�​ពន្លឺ​កណ្ដុរ;ប៊ូ�ុង​កណ្ដុរ;ការ​ជ្រើស;រាង​ទស្សន�​ទ្រនិច;ឧបករណ�​បញ្ចូល;ប្លង់​"
+"ប៊ូ�ុង;ចុច;រូប�ំណាង;ម�ិ​រិះគន់;ទ្រនិច;អូស;ចុច​ទ្វ�ដង;ធ្វើ​ប្លង់;ដៃ​ស្ដាំ;ដៃ​ឆ្វ�ង;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "យ៉យស្ទីក"
diff --git a/translations/desktop_files/kcontrol-desktops/kn.po b/translations/desktop_files/kcontrol-desktops/kn.po
index cb22f9659..b4d1e4ac9 100644
--- a/translations/desktop_files/kcontrol-desktops/kn.po
+++ b/translations/desktop_files/kcontrol-desktops/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ko.po b/translations/desktop_files/kcontrol-desktops/ko.po
index 3eaf2722d..76d853598 100644
--- a/translations/desktop_files/kcontrol-desktops/ko.po
+++ b/translations/desktop_files/kcontrol-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1585,6 +1585,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "마우스 설정"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "조�스틱"
diff --git a/translations/desktop_files/kcontrol-desktops/ku.po b/translations/desktop_files/kcontrol-desktops/ku.po
index 2d6126e72..da90692b0 100644
--- a/translations/desktop_files/kcontrol-desktops/ku.po
+++ b/translations/desktop_files/kcontrol-desktops/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/lo.po b/translations/desktop_files/kcontrol-desktops/lo.po
index 124b473cd..b0104636e 100644
--- a/translations/desktop_files/kcontrol-desktops/lo.po
+++ b/translations/desktop_files/kcontrol-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1566,6 +1566,32 @@ msgstr ""
 "ອຸປະ�ອນນຳເຂົ້າ;�ານຈັບຄູ່ປຸ່ມ;ຄລິ�;ໄອຄອນ;ຕົວຊີ້;ລາ�;ດັບເບີ້ນຄລິ�;�ານ�ມບປຸ່ມ;ໃຊ້ມືຊ້າ�; ໃຊ້ມືຂວາ;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "ຂ�້ມູນຄວາມສະ�ດງຕົວເຄື່ອງມືຂອງຜູ້ໃຊ້"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"ເມົາສ໌;�ານເພີ້ມຄວາມໄວຂອງເມົາສ໌;ໄລ�ະຕົວຊີ້ຂອງເມົາສ໌; ປຸ່ມເມົາສ໌;�ານເລືອ�;ຮູບຮ່າງເຄີເຊີ;"
+"ອຸປະ�ອນນຳເຂົ້າ;�ານຈັບຄູ່ປຸ່ມ;ຄລິ�;ໄອຄອນ;ຕົວຊີ້;ລາ�;ດັບເບີ້ນຄລິ�;�ານ�ມບປຸ່ມ;ໃຊ້ມືຊ້າ�; ໃຊ້ມືຂວາ;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "จอยสติ๊�"
diff --git a/translations/desktop_files/kcontrol-desktops/lt.po b/translations/desktop_files/kcontrol-desktops/lt.po
index f9dddf666..029fc712f 100644
--- a/translations/desktop_files/kcontrol-desktops/lt.po
+++ b/translations/desktop_files/kcontrol-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1610,6 +1610,34 @@ msgstr ""
 "left handed;kairiarankÄ—;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "PelÄ—s parametrai"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;pelÄ—;Mouse acceleration;pelÄ—s pagreitinimas;Mouse threshold;Mouse "
+"buttons;pelės mygtukai;Selection;pažymėjimas;Cursor Shape;Input Devices;"
+"Button Mapping;Click;icons;feedback;Pointers;Drag;DoubleClick;right handed;"
+"left handed;kairiarankÄ—;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Valdymo svirtis"
diff --git a/translations/desktop_files/kcontrol-desktops/lv.po b/translations/desktop_files/kcontrol-desktops/lv.po
index 59c5bff43..c29532470 100644
--- a/translations/desktop_files/kcontrol-desktops/lv.po
+++ b/translations/desktop_files/kcontrol-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1595,6 +1595,33 @@ msgstr ""
 "Dubultklikšķis;sasaiste;lab�s rokas;kreis�s rokas;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Peles parametri"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Pele;Peles pa�trin�jums;Peles slieksnis;Peles taustiņi;Izvēle;Kursora Forma;"
+"Ievades Iek�rtas;Pogu Sasaiste;Klikšķis;ikonas;atpakaļsaite;R�dīt�ji;Vilkt;"
+"Dubultklikšķis;sasaiste;lab�s rokas;kreis�s rokas;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Kursorsvira"
diff --git a/translations/desktop_files/kcontrol-desktops/mai.po b/translations/desktop_files/kcontrol-desktops/mai.po
index 14fb2e28a..4e9ae3336 100644
--- a/translations/desktop_files/kcontrol-desktops/mai.po
+++ b/translations/desktop_files/kcontrol-desktops/mai.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/mk.po b/translations/desktop_files/kcontrol-desktops/mk.po
index 9f92b0eaa..a0ebb8b96 100644
--- a/translations/desktop_files/kcontrol-desktops/mk.po
+++ b/translations/desktop_files/kcontrol-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1632,6 +1632,36 @@ msgstr ""
 "де�норак;леворак;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "По�тавувања на глушецот"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;Глушец;Забрзување на глушец;"
+"Граница на глушец;Копчиња на глушец;Селекција;Избор;Форма на кур�ор;Влезни "
+"уреди;Мапирање на копче;Клик;икони;Покажувачи;Влечи;Двоен клик;мапирање;"
+"де�норак;леворак;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ml.po b/translations/desktop_files/kcontrol-desktops/ml.po
index 80acd38f7..878cfff69 100644
--- a/translations/desktop_files/kcontrol-desktops/ml.po
+++ b/translations/desktop_files/kcontrol-desktops/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/mn.po b/translations/desktop_files/kcontrol-desktops/mn.po
index 79ab2a06a..626f1ea7f 100644
--- a/translations/desktop_files/kcontrol-desktops/mn.po
+++ b/translations/desktop_files/kcontrol-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1599,6 +1599,33 @@ msgstr ""
 "төхөөрөмж;Давхар товшилт;Баруун гарын; Зүүн гарын;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Хулгана тохируулга"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Хулгана;Хулгана-хурда�гуур; Хулгана-х�згаар;Хулгана товшуур;Сонголт; Түүч��;"
+"Түүч��ний х�лб�р;Оролтын төхөөрөмж;Товч;Товшилуур;Холбоо�;Товшилт; Зурах "
+"төхөөрөмж;Давхар товшилт;Баруун гарын; Зүүн гарын;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/mr.po b/translations/desktop_files/kcontrol-desktops/mr.po
index 9860e724a..7305be6eb 100644
--- a/translations/desktop_files/kcontrol-desktops/mr.po
+++ b/translations/desktop_files/kcontrol-desktops/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1547,6 +1547,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ms.po b/translations/desktop_files/kcontrol-desktops/ms.po
index c9fd55ee7..71f230e36 100644
--- a/translations/desktop_files/kcontrol-desktops/ms.po
+++ b/translations/desktop_files/kcontrol-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1570,6 +1570,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Seting tetikus"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Kayu Bidik"
diff --git a/translations/desktop_files/kcontrol-desktops/mt.po b/translations/desktop_files/kcontrol-desktops/mt.po
index f9b30433a..f0ce6ea20 100644
--- a/translations/desktop_files/kcontrol-desktops/mt.po
+++ b/translations/desktop_files/kcontrol-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1596,6 +1596,33 @@ msgstr ""
 "DoubleClick;mapping;right handed;left handed;Maws;lemini;xellugi;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Konfigurazzjoni tal-Maws"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;Maws;lemini;xellugi;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/nb.po b/translations/desktop_files/kcontrol-desktops/nb.po
index 2fe134a6a..12de039b7 100644
--- a/translations/desktop_files/kcontrol-desktops/nb.po
+++ b/translations/desktop_files/kcontrol-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1613,6 +1613,33 @@ msgstr ""
 "høyrehendt;venstrehendt;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Musinnstillinger"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mus;musehastighet;museknapper;valg;merking;kursoregenskaper;pekeregenskaper;"
+"innenheter;inn-enheter;knappetilordning;trykk;klikk;pekere;dra;dobbeltklikk; "
+"høyrehendt;venstrehendt;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Styrepinne"
diff --git a/translations/desktop_files/kcontrol-desktops/nds.po b/translations/desktop_files/kcontrol-desktops/nds.po
index 0ae4ee1de..a95589d7c 100644
--- a/translations/desktop_files/kcontrol-desktops/nds.po
+++ b/translations/desktop_files/kcontrol-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1607,6 +1607,33 @@ msgstr ""
 "Toornen;Rechtpoot;Linkpoot;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Muus instellen"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Muus;Muus-Gauheit;Muus-Grenzweert;Muusknööp;Utwahl;Knooptoornen; Wieserform;"
+"Ingaavreedschappen;Klicken;Lüttbiller;Torüchmellen;Wieser;Dregen;Dubbelklick;"
+"Toornen;Rechtpoot;Linkpoot;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ne.po b/translations/desktop_files/kcontrol-desktops/ne.po
index 1803026a7..f6bb0b19f 100644
--- a/translations/desktop_files/kcontrol-desktops/ne.po
+++ b/translations/desktop_files/kcontrol-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1590,6 +1590,33 @@ msgstr ""
 "दाया�; बाया�;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "माउस सेटिङ"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"माउस; माउस गतिवर�धन; माउस थ�रेसहोल�ड; माउस बटनहरू; चयन; कर�सर आकार; आगत यन�त�रहरू; "
+"बटन मिलाउने; क�लिक; प�रतिमा; पृष�ठपोषण; सूचक; तान�न�होस�; डबल क�लिक गर�न�होस�; मिलाउन�होस�; "
+"दाया�; बाया�;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "जोयस�टिक"
diff --git a/translations/desktop_files/kcontrol-desktops/nl.po b/translations/desktop_files/kcontrol-desktops/nl.po
index f717bbaa2..f9adecbbe 100644
--- a/translations/desktop_files/kcontrol-desktops/nl.po
+++ b/translations/desktop_files/kcontrol-desktops/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2025-03-25 10:44+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kcontrol-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -29,7 +30,7 @@ msgstr "Toegankelijkheid"
 #. Comment
 #: access/kcmaccess.desktop:14
 msgid "Improve accessibility for disabled persons"
-msgstr "Verbeterde toegankelijkheid voor gebruikers met een handicap"
+msgstr "Verbeterde toegankelijkheid voor gebruikers met een beperking"
 
 #. Keywords
 #: access/kcmaccess.desktop:16
@@ -38,8 +39,8 @@ msgid ""
 "keys;sticky keys;bounce keys;slow keys;mouse navigation;num pad;"
 msgstr ""
 "toegang;toegankelijkheid;doof;handicap;gehandicapt;bel;signalering;zichtbare "
-"meldingen;Keyboard;toetsenbord;keys;toetsen;vastgeplakte toetsen;"
-"toetsenaanslag;muisnavigatie;num pad;numerieke klavier;"
+"meldingen;Keyboard;toetsenbord;keys;toetsen;vastgeplakte "
+"toetsen;toetsenaanslag;muisnavigatie;num pad;numerieke klavier;beperking;"
 
 #. Name
 #: arts/arts.desktop:12
@@ -91,7 +92,7 @@ msgstr "Systeembel"
 #. Comment
 #: bell/bell.desktop:15
 msgid "System Bell Configuration"
-msgstr "Systeemgeluiden instellen"
+msgstr "Systeembel instellen"
 
 #. Keywords
 #: bell/bell.desktop:17
@@ -103,17 +104,17 @@ msgstr ""
 #. Name
 #: clock/clock.desktop:13
 msgid "Date & Time"
-msgstr "Datum en Tijd"
+msgstr "Datum en tijd"
 
 #. Comment
 #: clock/clock.desktop:15
 msgid "Date and time settings"
-msgstr "Instellen van datum en tijd"
+msgstr "Datum- en tijdinstellingen"
 
 #. Keywords
 #: clock/clock.desktop:17
 msgid "clock;date;time;time zone;"
-msgstr "datum;tijd;tijdszone;klok;"
+msgstr "datum;tijd;tijdzone;klok;"
 
 #. Name
 #: colors/colors.desktop:12
@@ -145,12 +146,12 @@ msgstr ""
 #. Name
 #: componentchooser/componentchooser.desktop:10
 msgid "Default Applications"
-msgstr "Standaard-toepassingen"
+msgstr "Standaardprogramma's"
 
 #. Comment
 #: componentchooser/componentchooser.desktop:12
 msgid "Choose the default components for various services"
-msgstr "Kies de standaardcomponenten voor diverse services"
+msgstr "Kies de standaardonderdelen van diverse diensten"
 
 #. Keywords
 #: componentchooser/componentchooser.desktop:14
@@ -159,9 +160,9 @@ msgid ""
 "client;text editor;instant messenger;terminal emulator;web browser;file "
 "manager;URL;hyperlinks;"
 msgstr ""
-"standaard toepassingen;componenten;componentenkiezer;hulpbronnen;e-mail-"
-"client;tekstbewerker;instant-messenger;terminal-emulator;webbrowser;"
-"bestandsbeheerder;url-adres;hyperlinks;"
+"standaardprogramma's;componenten;onderdelen;componentenkiezer;hulpbronnen;e"
+"-mail-client;tekstbewerker;instant-messenger;terminal-"
+"emulator;webbrowser;bestandsbeheerder;url-adres;hyperlinks;"
 
 #. Name
 #: componentchooser/componentservices/kcm_browser.desktop:1
@@ -174,8 +175,8 @@ msgid ""
 "Here you can configure your default web browser. All TDE applications in "
 "which you can select hyperlinks should honor this setting."
 msgstr ""
-"Hier kunt u uw standaard webbrowser instellen. Alle TDE-toepassingen waarin "
-"u een hyperkoppeling kunt aanklikken maken gebruik van deze instelling."
+"Hier kunt u uw standaard webbrowser instellen. Alle TDE-programma's waarin u "
+"een link kunt aanklikken maken gebruik van deze instelling."
 
 #. Name
 #: componentchooser/componentservices/kcm_filemanager.desktop:1
@@ -185,15 +186,14 @@ msgstr "Bestandsbeheerder"
 
 #. Comment
 #: componentchooser/componentservices/kcm_filemanager.desktop:3
-#, fuzzy
 msgid ""
 "This service allows you to configure your default file manager. All TDE "
 "applications which invoke a file manager application should honor this "
 "setting."
 msgstr ""
-"Met deze service kunt u uw standaard terminalemulator instellen. Alle TDE-"
-"toepassingen die een terminalemulator aanroepen zullen gebruik maken van "
-"deze instelling."
+"Met deze dienst kunt u uw standaard terminalemulator instellen. Alle TDE-"
+"programma's die een terminalemulator aanroepen zullen gebruik maken van deze "
+"instelling."
 
 #. Name
 #: componentchooser/componentservices/kcm_kemail.desktop:1
@@ -207,9 +207,9 @@ msgid ""
 "applications which need access to an email client application should honor "
 "this setting."
 msgstr ""
-"Met deze service kunt u uw standaard e-mailprogramma instellen. TDE-"
-"toepassingen die toegang tot een e-mailprogramma nodig hebben zullen deze "
-"instellingen gebruiken."
+"Met deze dienst kunt u uw standaard e-mailprogramma instellen. TDE-"
+"programma's die toegang tot een e-mailprogramma nodig hebben zullen deze "
+"instelling gebruiken."
 
 #. Name
 #: componentchooser/componentservices/kcm_terminal.desktop:1
@@ -223,9 +223,9 @@ msgid ""
 "applications which invoke a terminal emulator application should honor this "
 "setting."
 msgstr ""
-"Met deze service kunt u uw standaard terminalemulator instellen. Alle TDE-"
-"toepassingen die een terminalemulator aanroepen zullen gebruik maken van "
-"deze instelling."
+"Met deze dienst kunt u uw standaard terminalemulator instellen. Alle TDE-"
+"programma's die een terminalemulator aanroepen zullen gebruikmaken van deze "
+"instelling."
 
 #. Name
 #: crypto/crypto.desktop:10
@@ -278,18 +278,17 @@ msgstr "Beeldscherminstellingen"
 #. Name
 #: displayconfig/displayconfig.desktop:12
 msgid "Monitor & Display"
-msgstr ""
+msgstr "Beeldscherm en weergave"
 
 #. Comment
 #: displayconfig/displayconfig.desktop:14
-#, fuzzy
 msgid "Configure display"
-msgstr "Dienstwaarneming instellen"
+msgstr "Beeldscherm instellen"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "monitor;beeldscherm;resolutie;weergave;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -317,9 +316,9 @@ msgid ""
 "Enhanced Browsing;Browsing;WWW;Internet;Internet Keywords;Internet Filters;"
 "Network;Search Engines;Shortcuts;"
 msgstr ""
-"geavanceerd browsen;browsing;www;internet;internet keywords;surfen;"
-"internetzoektermen;zoekmachines;search engines;snelkoppelingen;"
-"internetfilters;Netwerk;verbeterd browsen;"
+"geavanceerd browsen;browsing;www;internet;trefwoorden;surfen;internetzoekterm"
+"en;zoekmachines;search engines;snelkoppelingen;internetfilters;Netwerk;"
+"verbeterd browsen;"
 
 #. Name
 #: ebrowsing/plugins/ikws/kuriikwsfilter.desktop:3
@@ -339,35 +338,32 @@ msgstr "Zoekmachine"
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3
 msgid "Acronym Database"
-msgstr "Acroniemen database"
+msgstr "Acroniemendatabank"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6
 msgid "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
-msgstr ""
+msgstr "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3
-#, fuzzy
 msgid "Alexa"
-msgstr "Alexa URL-adres"
+msgstr "Alexa"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
-#, fuzzy
 msgid "http://info.alexa.com/search?q=\\{@}"
-msgstr "http://images.google.nl/images?q=\\{@}"
+msgstr "http://info.alexa.com/search?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:3
 msgid "Alexa URL"
-msgstr "Alexa URL-adres"
+msgstr "Alexa-url"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:6
-#, fuzzy
 msgid "http://info.alexa.com/data/details?url=\\{@}"
-msgstr "http://images.google.nl/images?q=\\{@}"
+msgstr "http://info.alexa.com/data/details?url=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:3
@@ -1289,7 +1285,7 @@ msgstr "Energiebeheer"
 #. Comment
 #: energy/energy.desktop:13
 msgid "Settings for display power management"
-msgstr "Instellingen voor energiebesparing voor monitors/displays"
+msgstr "Instellingen omtrent energiebesparing van beeldschermen"
 
 #. Keywords
 #: energy/energy.desktop:15
@@ -1301,12 +1297,12 @@ msgstr ""
 #. Name
 #: filetypes/filetypes.desktop:12
 msgid "File Associations"
-msgstr "Bestandsassociaties"
+msgstr "Bestandstoewijzingen"
 
 #. Comment
 #: filetypes/filetypes.desktop:14
 msgid "Configure file associations"
-msgstr "Hier kunt u de bestandsassociaties instellen"
+msgstr "Bestandstoewijzingen instellen"
 
 #. Keywords
 #: filetypes/filetypes.desktop:16
@@ -1332,9 +1328,9 @@ msgid ""
 "fonts;font size;styles;charsets;character sets;panel;kicker;control panel;"
 "desktops;FileManager;Toolbars;Menu;Window Title;Title;"
 msgstr ""
-"fonts;font;letters;lettertypen;lettertypes;tekenset;tekenverzamelingen;"
-"paneel;kicker;configuratiecentrum;stijl;bestandsbeheerder;werkbalk;menu;"
-"venster;titel;venstertitel;desktops;bureaubladen;"
+"fonts;font;letters;lettertypen;lettertypes;tekenset;tekenverzamelingen;paneel"
+";kicker;configuratiecentrum;stijl;bestandsbeheerder;werkbalk;menu;venster;tit"
+"el;venstertitel;desktops;bureaubladen;systeeminstellingen;"
 
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:2
@@ -1352,39 +1348,37 @@ msgstr "Meerdere monitoren"
 #. Comment
 #: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
 msgid "Monitor hardware devices from the system tray"
-msgstr ""
+msgstr "Monitor apparaten vanuit het systeemvak"
 
 #. Name
 #: hwmanager/hwmanager.desktop:11
-#, fuzzy
 msgid "Device Manager"
-msgstr "TDE-systeemdiensten"
+msgstr "Apparaatbeheer"
 
 #. Comment
 #: hwmanager/hwmanager.desktop:13
-#, fuzzy
 msgid "Configure hardware devices"
-msgstr "Hier kunt u het gedrag van de webbrowser instellen"
+msgstr "Apparaten instellen"
 
 #. Keywords
 #: hwmanager/hwmanager.desktop:15
 msgid "hardware;devices;manager;"
-msgstr ""
+msgstr "hardware;apparaten;apparaat;beheer;devices;manager;"
 
 #. Comment
 #: iccconfig/iccconfig.desktop:14
 msgid "Configure display ICC color profile"
-msgstr ""
+msgstr "Icc-kleurprofielen instellen"
 
 #. Keywords
 #: iccconfig/iccconfig.desktop:16
 msgid "ICC;display;color;profile;"
-msgstr ""
+msgstr "Icc;scherm;weergave;kleur;profiel;"
 
 #. Name
 #: iccconfig/iccconfig.desktop:18
 msgid "Color Profile"
-msgstr ""
+msgstr "Kleurprofiel"
 
 #. Name
 #: icons/icons.desktop:12
@@ -1451,27 +1445,27 @@ msgstr "dma;DMA-channels;systeeminformatie;DMA-kanalen;"
 #. Name
 #: info/interrupts.desktop:13
 msgid "Interrupts"
-msgstr ""
+msgstr "Onderbrekingen"
 
 #. Comment
 #: info/interrupts.desktop:15
 msgid "Interrupt information"
-msgstr "Interrupt-informatie"
+msgstr "Ondebrekingsinformatie"
 
 #. Keywords
 #: info/interrupts.desktop:17
 msgid "Interrupts;IRQ;System Information;"
-msgstr "interrupts;IRQ;systeeminformatie;"
+msgstr "interrupts;IRQ;systeeminformatie;onderbreking;"
 
 #. Name
 #: info/ioports.desktop:13
 msgid "IO-Ports"
-msgstr "IO-Poorten"
+msgstr "I/O-poorten"
 
 #. Comment
 #: info/ioports.desktop:15
 msgid "IO-port information"
-msgstr "IO-poortinformatie"
+msgstr "I/O-poortinformatie"
 
 #. Keywords
 #: info/ioports.desktop:17
@@ -1503,7 +1497,7 @@ msgstr ""
 #. Name
 #: info/opengl.desktop:13
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
 #. Comment
 #: info/opengl.desktop:15
@@ -1537,12 +1531,12 @@ msgstr "partities;harddrive;HD;systeeminformatie;harde schijf;"
 #. Name
 #: info/pci.desktop:12
 msgid "PCI"
-msgstr ""
+msgstr "Pci"
 
 #. Comment
 #: info/pci.desktop:14
 msgid "PCI information"
-msgstr "PCI-informatie"
+msgstr "Pci-informatie"
 
 #. Keywords
 #: info/pci.desktop:16
@@ -1568,12 +1562,12 @@ msgstr "processor;CPU;FPU;MHz;systeeminformatie;"
 #. Name
 #: info/scsi.desktop:12
 msgid "SCSI"
-msgstr ""
+msgstr "Scsi"
 
 #. Comment
 #: info/scsi.desktop:14
 msgid "SCSI information"
-msgstr "SCSI-informatie"
+msgstr "Scsi-informatie"
 
 #. Keywords
 #: info/scsi.desktop:16
@@ -1603,7 +1597,7 @@ msgstr "X-server"
 #. Comment
 #: info/xserver.desktop:14
 msgid "X-Server information"
-msgstr "X-Server-informatie"
+msgstr "X-serverinformatie"
 
 #. Keywords
 #: info/xserver.desktop:16
@@ -1633,9 +1627,30 @@ msgstr ""
 "pointers;drag;verslepen;dubbelklikken;linkshandig;rechtshandig.randapparaten;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Touchpad"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "Touchpadinstellingen"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"muis;muissnelheid;muisknoppen;selectie;cursor-uiterlijk;input devices;invoera"
+"pparaten;knopindeling;klikken;iconen;pictogrammen;icons;aanwijzers;pointers;d"
+"rag;verslepen;dubbelklikken;linkshandig;rechtshandig.randapparaten;touchpad;"
+"tik om te klikken;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
-msgstr ""
+msgstr "Joystick"
 
 #. Comment
 #: joystick/joystick.desktop:14
@@ -1645,23 +1660,23 @@ msgstr "Joystick - een configuratiemodule voor het testen van Joysticks"
 #. Keywords
 #: joystick/joystick.desktop:16
 msgid "joystick;gamepad;"
-msgstr ""
+msgstr "joystick;gamepad;"
 
 #. Name
 #: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8
 #: kcontrol/tde-kcontrol.desktop:8
 msgid "Trinity Control Center"
-msgstr "Configuratiecentrum"
+msgstr "TDE-systeeminstellingen"
 
 #. Name
 #: kded/kcmkded.desktop:11
 msgid "Service Manager"
-msgstr "TDE-systeemdiensten"
+msgstr "Systeemdiensten"
 
 #. Comment
 #: kded/kcmkded.desktop:13
 msgid "System Services Configuration"
-msgstr "TDE-systeemdiensten instellen"
+msgstr "Systeemdiensten instellen"
 
 #. Keywords
 #: kded/kcmkded.desktop:15
@@ -1676,7 +1691,7 @@ msgstr "Sneltoetsen"
 #. Comment
 #: keys/keys.desktop:14
 msgid "Configuration of keybindings"
-msgstr "Instellingen voor sneltoetsen"
+msgstr "Sneltoetsen instellen"
 
 #. Keywords
 #: keys/keys.desktop:16
@@ -1695,7 +1710,7 @@ msgstr "Opmaak"
 #. Comment
 #: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13
 msgid "Configure the arrangement of the panel"
-msgstr "U kunt hier de opmaak van het paneel instellen"
+msgstr "Paneelopmaak en -indeling instellen"
 
 #. Keywords
 #: kicker/kicker_config.desktop:15 kicker/kicker_config_appearance.desktop:15
@@ -1719,12 +1734,12 @@ msgstr ""
 #. Name
 #: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11
 msgid "Appearance"
-msgstr "Uiterlijk"
+msgstr "Vormgeving"
 
 #. Comment
 #: kicker/kicker_config_appearance.desktop:13
 msgid "Configure the appearance of the panel"
-msgstr "U kunt hier de opmaak van het paneel instellen"
+msgstr "Zet de vormgeving van het paneel naar eigen hand"
 
 #. Name
 #: kicker/kicker_config_arrangement.desktop:11
@@ -1739,7 +1754,7 @@ msgstr "Verbergwijze"
 #. Comment
 #: kicker/kicker_config_hiding.desktop:13
 msgid "Configure the hiding of the panel"
-msgstr "U kunt hier de verbergwijze van het paneel instellen"
+msgstr "Stel de verbergwijze van het paneel in"
 
 #. Name
 #: kicker/kicker_config_menus.desktop:11
@@ -1749,7 +1764,7 @@ msgstr "Menu's"
 #. Comment
 #: kicker/kicker_config_menus.desktop:13
 msgid "Configure the menus of the panel"
-msgstr "U kunt hier de menu's van het paneel instellen"
+msgstr "Stel de menu's van het paneel in"
 
 #. Name
 #: kicker/panel.desktop:10
@@ -1759,17 +1774,17 @@ msgstr "Panelen"
 #. Comment
 #: kicker/panel.desktop:12
 msgid "Configure the arrangement of the panels"
-msgstr "U kunt hier de opmaak van het paneel instellen"
+msgstr "Stel de indeling van panelen in"
 
 #. Name
 #: knotify/kcmnotify.desktop:11
 msgid "System Notifications"
-msgstr "Systeemnotificaties"
+msgstr "Systeemmeldingen"
 
 #. Comment
 #: knotify/kcmnotify.desktop:13
 msgid "System Notification Configuration"
-msgstr "Instellingen van de systeemnotificatie"
+msgstr "Systeemmeldingen instellen"
 
 #. Keywords
 #: knotify/kcmnotify.desktop:15
@@ -1780,19 +1795,19 @@ msgstr ""
 #. Name
 #: konq/desktop.desktop:11
 msgid "Multiple Desktops"
-msgstr "Virtuele bureaubladen"
+msgstr "Virtuele werkbladen"
 
 #. Comment
 #: konq/desktop.desktop:13
 msgid "You can configure how many virtual desktops there are"
-msgstr "U kunt hier bepalen hoeveel virtuele bureaubladen u wilt gebruiken"
+msgstr "Geef aan hoeveel virtuele werkbladen u wilt gebruiken"
 
 #. Keywords
 #: konq/desktop.desktop:15
 msgid "desktop;desktops;number;virtual desktop;"
 msgstr ""
 "desktop;bureaublad;bureaubladen;naam van bureaublad;nummer;bureaubladtelling;"
-"virtuele bureaubladen;"
+"virtuele bureaubladen;werkblad;"
 
 #. Name
 #: konq/desktopbehavior.desktop:12 konq/filebehavior.desktop:11
@@ -1802,7 +1817,7 @@ msgstr "Gedrag"
 #. Comment
 #: konq/desktopbehavior.desktop:14
 msgid "You can configure how the desktop behaves here"
-msgstr "Hier kunt u het gedrag van uw desktop instellen"
+msgstr "Stel het gedrag van het bureaublad in"
 
 #. Keywords
 #: konq/desktopbehavior.desktop:16
@@ -1816,13 +1831,12 @@ msgstr ""
 #. Name
 #: konq/desktoppath.desktop:11
 msgid "Paths"
-msgstr "Paden"
+msgstr "Locaties"
 
 #. Comment
 #: konq/desktoppath.desktop:13
 msgid "Change the location important files are stored"
-msgstr ""
-"Hier kunt u de locatie voor het opslaan van belangrijke bestanden wijzigen"
+msgstr "Hier kunt u de opslaglocaties van belangrijke bestanden wijzigen"
 
 #. Keywords
 #: konq/desktoppath.desktop:15
@@ -1874,13 +1888,13 @@ msgstr ""
 #. Name
 #: konq/filepreviews.desktop:11
 msgid "Previews & Metadata"
-msgstr "Voorbeelden en meta-data"
+msgstr "Voorbeelden en metagegevens"
 
 #. Comment
 #: konq/filepreviews.desktop:13
 msgid "Configure how Konqueror Previews & Meta-data work"
 msgstr ""
-"Hier kunt u instellen hoe de voorbeelden en metadata in Konqueror werken"
+"Hier kunt u instellen hoe de voorbeelden en metagegevens in Konqueror werken"
 
 #. Keywords
 #: konq/filepreviews.desktop:15
@@ -1950,26 +1964,23 @@ msgstr "konqueror;kfm;browser;html;web;www;java;javascript;internet;"
 
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
-#, fuzzy
 msgid "User Interface"
-msgstr "Netwerkinterfaces"
+msgstr "Vormgeving"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
-#, fuzzy
 msgid "Configure user interface options"
-msgstr "Hier kunt u de webcache instellen"
+msgstr "Zet de vormgeving naar eigen hand"
 
 #. Keywords
 #: konqhtml/tdehtml_userinterface.desktop:15
-#, fuzzy
 msgid "konqueror;kfm;user;interface;tabbed;browsing;"
-msgstr "konqueror;hergebruik;preloading;"
+msgstr "konqueror;kfm;tabblad;surfen;gebruiker;vormgeving;"
 
 #. Name
 #: konsole/kcmkonsole.desktop:10
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Comment
 #: konsole/kcmkonsole.desktop:12
@@ -2001,7 +2012,7 @@ msgstr "thema's;uiterlijk en gedrag;"
 #. Name
 #: kthememanager/kthememanager.desktop:6
 msgid "Theme Manager"
-msgstr "Themabeheerder"
+msgstr "Themabeheer"
 
 #. Comment
 #: kthememanager/x-ktheme.desktop:3
@@ -2011,14 +2022,13 @@ msgstr "TDE-thema"
 #. Name
 #: launch/kcmlaunch.desktop:12
 msgid "Launch Feedback"
-msgstr "Opstartnotificatie"
+msgstr "Opstartmelding"
 
 #. Comment
 #: launch/kcmlaunch.desktop:14
 msgid "Choose application-launch feedback style"
 msgstr ""
-"Hier kunt u bepalen hoe u visueel wordt geattendeerd op het opstarten van "
-"een toepassing."
+"Geef aan op welke wijze het opstarten van programma's dient te worden getoond"
 
 #. Keywords
 #: launch/kcmlaunch.desktop:16
@@ -2030,17 +2040,17 @@ msgstr ""
 #. Name
 #: locale/default/entry.desktop:2
 msgid "English (American)"
-msgstr "VS Engels"
+msgstr "Engels (VS)"
 
 #. Name
 #: locale/language.desktop:12
 msgid "Country/Region & Language"
-msgstr "Land/regio en taal"
+msgstr "Land, regio en taal"
 
 #. Comment
 #: locale/language.desktop:14
 msgid "Language, numeric, and time settings for your particular region"
-msgstr "Taal-, numerieke, en tijdsinstelling voor uw eigen regio"
+msgstr "Taal-, numerieke en tijdsinstellingen van uw eigen regio"
 
 #. Keywords
 #: locale/language.desktop:16
@@ -2116,7 +2126,7 @@ msgstr "Grootte en oriëntatie"
 #. Comment
 #: randr/randr.desktop:11
 msgid "Resize and Rotate your display"
-msgstr "Wijzig de schermgrootte en roteer deze"
+msgstr "Wijzig de schermgrootte en/of draai het scherm"
 
 #. Keywords
 #: randr/randr.desktop:13
@@ -2128,17 +2138,17 @@ msgstr ""
 #. Name
 #: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
 msgid "TDERandRTray"
-msgstr ""
+msgstr "TDERandRTray"
 
 #. GenericName
 #: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
 msgid "Screen Resize & Rotate"
-msgstr "Scherm roteren en grootte wijzigen"
+msgstr "Schermgrootte aanpassen en draaien"
 
 #. Comment
 #: randr/tderandrtray-autostart.desktop:6 randr/tderandrtray.desktop:6
 msgid "Resize and rotate X screens."
-msgstr "Scherm roteren en van grootte veranderen"
+msgstr "Scherm draaien en van grootte veranderen."
 
 #. Name
 #: samba/smbstatus.desktop:12
@@ -2214,7 +2224,7 @@ msgstr "Hier kunt u de spellingcontrole instellen"
 #. Keywords
 #: spellchecking/spellchecking.desktop:15
 msgid "Spell;"
-msgstr ""
+msgstr "Spelling;Grammatica;"
 
 #. Name
 #: style/style.desktop:13
@@ -2226,8 +2236,8 @@ msgstr "Stijl"
 msgid ""
 "Allows the manipulation of widget behavior and changing the Style for TDE"
 msgstr ""
-"Hiermee kunt u het gedrag van de widgets aanpassen en de stijl van TDE "
-"wijzigen"
+"Hier kunt u het gedrag van de knoppen en dergelijke aanpassen, en de stijl "
+"van TDE wijzigen"
 
 #. Keywords
 #: style/style.desktop:17
@@ -2302,9 +2312,8 @@ msgstr "Lettertypebestanden"
 
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:2
-#, fuzzy
 msgid "TDEFontView"
-msgstr "Lettertypeweergave"
+msgstr "TDEFontView"
 
 #. GenericName
 #. Name
@@ -2316,7 +2325,7 @@ msgstr "Lettertypeweergave"
 #. Name
 #: tdeio/cache.desktop:12
 msgid "Cache"
-msgstr ""
+msgstr "Cache"
 
 #. Comment
 #: tdeio/cache.desktop:14
@@ -2331,12 +2340,12 @@ msgstr "cache;historie;geschiedenis;grootte;internet;"
 #. Name
 #: tdeio/cookies.desktop:12
 msgid "Cookies"
-msgstr ""
+msgstr "Cookies"
 
 #. Comment
 #: tdeio/cookies.desktop:14
 msgid "Configure the way cookies work"
-msgstr "Hier kunt u het cookiesbeleid instellen"
+msgstr "Hier kunt u het cookiebeleid instellen"
 
 #. Keywords
 #: tdeio/cookies.desktop:16
@@ -2376,12 +2385,12 @@ msgstr "Verbindingsvoorkeuren"
 #. Name
 #: tdeio/proxy.desktop:12
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #. Comment
 #: tdeio/proxy.desktop:14
 msgid "Configure the proxy servers used"
-msgstr "Hier kunt u de Proxy-servers instellen"
+msgstr "Hier kunt u proxyservers instellen"
 
 #. Keywords
 #: tdeio/proxy.desktop:16
@@ -2525,7 +2534,7 @@ msgstr ""
 #. Name
 #: usbview/kcmusb.desktop:10
 msgid "USB Devices"
-msgstr "USB-apparaten"
+msgstr "Usb-apparaten"
 
 #. Comment
 #: usbview/kcmusb.desktop:12
@@ -2560,12 +2569,12 @@ msgstr ""
 #. Name
 #: xinerama/xinerama.desktop:10
 msgid "Multiple Monitors"
-msgstr "Meerdere monitoren"
+msgstr "Meerdere beeldschermen"
 
 #. Comment
 #: xinerama/xinerama.desktop:12
 msgid "Configure TDE for multiple monitors"
-msgstr "Hier kunt u TDE voor meerdere monitoren instellen"
+msgstr "Hier kunt u TDE voor meerdere beeldschermen instellen"
 
 #. Keywords
 #: xinerama/xinerama.desktop:14
diff --git a/translations/desktop_files/kcontrol-desktops/nn.po b/translations/desktop_files/kcontrol-desktops/nn.po
index f745c494b..a16b624ef 100644
--- a/translations/desktop_files/kcontrol-desktops/nn.po
+++ b/translations/desktop_files/kcontrol-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1604,6 +1604,32 @@ msgstr ""
 "knappar;klikk;ikon;tilbakemelding;dra;dobbeltklikk;høgrehendt;venstrehendt;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Musinnstillingar"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"mus;musakselerasjon;musterskel;musknappar;val;peikar;peikarform;inneiningar;"
+"knappar;klikk;ikon;tilbakemelding;dra;dobbeltklikk;høgrehendt;venstrehendt;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Styrespak"
diff --git a/translations/desktop_files/kcontrol-desktops/nso.po b/translations/desktop_files/kcontrol-desktops/nso.po
index e942522e3..a95b51c52 100644
--- a/translations/desktop_files/kcontrol-desktops/nso.po
+++ b/translations/desktop_files/kcontrol-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1603,6 +1603,33 @@ msgstr ""
 "phetolo;Disupi;Topa;Tobetsopedi;mapping;swerwe ka lagoja;swerwe ka lanngele;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Dipeakanyo tsa Legotlo"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Legotlo;Koketso ya legotlo;Threshold ya legotlo;Ditobetswa tsa legotlo; "
+"Kgetho;Sebopego sa Cursor;Maano a Tsenyo;Mapping Setobetswa;Tobetsa; diemedi;"
+"phetolo;Disupi;Topa;Tobetsopedi;mapping;swerwe ka lagoja;swerwe ka lanngele;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/oc.po b/translations/desktop_files/kcontrol-desktops/oc.po
index f3023927e..3a33eef1b 100644
--- a/translations/desktop_files/kcontrol-desktops/oc.po
+++ b/translations/desktop_files/kcontrol-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1560,6 +1560,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Arranjament dèu ratolí"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Palanca de jogs"
diff --git a/translations/desktop_files/kcontrol-desktops/or.po b/translations/desktop_files/kcontrol-desktops/or.po
index d03150ee7..a515d5394 100644
--- a/translations/desktop_files/kcontrol-desktops/or.po
+++ b/translations/desktop_files/kcontrol-desktops/or.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/pa.po b/translations/desktop_files/kcontrol-desktops/pa.po
index 76b4713d3..4d8c2c60c 100644
--- a/translations/desktop_files/kcontrol-desktops/pa.po
+++ b/translations/desktop_files/kcontrol-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1587,6 +1587,33 @@ msgstr ""
 "righthanded;left handed;ਕਲਿੱਕ;ਆਈਕਾਨ;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "ਮਾਊਸ ਸੈਟਿੰਗ"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"ਮਾਊਸ;ਮਾਊਸ ਪ�ਰਵੇਸ਼;ਮਾਊਸ threshold;ਮਾਊਸ buttons;Selection;CursorShape;Input ਜੰਤਰ;"
+"Button Mapping;Click;icons;feedback;Pointers;Drag;DoubleClick;mapping;"
+"righthanded;left handed;ਕਲਿੱਕ;ਆਈਕਾਨ;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "ਜਾ�ਸਟਿੱਕ"
diff --git a/translations/desktop_files/kcontrol-desktops/pl.po b/translations/desktop_files/kcontrol-desktops/pl.po
index f6401a148..381e5689b 100644
--- a/translations/desktop_files/kcontrol-desktops/pl.po
+++ b/translations/desktop_files/kcontrol-desktops/pl.po
@@ -2,13 +2,14 @@
 # This file is put in the public domain.
 # Jan Stolarek <jwstolarek@gmail.com>, 2020.
 # Marek W <coronzon88@gmail.com>, 2022.
+# Jan Stolarek <jan.stolarek@mailbox.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2022-10-25 18:06+0000\n"
-"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2024-09-10 15:10+0000\n"
+"Last-Translator: Jan Stolarek <jan.stolarek@mailbox.org>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kcontrol-desktop-files/pl/>\n"
 "Language: pl\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.13.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -337,9 +338,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3
-#, fuzzy
 msgid "Alexa"
-msgstr "Odnośnik Alexa"
+msgstr "Alexa"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
@@ -400,7 +400,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:3
 msgid "AustroNaut"
-msgstr ""
+msgstr "AustroNaut"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:6
@@ -1595,6 +1595,34 @@ msgstr ""
 "leworęczny;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Ustawienia myszy"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mysz;Akceleracja myszy;Próg myszy;Przyciski myszy;Zaznaczenie;Kształt "
+"kursora;Urządzenia wejściowe;mapowanie przycisków;kliknięcie;ikony;widoczne "
+"efekty;wskaźniki;przeciąganie;podwójne kliknięcie;mapowanie;praworęczny;"
+"leworęczny;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Joystick"
diff --git a/translations/desktop_files/kcontrol-desktops/pt.po b/translations/desktop_files/kcontrol-desktops/pt.po
index f4235d1b3..18935e793 100644
--- a/translations/desktop_files/kcontrol-desktops/pt.po
+++ b/translations/desktop_files/kcontrol-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1614,6 +1614,33 @@ msgstr ""
 "cursores;arrastar;duplo 'click';atribuição;destro;esquerdino;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Configuração do rato"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"rato;aceleração do rato;limite do rato;botões do rato;selecção;forma do "
+"cursor;dispositivos de entrada;atribuição de botões;click;ícones;feedback;"
+"cursores;arrastar;duplo 'click';atribuição;destro;esquerdino;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/pt_BR.po b/translations/desktop_files/kcontrol-desktops/pt_BR.po
index d552224d2..12c5c4aac 100644
--- a/translations/desktop_files/kcontrol-desktops/pt_BR.po
+++ b/translations/desktop_files/kcontrol-desktops/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1604,6 +1604,33 @@ msgstr ""
 "ponteiros;arrastar;clique duplo;mapeamento;destro;canhoto;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Configurações do mouse"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;aceleração do mouse;limiar do mouse; botões do mouse;Seleção;Formato "
+"do Cursor;Dispositivos de entrada;mapeamento de botões;clique;ícones;retorno;"
+"ponteiros;arrastar;clique duplo;mapeamento;destro;canhoto;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ro.po b/translations/desktop_files/kcontrol-desktops/ro.po
index 95e8880fd..4b9095226 100644
--- a/translations/desktop_files/kcontrol-desktops/ro.po
+++ b/translations/desktop_files/kcontrol-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1599,6 +1599,33 @@ msgstr ""
 "indicatori;tragere;dublu clic;dreptaci;stîngaci;drag-and-drop;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Configurează mouse-ul"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"mouse;accelerație mouse;prag mouse;butoane mouse;selecție;formă cursor;"
+"dispozitive de intrare;mapare butoane;clicuri;iconițe;răspuns;pointeri;"
+"indicatori;tragere;dublu clic;dreptaci;stîngaci;drag-and-drop;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ru.po b/translations/desktop_files/kcontrol-desktops/ru.po
index a64d24200..ef078a99b 100644
--- a/translations/desktop_files/kcontrol-desktops/ru.po
+++ b/translations/desktop_files/kcontrol-desktops/ru.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2021, 2022.
-# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Alexander Golubev <fatzer2@gmail.com>, 2021, 2022, 2024, 2025.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2023-12-07 21:14+0000\n"
-"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2025-07-21 06:11+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kcontrol-desktop-files/ru/>\n"
 "Language: ru\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -98,8 +98,8 @@ msgstr "Ð�аÑ�тройка Ñ�иÑ�темного звукового Ñ�игналÐ
 #: bell/bell.desktop:17
 msgid "Bell;Audio;Sound;Volume;Pitch;Duration;"
 msgstr ""
-"Bell;Audio;Sound;Volume;Pitch;Duration;Звонок;�удио;Звук;Громко�ть;Сигнал;Тон"
-";Длительно�ть;"
+"Bell;Audio;Sound;Volume;Pitch;Duration;Звонок;�удио;Звук;Громко�ть;Сигнал;"
+"Тон;Длительно�ть;"
 
 #. Name
 #: clock/clock.desktop:13
@@ -130,8 +130,8 @@ msgstr "�а�тройка цветов"
 #: colors/colors.desktop:16
 msgid "colors;colours;scheme;contrast;Widget colors;Color Scheme;"
 msgstr ""
-"colors;colours;scheme;contrast;Widget colors;Color "
-"Scheme;цвета;�хема;тема;контра�т;цвет виджетов;цветова� �хема;"
+"colors;colours;scheme;contrast;Widget colors;Color Scheme;цвета;�хема;тема;"
+"контра�т;цвет виджетов;цветова� �хема;"
 
 #. Name
 #: componentchooser/EXAMPLE.desktop:1
@@ -169,7 +169,7 @@ msgstr ""
 #. Name
 #: componentchooser/componentservices/kcm_browser.desktop:1
 msgid "Web Browser"
-msgstr "Браузер"
+msgstr "Веб-браузер"
 
 #. Comment
 #: componentchooser/componentservices/kcm_browser.desktop:3
@@ -289,7 +289,7 @@ msgstr "Конфигураци� �крана"
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "monitor;resolution;display;монитор;разрешение;ди�плей;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -1277,6 +1277,9 @@ msgstr "�а�тройка управлени� питанием ди�пле�"
 #: energy/energy.desktop:15
 msgid "energy;saver;apm;acpi;dpms;timeout;blanking;stand by;suspend;power;"
 msgstr ""
+"energy;saver;apm;acpi;dpms;timeout;blanking;stand "
+"by;suspend;power;�нерги�;�охранение;таймаут;таймер;ждущий режим;дежурный "
+"режим;режим ожидани�;�п�щий режим;�нергопотребление;питание;"
 
 #. Name
 #: filetypes/filetypes.desktop:12
@@ -1598,6 +1601,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "�а�тройка мыши"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Джой�тик"
@@ -1737,7 +1759,7 @@ msgstr ""
 #. Name
 #: konq/desktop.desktop:11
 msgid "Multiple Desktops"
-msgstr "Виртуальные рабочие �толы"
+msgstr "Вирт. рабочие �толы"
 
 #. Comment
 #: konq/desktop.desktop:13
@@ -2250,7 +2272,7 @@ msgstr ""
 #. Name
 #: tdeio/cookies.desktop:12
 msgid "Cookies"
-msgstr ""
+msgstr "Куки"
 
 #. Comment
 #: tdeio/cookies.desktop:14
diff --git a/translations/desktop_files/kcontrol-desktops/rw.po b/translations/desktop_files/kcontrol-desktops/rw.po
index ddaa02fb5..7f77ba48b 100644
--- a/translations/desktop_files/kcontrol-desktops/rw.po
+++ b/translations/desktop_files/kcontrol-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1605,6 +1605,34 @@ msgstr ""
 "ibumoso.;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Amagenamiterere y'Imbeba"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Imbeba;Ukwihutisha imbeba;Intambwe y'imbeba;Buto z'imbeba; Ihitamo;Imisusire "
+"y'inyoborayandika;Apareye z'Icyinjira;Guhuza buto;Gukanda;udushushondanga;"
+"inkurikizi;Mweretsi;Gukurura;GukandaKabiri;guhuza;kiganza iburyo; kiganza "
+"ibumoso.;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Agakoreshamukino"
diff --git a/translations/desktop_files/kcontrol-desktops/se.po b/translations/desktop_files/kcontrol-desktops/se.po
index f6c0c52e2..e80e86ab0 100644
--- a/translations/desktop_files/kcontrol-desktops/se.po
+++ b/translations/desktop_files/kcontrol-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1589,6 +1589,33 @@ msgstr ""
 "duppalcoahkkaleapmi;olgešgiehtat;gurutgiehtat;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Sáhpánheivehusat"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"sáhpán;sáhpánaksellerašuvdna;sáhpánšielbma;sáhpánboalut; merken; "
+"njoallahápmi;sisaovttadagat;boalut;coahkkalit;govažat;feedback;geassit; "
+"duppalcoahkkaleapmi;olgešgiehtat;gurutgiehtat;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Stivrensággi"
diff --git a/translations/desktop_files/kcontrol-desktops/si.po b/translations/desktop_files/kcontrol-desktops/si.po
index c707ef70c..90a14da22 100644
--- a/translations/desktop_files/kcontrol-desktops/si.po
+++ b/translations/desktop_files/kcontrol-desktops/si.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1545,6 +1545,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/sk.po b/translations/desktop_files/kcontrol-desktops/sk.po
index 73302543f..0e76582bd 100644
--- a/translations/desktop_files/kcontrol-desktops/sk.po
+++ b/translations/desktop_files/kcontrol-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1593,6 +1593,33 @@ msgstr ""
 "kliknutie;dvojklik;mapovanie;praváci;ľaváci;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Nastavenie myši"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Myš;rýchlosť myši;tla�idlá myši;Ozna�enie;kurzor;Vstupné zariadenia;výber;"
+"tvar kurzoru;mapovanie tla�idiel;klik;kliknutie;ikony;ťahanie;dvojité "
+"kliknutie;dvojklik;mapovanie;praváci;ľaváci;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/sl.po b/translations/desktop_files/kcontrol-desktops/sl.po
index 66b39dadf..4c64a67a4 100644
--- a/translations/desktop_files/kcontrol-desktops/sl.po
+++ b/translations/desktop_files/kcontrol-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1593,6 +1593,33 @@ msgstr ""
 "klik;preslikava;levi�arji;desni�arji;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Nastavitve miške"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"miška;pospešitev miške;gumbi miške;izbira;oblika kazalca;vhodne enote;"
+"preslikava gumbov;klik;ikone;povratna informacija;kazalci;potegni;dvojni "
+"klik;preslikava;levi�arji;desni�arji;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Igralna palica"
diff --git a/translations/desktop_files/kcontrol-desktops/sr.po b/translations/desktop_files/kcontrol-desktops/sr.po
index 2a9857d55..76380ba45 100644
--- a/translations/desktop_files/kcontrol-desktops/sr.po
+++ b/translations/desktop_files/kcontrol-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1614,6 +1614,35 @@ msgstr ""
 "превуци;двоклик;мапирање;леворуки;де�норуки;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "По�тавке миша"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;миш;убрзавање миша;означавање;"
+"избор;облик показивача;показивач;мапирање дугмади;клик;иконе;показивачи;"
+"превуци;двоклик;мапирање;леворуки;де�норуки;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "�ој�тик"
diff --git a/translations/desktop_files/kcontrol-desktops/sr@Latn.po b/translations/desktop_files/kcontrol-desktops/sr@Latn.po
index 685e8c4df..ce7376d1d 100644
--- a/translations/desktop_files/kcontrol-desktops/sr@Latn.po
+++ b/translations/desktop_files/kcontrol-desktops/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1609,6 +1609,35 @@ msgstr ""
 "prevuci;dvoklik;mapiranje;levoruki;desnoruki;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Postavke miša"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;miš;ubrzavanje miša;ozna�avanje;"
+"izbor;oblik pokaziva�a;pokaziva�;mapiranje dugmadi;klik;ikone;pokaziva�i;"
+"prevuci;dvoklik;mapiranje;levoruki;desnoruki;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Džojstik"
diff --git a/translations/desktop_files/kcontrol-desktops/sr@ijekavian.po b/translations/desktop_files/kcontrol-desktops/sr@ijekavian.po
index 2ea860a26..fa3c45598 100644
--- a/translations/desktop_files/kcontrol-desktops/sr@ijekavian.po
+++ b/translations/desktop_files/kcontrol-desktops/sr@ijekavian.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1550,6 +1550,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/sr@ijekavianlatin.po b/translations/desktop_files/kcontrol-desktops/sr@ijekavianlatin.po
index fd17ecf24..95e95ef7f 100644
--- a/translations/desktop_files/kcontrol-desktops/sr@ijekavianlatin.po
+++ b/translations/desktop_files/kcontrol-desktops/sr@ijekavianlatin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1550,6 +1550,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/sr@latin.po b/translations/desktop_files/kcontrol-desktops/sr@latin.po
index 15291455f..9067f5459 100644
--- a/translations/desktop_files/kcontrol-desktops/sr@latin.po
+++ b/translations/desktop_files/kcontrol-desktops/sr@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1550,6 +1550,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/ss.po b/translations/desktop_files/kcontrol-desktops/ss.po
index 05833f648..6c7a7a441 100644
--- a/translations/desktop_files/kcontrol-desktops/ss.po
+++ b/translations/desktop_files/kcontrol-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1568,6 +1568,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Kuhlelwka kweligundvwane"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/sv.po b/translations/desktop_files/kcontrol-desktops/sv.po
index dded60491..22be13170 100644
--- a/translations/desktop_files/kcontrol-desktops/sv.po
+++ b/translations/desktop_files/kcontrol-desktops/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2025-08-30 19:11+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kcontrol-desktop-files/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -180,14 +181,13 @@ msgstr "Filhanterare"
 
 #. Comment
 #: componentchooser/componentservices/kcm_filemanager.desktop:3
-#, fuzzy
 msgid ""
 "This service allows you to configure your default file manager. All TDE "
 "applications which invoke a file manager application should honor this "
 "setting."
 msgstr ""
 "Den här tjänsten låter dig anpassa din förvalda terminalemulator. Alla TDE-"
-"program som startar ett terminalprogram ska använda den här inställningen"
+"program som startar ett terminalprogram ska använda den här inställningen."
 
 #. Name
 #: componentchooser/componentservices/kcm_kemail.desktop:1
@@ -202,7 +202,7 @@ msgid ""
 "this setting."
 msgstr ""
 "Den här tjänsten låter dig anpassa förvald e-postklient. Alla TDE-program "
-"som behöver använda e-postklient ska använda den här inställningen"
+"som behöver använda e-postklient ska använda den här inställningen."
 
 #. Name
 #: componentchooser/componentservices/kcm_terminal.desktop:1
@@ -217,7 +217,7 @@ msgid ""
 "setting."
 msgstr ""
 "Den här tjänsten låter dig anpassa din förvalda terminalemulator. Alla TDE-"
-"program som startar ett terminalprogram ska använda den här inställningen"
+"program som startar ett terminalprogram ska använda den här inställningen."
 
 #. Name
 #: crypto/crypto.desktop:10
@@ -267,18 +267,17 @@ msgstr "Anpassa bildskärm"
 #. Name
 #: displayconfig/displayconfig.desktop:12
 msgid "Monitor & Display"
-msgstr ""
+msgstr "Bildskärmar"
 
 #. Comment
 #: displayconfig/displayconfig.desktop:14
-#, fuzzy
 msgid "Configure display"
-msgstr "Anpassa tjänstupptäckt"
+msgstr "Anpassa skärmar"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "skärm;upplösning;display;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -327,7 +326,7 @@ msgstr "Sökmotor"
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3
 msgid "Acronym Database"
-msgstr ""
+msgstr "Akronymdatabas"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6
@@ -336,9 +335,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3
-#, fuzzy
 msgid "Alexa"
-msgstr "Alexa webbadress"
+msgstr "Alexa"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
@@ -1307,46 +1305,43 @@ msgstr ""
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2
 #: hwmanager/hwdevicetray.desktop:4
-#, fuzzy
 msgid "Device Monitor"
-msgstr "Flera bildskärmar"
+msgstr "Enhetsövervakare"
 
 #. Comment
 #: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
 msgid "Monitor hardware devices from the system tray"
-msgstr ""
+msgstr "Övervaka hårdvaruenheter från systemfältet"
 
 #. Name
 #: hwmanager/hwmanager.desktop:11
-#, fuzzy
 msgid "Device Manager"
-msgstr "Tjänsthanterare"
+msgstr "Enhetshanterare"
 
 #. Comment
 #: hwmanager/hwmanager.desktop:13
-#, fuzzy
 msgid "Configure hardware devices"
-msgstr "Anpassa webbläsarens beteende"
+msgstr "Konfigurera hårdvaruenheter"
 
 #. Keywords
 #: hwmanager/hwmanager.desktop:15
 msgid "hardware;devices;manager;"
-msgstr ""
+msgstr "hårdvara;enheter;hanterare;"
 
 #. Comment
 #: iccconfig/iccconfig.desktop:14
 msgid "Configure display ICC color profile"
-msgstr ""
+msgstr "Anpassa skärmens ICC-färgprofil"
 
 #. Keywords
 #: iccconfig/iccconfig.desktop:16
 msgid "ICC;display;color;profile;"
-msgstr ""
+msgstr "ICC;skärm;färg;profil;"
 
 #. Name
 #: iccconfig/iccconfig.desktop:18
 msgid "Color Profile"
-msgstr ""
+msgstr "Färgprofil"
 
 #. Name
 #: icons/icons.desktop:12
@@ -1460,7 +1455,7 @@ msgstr ""
 #. Name
 #: info/opengl.desktop:13
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
 #. Comment
 #: info/opengl.desktop:15
@@ -1494,7 +1489,7 @@ msgstr "Partitioner;HÃ¥rddisk;HD;Systeminformation;"
 #. Name
 #: info/pci.desktop:12
 msgid "PCI"
-msgstr ""
+msgstr "PCI"
 
 #. Comment
 #: info/pci.desktop:14
@@ -1508,9 +1503,8 @@ msgstr "PCI;PCI-enheter;PCI-buss;Systeminformation;"
 
 #. Name
 #: info/processor.desktop:12
-#, fuzzy
 msgid "Processor"
-msgstr "Processorinformation"
+msgstr "Processor"
 
 #. Comment
 #: info/processor.desktop:14
@@ -1525,7 +1519,7 @@ msgstr "Processor;CPU;FPU;MHz;Systeminformation;"
 #. Name
 #: info/scsi.desktop:12
 msgid "SCSI"
-msgstr ""
+msgstr "SCSI"
 
 #. Comment
 #: info/scsi.desktop:14
@@ -1589,6 +1583,25 @@ msgstr ""
 "Dubbelklick;Tolkning;högerhänt;vänsterhänt;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Pekplatta"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "Anpassa pekplatta"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Pekplatta;Knacka för att klicka;Mus;Musknappar;Inmatningsenheter;Tangentmappn"
+"ing;Tryck;Klick;mappning;högerhänt;vänsterhänt;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Styrspak"
@@ -1646,7 +1659,7 @@ msgstr ""
 #. Name
 #: kicker/kicker_config.desktop:11
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
 #. Comment
 #: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13
@@ -1889,26 +1902,23 @@ msgstr ""
 
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
-#, fuzzy
 msgid "User Interface"
-msgstr "Nätverksgränssnitt"
+msgstr "Användargränssnitt"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
-#, fuzzy
 msgid "Configure user interface options"
-msgstr "Anpassa webbcacheinställningar"
+msgstr "Anpassa gränssnittsinställningar"
 
 #. Keywords
 #: konqhtml/tdehtml_userinterface.desktop:15
-#, fuzzy
 msgid "konqueror;kfm;user;interface;tabbed;browsing;"
-msgstr "konqueror;återanvändning;förladdning;"
+msgstr "konqueror;kfm;användare;gränssnitt;flikar;bläddring;"
 
 #. Name
 #: konsole/kcmkonsole.desktop:10
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Comment
 #: konsole/kcmkonsole.desktop:12
@@ -2063,7 +2073,7 @@ msgstr "ändra storlek;rotera;skärm;färg;djup;storlek;horisontell;vertikal;"
 #. Name
 #: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
 msgid "TDERandRTray"
-msgstr ""
+msgstr "TDERandRTray"
 
 #. GenericName
 #: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
@@ -2245,7 +2255,7 @@ msgstr "Teckensnittsvisning"
 #. Name
 #: tdeio/cache.desktop:12
 msgid "Cache"
-msgstr ""
+msgstr "Cache"
 
 #. Comment
 #: tdeio/cache.desktop:14
diff --git a/translations/desktop_files/kcontrol-desktops/ta.po b/translations/desktop_files/kcontrol-desktops/ta.po
index fd51f0b36..b4e3dab64 100644
--- a/translations/desktop_files/kcontrol-desktops/ta.po
+++ b/translations/desktop_files/kcontrol-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1588,6 +1588,33 @@ msgstr ""
 "பொர�த�த�;வலத�கை பழக�கம�; இடத� கை பழக�கம�.;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "ச�ட�டி அமைப�ப�கள�"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"ச�ட�டி; ம�ட�க�கப�பட�ட ச�ட�டி ;  ச�ட�டி பட�டன�; தேர�வ�கள�; காட�டியின� வடிவம�; உள�ளிட�ம� "
+"சாதனம�;  பட�டன� பொர�த�தல�; க�ளிக�; சின�னம�; கர�த�த� ; காட�டிகள�; இழ�; இரண�ட�ம�றை க�ளிக�; "
+"பொர�த�த�;வலத�கை பழக�கம�; இடத� கை பழக�கம�.;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "இயக�க� கர�வி"
diff --git a/translations/desktop_files/kcontrol-desktops/te.po b/translations/desktop_files/kcontrol-desktops/te.po
index e50c8ab28..9445c960d 100644
--- a/translations/desktop_files/kcontrol-desktops/te.po
+++ b/translations/desktop_files/kcontrol-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1557,6 +1557,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "మౌస� అమరికల�"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "జాయ� స�టిక�"
diff --git a/translations/desktop_files/kcontrol-desktops/tg.po b/translations/desktop_files/kcontrol-desktops/tg.po
index 2636ade72..8e5ae3541 100644
--- a/translations/desktop_files/kcontrol-desktops/tg.po
+++ b/translations/desktop_files/kcontrol-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1593,6 +1593,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Танзимоти муш"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/th.po b/translations/desktop_files/kcontrol-desktops/th.po
index 86a9b798c..b11dda261 100644
--- a/translations/desktop_files/kcontrol-desktops/th.po
+++ b/translations/desktop_files/kcontrol-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1585,6 +1585,32 @@ msgstr ""
 "อุป�รณ์นำเข้า;�ารจับคู่ปุ่ม;คลิ้�;ไอคอน;ตัวชี้;ลา�;ดับเบิลคลิ้�;�าร�มพปุ่ม;ใช้มือซ้าย;ใช้มือขวา;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "ตั้งค่าเม้าส์"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"เม้าส์;�ารเร่งความเร็วของเม้าส์;ระยะตัวชี้ของเม้าส์;ปุ่มเม้าส์;�ารเลือ�;รูปร่างเคอร์เซอร์;"
+"อุป�รณ์นำเข้า;�ารจับคู่ปุ่ม;คลิ้�;ไอคอน;ตัวชี้;ลา�;ดับเบิลคลิ้�;�าร�มพปุ่ม;ใช้มือซ้าย;ใช้มือขวา;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "จอยสติ�"
diff --git a/translations/desktop_files/kcontrol-desktops/tr.po b/translations/desktop_files/kcontrol-desktops/tr.po
index 5498bbbae..ea15d39a7 100644
--- a/translations/desktop_files/kcontrol-desktops/tr.po
+++ b/translations/desktop_files/kcontrol-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1579,6 +1579,33 @@ msgstr ""
 "Tıkla;haritalama;sağ elli;sol elli;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Fare ayarları"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"fare;Fare Hızlandırma;Fare eşiği;Fare Tuşları;Seçim;imleç şekli;girdi "
+"aygıtları;Tuş Haritası;Tıklama;simgeler;geri besleme;İşaretçiler;Taşı;Çift "
+"Tıkla;haritalama;sağ elli;sol elli;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Oyun Çubuğu"
diff --git a/translations/desktop_files/kcontrol-desktops/tt.po b/translations/desktop_files/kcontrol-desktops/tt.po
index c6efdc6dc..65bf54c0b 100644
--- a/translations/desktop_files/kcontrol-desktops/tt.po
+++ b/translations/desktop_files/kcontrol-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1569,6 +1569,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Küse Caylaw"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Joystik"
diff --git a/translations/desktop_files/kcontrol-desktops/ug.po b/translations/desktop_files/kcontrol-desktops/ug.po
index d9bdd8bd4..05d7b3a73 100644
--- a/translations/desktop_files/kcontrol-desktops/ug.po
+++ b/translations/desktop_files/kcontrol-desktops/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1548,6 +1548,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr ""
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/uk.po b/translations/desktop_files/kcontrol-desktops/uk.po
index 645cf0173..6e3c237b8 100644
--- a/translations/desktop_files/kcontrol-desktops/uk.po
+++ b/translations/desktop_files/kcontrol-desktops/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-07-23 00:38+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\n"
+"PO-Revision-Date: 2024-10-02 18:11+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kcontrol-desktop-files/uk/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -1636,6 +1636,25 @@ msgstr ""
 "вказівники;перет�гнути;подвійне клацанн�;відображенн�;лівша;правша;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr "Touchpad"
+
+#. Comment
+#: input/touchpad.desktop:14
+msgid "Touchpad settings"
+msgstr "�алаштуванн� Touchpad"
+
+#. Keywords
+#: input/touchpad.desktop:15
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Touchpad;Стукнути дл� клацанн�;Миша;Кнопки миші;При�трій Вводу;Мапа "
+"Кнопок;Стукнути;Клацнути;мапуванн�;правша;лівша;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Джой�тик"
diff --git a/translations/desktop_files/kcontrol-desktops/uz.po b/translations/desktop_files/kcontrol-desktops/uz.po
index d911c82f1..a4c63ac1c 100644
--- a/translations/desktop_files/kcontrol-desktops/uz.po
+++ b/translations/desktop_files/kcontrol-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1592,6 +1592,34 @@ msgstr ""
 "chap qoʻl;oʻng qoʻl;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Sichqonchaning moslamalari"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Sichqoncha;Sichqonchani tezlashtirish;Mouse threshold;Sichqonchaning "
+"tugmalari;Tanlash;Kursorning shakillari;Kiritish uskunasi;Tugmani aniqlash;"
+"Bosish;nishonchalar;feedback;Koʻrsatgichlar;Drag;Ikki marta bosish;mapping;"
+"chap qoʻl;oʻng qoʻl;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Joystik"
diff --git a/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po b/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po
index b7dcf9c3d..8f4c94c66 100644
--- a/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1591,6 +1591,34 @@ msgstr ""
 "қўл;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Сичқончанинг мо�ламалари"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Сичқонча;Сичқончани тезлаштириш;Mouse threshold;Сичқончанинг тугмалари;"
+"Танлаш;Кур�орнинг шакиллари;Киритиш у�куна�и;Тугмани аниқлаш;Бо�иш;"
+"нишончалар;feedback;Кўр�атгичлар;Drag;Икки марта бо�иш;mapping;чап қўл;ўнг "
+"қўл;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Жой�тик"
diff --git a/translations/desktop_files/kcontrol-desktops/ven.po b/translations/desktop_files/kcontrol-desktops/ven.po
index adcc0f9f8..2fc07c508 100644
--- a/translations/desktop_files/kcontrol-desktops/ven.po
+++ b/translations/desktop_files/kcontrol-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1603,6 +1603,33 @@ msgstr ""
 "uputedza luvhili;utalulusa;tshaula;tshamonde;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Mavhekanyele a Mausu"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mausu;U gonyisa mausu;mausu;bathene ya mausu;nanga;tshivhumbeo tsha Cursor;"
+"maano a InputSedzulusa bathene;u putedza;aikhonoPhindulo;vhasumbedzi;kokodza;"
+"uputedza luvhili;utalulusa;tshaula;tshamonde;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Thambo dzau tumanya na tshishumiswa"
diff --git a/translations/desktop_files/kcontrol-desktops/vi.po b/translations/desktop_files/kcontrol-desktops/vi.po
index eebd73717..903e3b4fa 100644
--- a/translations/desktop_files/kcontrol-desktops/vi.po
+++ b/translations/desktop_files/kcontrol-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1591,6 +1591,33 @@ msgstr ""
 "tay phải;thuận tay trái;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Thiết lập chuột"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Chuột;Gia tốc chuột;Giới hạn chuột;Nút chuột;Ch�n;Kiểu dáng Con tr�;Thiết bị "
+"Nhập;�nh xạ Nút;Nhấn;biểu tượng;phản hồi;Con tr�;Kéo;Nhấn đúp;ánh xạ;thuận "
+"tay phải;thuận tay trái;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Cần đi�u khiển"
diff --git a/translations/desktop_files/kcontrol-desktops/wa.po b/translations/desktop_files/kcontrol-desktops/wa.po
index 050766017..c0b8a8427 100644
--- a/translations/desktop_files/kcontrol-desktops/wa.po
+++ b/translations/desktop_files/kcontrol-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1628,6 +1628,33 @@ msgstr ""
 "droetî;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Apontiaedjes del sori"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Sori;botons del sori;foime del fletche;éndjins d' intrêye;clitche;clitchî;"
+"imådjetes;ritour;pondjeu;bodjî;dobe clitchî;dobe clitche;hintche mwin;gôchî;"
+"droetî;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Djîsse di djeu"
diff --git a/translations/desktop_files/kcontrol-desktops/xh.po b/translations/desktop_files/kcontrol-desktops/xh.po
index 031d5f458..967d8917c 100644
--- a/translations/desktop_files/kcontrol-desktops/xh.po
+++ b/translations/desktop_files/kcontrol-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1609,6 +1609,34 @@ msgstr ""
 "sasekhohlo;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Izicwangciso ze mouse"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Unyuso lwesantya seMouse;Ungeno lwe Mouse;Amaqhosha eMouse;Ukhetho;"
+"Ukumila kwesalathisi;Amacebo egalelo;Ukucetywa kwamaqhosha;Nqakraza;ii-icon; "
+"isiphumo;Izalathi;Tsala;Nqakraza kabini;iyaceba;isandla sokunene;isandla "
+"sasekhohlo;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Uvuyo"
diff --git a/translations/desktop_files/kcontrol-desktops/zh_CN.po b/translations/desktop_files/kcontrol-desktops/zh_CN.po
index e89499c07..70266cbe7 100644
--- a/translations/desktop_files/kcontrol-desktops/zh_CN.po
+++ b/translations/desktop_files/kcontrol-desktops/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1607,6 +1607,35 @@ msgstr ""
 "左手习惯;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "鼠标设置"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;鼠标;鼠标加速;鼠标加速阈值;鼠标"
+"按钮;选择;光标形状;输入设备;按钮映射;�击;图标;�馈;拖放;�击;映射;�手习惯;"
+"左手习惯;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "游��"
diff --git a/translations/desktop_files/kcontrol-desktops/zh_TW.po b/translations/desktop_files/kcontrol-desktops/zh_TW.po
index 21cd7f317..a11d6d0ab 100644
--- a/translations/desktop_files/kcontrol-desktops/zh_TW.po
+++ b/translations/desktop_files/kcontrol-desktops/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1615,6 +1615,35 @@ msgstr ""
 "射;習慣�手;習慣左手 ;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "滑鼠設定"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+"Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+"DoubleClick;mapping;right handed;left handed;滑鼠;滑鼠游標加速;滑鼠游標加速間"
+"�;滑鼠按鈕;�擇;指標外觀;輸入設備;按��應;單擊;圖示;�饋;指標;拖放;雙擊;映"
+"射;習慣�手;習慣左手 ;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "玩具"
diff --git a/translations/desktop_files/kcontrol-desktops/zu.po b/translations/desktop_files/kcontrol-desktops/zu.po
index 1ffb58bdc..13b74fe18 100644
--- a/translations/desktop_files/kcontrol-desktops/zu.po
+++ b/translations/desktop_files/kcontrol-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-09-08 18:11+0000\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"
@@ -1607,6 +1607,35 @@ msgstr ""
 "okwesandla sangakwesokunxele;"
 
 #. Name
+#: input/touchpad.desktop:13
+msgid "Touchpad"
+msgstr ""
+
+#. Comment
+#: input/touchpad.desktop:14
+#, fuzzy
+#| msgid "Mouse settings"
+msgid "Touchpad settings"
+msgstr "Izilungiselelo ze-Mouse"
+
+#. Keywords
+#: input/touchpad.desktop:15
+#, fuzzy
+#| msgid ""
+#| "Mouse;Mouse acceleration;Mouse threshold;Mouse buttons;Selection;Cursor "
+#| "Shape;Input Devices;Button Mapping;Click;icons;feedback;Pointers;Drag;"
+#| "DoubleClick;mapping;right handed;left handed;"
+msgid ""
+"Touchpad;Tap to click;Mouse;Mouse buttons;Input Devices;Button Mapping;Tap;"
+"Click;mapping;right handed;left handed;"
+msgstr ""
+"i-Mouse;Ukugijimisa kwe-Mouse;i-Mouse threshold; Izinkinobho ze-Mouse;"
+"Ukhetho;Isimo senkomba;Amthuluzi Omphumela wangaphakathi;Ukuqondanisa "
+"Izinkinobho;Cofa;Izimpawu zezithombe; umphumela obuyayo;Izinkomba zendawo "
+"yokubhala;Hudula;Cofa-kabili; ukuqondanisa;okwesanadla sangakwesokudla;"
+"okwesandla sangakwesokunxele;"
+
+#. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
 msgstr "Induku yenjabulo"
diff --git a/translations/desktop_files/kcontrol-eventsrc/es_AR.po b/translations/desktop_files/kcontrol-eventsrc/es_AR.po
new file mode 100644
index 000000000..cf8218947
--- /dev/null
+++ b/translations/desktop_files/kcontrol-eventsrc/es_AR.po
@@ -0,0 +1,102 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-18 03:57+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Comment
+#: access/eventsrc:3
+msgid "Accessibility Tool"
+msgstr ""
+
+#. Name
+#: access/eventsrc:6
+msgid "A modifier key has become active"
+msgstr ""
+
+#. Comment
+#: access/eventsrc:7
+msgid ""
+"A modifier key (e.g. Shift or Ctrl) has changed its state and is now active"
+msgstr ""
+
+#. Name
+#: access/eventsrc:13
+msgid "A modifier key has become inactive"
+msgstr ""
+
+#. Comment
+#: access/eventsrc:14
+msgid ""
+"A modifier key (e.g. Shift or Ctrl) has changed its state and is now inactive"
+msgstr ""
+
+#. Name
+#: access/eventsrc:20
+msgid "A modifier key has been locked"
+msgstr ""
+
+#. Comment
+#: access/eventsrc:21
+msgid ""
+"A modifier key (e.g. Shift or Ctrl) has been locked and is now active for "
+"all of the following keypresses"
+msgstr ""
+
+#. Name
+#: access/eventsrc:27
+msgid "A lock key has been activated"
+msgstr ""
+
+#. Comment
+#: access/eventsrc:28
+msgid ""
+"A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now "
+"active"
+msgstr ""
+
+#. Name
+#: access/eventsrc:34
+msgid "A lock key has been deactivated"
+msgstr ""
+
+#. Comment
+#: access/eventsrc:35
+msgid ""
+"A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now "
+"inactive"
+msgstr ""
+
+#. Name
+#. Comment
+#: access/eventsrc:41 access/eventsrc:42
+msgid "Sticky keys has been enabled or disabled"
+msgstr ""
+
+#. Name
+#. Comment
+#: access/eventsrc:48 access/eventsrc:49
+msgid "Slow keys has been enabled or disabled"
+msgstr ""
+
+#. Name
+#. Comment
+#: access/eventsrc:55 access/eventsrc:56
+msgid "Bounce keys has been enabled or disabled"
+msgstr ""
+
+#. Name
+#. Comment
+#: access/eventsrc:62 access/eventsrc:63
+msgid "Mouse keys has been enabled or disabled"
+msgstr ""
diff --git a/translations/desktop_files/kcontrol-eventsrc/ka.po b/translations/desktop_files/kcontrol-eventsrc/ka.po
index b48e80721..6350aeabc 100644
--- a/translations/desktop_files/kcontrol-eventsrc/ka.po
+++ b/translations/desktop_files/kcontrol-eventsrc/ka.po
@@ -1,55 +1,57 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-18 03:57+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: 2024-12-10 22:12+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kcontrol-events/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: access/eventsrc:3
 msgid "Accessibility Tool"
-msgstr "დ�მხმ�რე ს�შუ�ლებები"
+msgstr "წვდ�მ�დ�ბის პრ�გრ�მ�"
 
 #. Name
 #: access/eventsrc:6
-#, fuzzy
 msgid "A modifier key has become active"
-msgstr "დ�ბლ�კვის ღილ�კი გ��ქტივებული�"
+msgstr "მ�დიფიკ�ტ�რი ღილ�კი გ��ქტიურდ�"
 
 #. Comment
 #: access/eventsrc:7
 msgid ""
 "A modifier key (e.g. Shift or Ctrl) has changed its state and is now active"
 msgstr ""
+"მ�დიფიკ�ტ�რმ� ღილ�კმ� (მ�გ: Shift �ნ Ctrl) მდგ�მ�რე�ბ� შეიცვ�ლ� დ� �ხლ� "
+"�ქტიური�"
 
 #. Name
 #: access/eventsrc:13
-#, fuzzy
 msgid "A modifier key has become inactive"
-msgstr "დ�ბლ�კვის ღილ�კი გ��ქტივებული�"
+msgstr "მ�დიფიკ�ტ�რი ღილ�კი �ხლ� �რ��ქტიური�"
 
 #. Comment
 #: access/eventsrc:14
 msgid ""
 "A modifier key (e.g. Shift or Ctrl) has changed its state and is now inactive"
 msgstr ""
+"მ�დიფიკ�ტ�რმ� ღილ�კმ� (მ�გ: Shift �ნ Ctrl) მდგ�მ�რე�ბ� შეიცვ�ლ� დ� �ხლ� "
+"�რ��ქტიური�"
 
 #. Name
 #: access/eventsrc:20
-#, fuzzy
 msgid "A modifier key has been locked"
-msgstr "დ�ბლ�კვის ღილ�კი გ��ქტივებული�"
+msgstr "მ�დიფიკ�ტ�რი ღილ�კი დ�ბლ�კილი�"
 
 #. Comment
 #: access/eventsrc:21
@@ -57,11 +59,13 @@ msgid ""
 "A modifier key (e.g. Shift or Ctrl) has been locked and is now active for "
 "all of the following keypresses"
 msgstr ""
+"მ�დიფიკ�ტ�რმ� ღილ�კმ� (მ�გ: Shift �ნ Ctrl) მდგ�მ�რე�ბ� შეიცვ�ლ� დ� �ხლ� "
+"�ქტიური� ყველ� შემდეგი ღილ�კების ნ�კრებისთვის"
 
 #. Name
 #: access/eventsrc:27
 msgid "A lock key has been activated"
-msgstr "დ�ბლ�კვის ღილ�კი გ��ქტივებული�"
+msgstr "დ�ბლ�კვის ღილ�კი გ��ქტიურებული�"
 
 #. Comment
 #: access/eventsrc:28
@@ -69,11 +73,13 @@ msgid ""
 "A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now "
 "active"
 msgstr ""
+"დ�ბლ�კვის ღილ�კმ� (მ�გ: Caps Lock �ნ Num Lock) შეიცვ�ლ� მდგ�მ�რე�ბ� დ� �ხლ� "
+"�ქტიური�"
 
 #. Name
 #: access/eventsrc:34
 msgid "A lock key has been deactivated"
-msgstr "დ�ბლ�კვის ღილ�კი �მ�რთული�"
+msgstr "დ�ბლ�კვის ღილ�კი �ქტიური �ღ�რ��"
 
 #. Comment
 #: access/eventsrc:35
@@ -81,31 +87,29 @@ msgid ""
 "A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now "
 "inactive"
 msgstr ""
+"დ�ბლ�კვის ღილ�კმ� (მ�გ: Caps Lock �ნ Num Lock) შეიცვ�ლ� მდგ�მ�რე�ბ� დ� �ხლ� "
+"�ქტიური �ღ�რ��"
 
 #. Name
 #. Comment
 #: access/eventsrc:41 access/eventsrc:42
-#, fuzzy
 msgid "Sticky keys has been enabled or disabled"
-msgstr "დ�ბლ�კვის ღილ�კი �მ�რთული�"
+msgstr "წებ�ვ�ნი ღილ�კები ჩ�რთული �ნ გ�მ�რთული�"
 
 #. Name
 #. Comment
 #: access/eventsrc:48 access/eventsrc:49
-#, fuzzy
 msgid "Slow keys has been enabled or disabled"
-msgstr "დ�ბლ�კვის ღილ�კი �მ�რთული�"
+msgstr "ნელი ღილ�კები ჩ�რთული �ნ გ�მ�რთული�"
 
 #. Name
 #. Comment
 #: access/eventsrc:55 access/eventsrc:56
-#, fuzzy
 msgid "Bounce keys has been enabled or disabled"
-msgstr "დ�ბლ�კვის ღილ�კი �მ�რთული�"
+msgstr "მხტუნ�ვი ღილ�კები ჩ�რთული �ნ გ�მ�რთული�"
 
 #. Name
 #. Comment
 #: access/eventsrc:62 access/eventsrc:63
-#, fuzzy
 msgid "Mouse keys has been enabled or disabled"
-msgstr "დ�ბლ�კვის ღილ�კი �მ�რთული�"
+msgstr "თ�გუნ�ს ღილ�კები ჩ�რთული �ნ გ�მ�რთული�"
diff --git a/translations/desktop_files/kcontrol-eventsrc/nl.po b/translations/desktop_files/kcontrol-eventsrc/nl.po
index 29bb5a310..4c3d893f7 100644
--- a/translations/desktop_files/kcontrol-eventsrc/nl.po
+++ b/translations/desktop_files/kcontrol-eventsrc/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-18 03:57+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: 2024-12-29 22:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kcontrol-events/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: access/eventsrc:3
@@ -24,33 +25,33 @@ msgstr "Toegankelijkheid"
 #. Name
 #: access/eventsrc:6
 msgid "A modifier key has become active"
-msgstr "Een modificatietoets is geactiveerd"
+msgstr "Er is een samensteltoets is geactiveerd"
 
 #. Comment
 #: access/eventsrc:7
 msgid ""
 "A modifier key (e.g. Shift or Ctrl) has changed its state and is now active"
 msgstr ""
-"De status van een modificatietoets (zoals Shift of Control) is gewijzigd en "
-"is nu actief"
+"De status van een samensteltoets (zoals Shift of Control) is gewijzigd en is "
+"nu actief"
 
 #. Name
 #: access/eventsrc:13
 msgid "A modifier key has become inactive"
-msgstr "Een modificatietoets is gedeactiveerd"
+msgstr "Er is een samensteltoets gedeactiveerd"
 
 #. Comment
 #: access/eventsrc:14
 msgid ""
 "A modifier key (e.g. Shift or Ctrl) has changed its state and is now inactive"
 msgstr ""
-"De status van een modificatietoets (zoals Shift of Control) is gewijzigd en "
-"is nu inactief"
+"De status van een samensteltoets (zoals Shift of Control) is gewijzigd en is "
+"nu inactief"
 
 #. Name
 #: access/eventsrc:20
 msgid "A modifier key has been locked"
-msgstr "Een modificatietoets is vergrendeld"
+msgstr "Er is een samensteltoets vergrendeld"
 
 #. Comment
 #: access/eventsrc:21
@@ -58,13 +59,13 @@ msgid ""
 "A modifier key (e.g. Shift or Ctrl) has been locked and is now active for "
 "all of the following keypresses"
 msgstr ""
-"Een modificatietoets (zoals Shift of Control) is vergrendeld en is nu actief "
+"Een samensteltoets (zoals Shift of Control) is vergrendeld en is nu actief "
 "voor de volgende toetsaanslagen"
 
 #. Name
 #: access/eventsrc:27
 msgid "A lock key has been activated"
-msgstr "Een vergrendeltoets is geactiveerd"
+msgstr "Er is een vergrendeltoets geactiveerd"
 
 #. Comment
 #: access/eventsrc:28
@@ -78,7 +79,7 @@ msgstr ""
 #. Name
 #: access/eventsrc:34
 msgid "A lock key has been deactivated"
-msgstr "Een vergrendeltoets is gedeactiveerd"
+msgstr "Er is een vergrendeltoets is gedeactiveerd"
 
 #. Comment
 #: access/eventsrc:35
@@ -99,16 +100,16 @@ msgstr "Plakkende toetsen zijn geactiveerd of gedeactiveerd"
 #. Comment
 #: access/eventsrc:48 access/eventsrc:49
 msgid "Slow keys has been enabled or disabled"
-msgstr "Langzame toetsten is geactiveerd of gedeactiveerd"
+msgstr "Langzame toetsen zijn geactiveerd of gedeactiveerd"
 
 #. Name
 #. Comment
 #: access/eventsrc:55 access/eventsrc:56
 msgid "Bounce keys has been enabled or disabled"
-msgstr "Stuiterende toetsen is geactiveerd of gedeactiveerd"
+msgstr "Stuiterende toetsen zijn geactiveerd of gedeactiveerd"
 
 #. Name
 #. Comment
 #: access/eventsrc:62 access/eventsrc:63
 msgid "Mouse keys has been enabled or disabled"
-msgstr "Muistoetsen is geactiveerd of gedeactiveerd"
+msgstr "Muistoetsen zijn geactiveerd of gedeactiveerd"
diff --git a/translations/desktop_files/kdcop.desktop/es_AR.po b/translations/desktop_files/kdcop.desktop/es_AR.po
new file mode 100644
index 000000000..c768a65d2
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/es_AR.po
@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 01:46+0200\n"
+"PO-Revision-Date: 2025-03-15 15:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kdcop-kdcopdesktop/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kdcop.desktop:11
+#, fuzzy
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+#, fuzzy
+msgid "DCOP browser"
+msgstr "DCOP browser"
diff --git a/translations/desktop_files/kdcop.desktop/ka.po b/translations/desktop_files/kdcop.desktop/ka.po
new file mode 100644
index 000000000..b833a722c
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/ka.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 01:46+0200\n"
+"PO-Revision-Date: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdcop-kdcopdesktop/ka/>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "DCOP-ის ბრ�უზერი"
diff --git a/translations/desktop_files/kdcop.desktop/nl.po b/translations/desktop_files/kdcop.desktop/nl.po
new file mode 100644
index 000000000..7f907a34a
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/nl.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 01:46+0200\n"
+"PO-Revision-Date: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdcop-kdcopdesktop/nl/>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "DCOP-verkenner"
diff --git a/translations/desktop_files/kdcop.desktop/sv.po b/translations/desktop_files/kdcop.desktop/sv.po
new file mode 100644
index 000000000..3b9a8cadc
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/sv.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 01:46+0200\n"
+"PO-Revision-Date: 2025-06-17 16:58+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdcop-kdcopdesktop/sv/>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "DCOP-bläddrare"
diff --git a/translations/desktop_files/kdesktop-desktops/es_AR.po b/translations/desktop_files/kdesktop-desktops/es_AR.po
new file mode 100644
index 000000000..36780bb83
--- /dev/null
+++ b/translations/desktop_files/kdesktop-desktops/es_AR.po
@@ -0,0 +1,139 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kdesktop-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kdesktop.desktop.cmake:10
+#, fuzzy
+msgid "TDE Desktop"
+msgstr "Escritorio de TDE"
+
+#. X-TDE-Submenu
+#: kdesktopSetAsBackground.desktop:4
+#, fuzzy
+msgid "Set as Background"
+msgstr "Establecer como fondo"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:7
+#, fuzzy
+msgid "Centered"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:12
+#, fuzzy
+msgid "Tiled"
+msgstr "Mosaico"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "Centrado azulejo"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "Centrado Maxspecto"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Azulejo Maxpect"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Escalado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "Centrado (Automático)"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Escalar y recortar"
+
+#. Comment
+#: kwebdesktop/kwebdesktop.desktop:2
+#, fuzzy
+msgid "TDE Web Desktop"
+msgstr "Escritorio Web para TDE"
+
+#. Comment
+#: patterns/fish.desktop:2
+#, fuzzy
+msgid "Fish Net"
+msgstr "Red de pesca"
+
+#. Comment
+#: patterns/flowers.desktop:2
+#, fuzzy
+msgid "Flowers"
+msgstr "Flores"
+
+#. Comment
+#: patterns/night-rock.desktop:2
+#, fuzzy
+msgid "Night Rock by Tigert"
+msgstr "Roca de noche de Tigert"
+
+#. Comment
+#: patterns/pavement.desktop:2
+#, fuzzy
+msgid "Pavement"
+msgstr "Pavimento"
+
+#. Comment
+#: patterns/rattan.desktop:2
+#, fuzzy
+msgid "Rattan"
+msgstr "Rota (planta)"
+
+#. Comment
+#: patterns/stonewall2.desktop:2
+#, fuzzy
+msgid "Stonewall 2 by Tigert"
+msgstr "Pared de piedra 2 de Tigert"
+
+#. Comment
+#: patterns/triangles.desktop:2
+#, fuzzy
+msgid "Triangles"
+msgstr "Triángulos"
+
+#. Comment
+#: programs/xearth.desktop:2
+#, fuzzy
+msgid "XEarth by Kirk Johnson"
+msgstr "XEarth de Kirk Johnson"
+
+#. Comment
+#: programs/xglobe.desktop:2
+#, fuzzy
+msgid "XGlobe by Thorsten Scheuermann"
+msgstr "XGlobe por Thorsten Scheuermann"
+
+#. Comment
+#: programs/xplanet.desktop:2
+#, fuzzy
+msgid "XPlanet by Hari Nair"
+msgstr "XPlanet de Hari Nair"
diff --git a/translations/desktop_files/kdesktop-desktops/ka.po b/translations/desktop_files/kdesktop-desktops/ka.po
index fac448dee..5922ef576 100644
--- a/translations/desktop_files/kdesktop-desktops/ka.po
+++ b/translations/desktop_files/kdesktop-desktops/ka.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-07-17 18:15+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
 msgid "TDE Desktop"
-msgstr "TDE ს�მუშ�� დ�ფ�"
+msgstr "TDE ს�მუშ�� მ�გიდ�"
 
 #. X-TDE-Submenu
 #: kdesktopSetAsBackground.desktop:4
 msgid "Set as Background"
-msgstr ""
+msgstr "ფ�ნ�დ დ�ყენებ�"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:7
@@ -38,44 +39,38 @@ msgstr "მ�ზ�იკ�"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:17
-#, fuzzy
-#| msgid "Centered"
 msgid "Center Tiled"
-msgstr "ცენტრზე"
+msgstr "ცენტრზე მ�ზ�იკით"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:22
-#, fuzzy
-#| msgid "Centered"
 msgid "Centered Maxpect"
-msgstr "ცენტრზე"
+msgstr "ცენტრზე პრ�პ�რციულ�დ"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:27
 msgid "Tiled Maxpect"
-msgstr ""
+msgstr "მ�ზ�იკ� პრ�პ�რციულ�დ"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:32
 msgid "Scaled"
-msgstr ""
+msgstr "მ�სშტ�ბით"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:37
-#, fuzzy
-#| msgid "Centered"
 msgid "Centered Auto Fit"
-msgstr "ცენტრზე"
+msgstr "ცენტრზე, �ვტ�ჩ�ტევით"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:42
 msgid "Scale & Crop"
-msgstr ""
+msgstr "მ�სშტ�ბი დ� �მ�ჭრ�"
 
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
-msgstr "TDE ვებ ს�მუშ�� დ�ფ�"
+msgstr "TDE ვებ ს�მუშ�� მ�გიდ�"
 
 #. Comment
 #: patterns/fish.desktop:2
diff --git a/translations/desktop_files/kdesktop-desktops/nl.po b/translations/desktop_files/kdesktop-desktops/nl.po
index 37560a7de..01dd08822 100644
--- a/translations/desktop_files/kdesktop-desktops/nl.po
+++ b/translations/desktop_files/kdesktop-desktops/nl.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-07-17 18:15+0000\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-01-08 21:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdesktop-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
 msgid "TDE Desktop"
-msgstr "TDE Bureaublad"
+msgstr "TDE-bureaublad"
 
 #. X-TDE-Submenu
 #: kdesktopSetAsBackground.desktop:4
 msgid "Set as Background"
-msgstr "Als achtergrond gebruiken"
+msgstr "Instellen als achtergrond"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:7
@@ -38,44 +39,38 @@ msgstr "Tegels"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:17
-#, fuzzy
-#| msgid "Centered"
 msgid "Center Tiled"
-msgstr "Gecentreerd"
+msgstr "Gecentreerde tegels"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:22
-#, fuzzy
-#| msgid "Centered"
 msgid "Centered Maxpect"
-msgstr "Gecentreerd"
+msgstr "Gecentreerd en uitgerekt"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:27
 msgid "Tiled Maxpect"
-msgstr ""
+msgstr "Getegeld en uitgerekt"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:32
 msgid "Scaled"
-msgstr ""
+msgstr "Schalen"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:37
-#, fuzzy
-#| msgid "Centered"
 msgid "Centered Auto Fit"
-msgstr "Gecentreerd"
+msgstr "Gecentreerd en ingepast"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:42
 msgid "Scale & Crop"
-msgstr ""
+msgstr "Schalen en bijsnijden"
 
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
-msgstr "TDE Web Bureaublad"
+msgstr "TDE-webbureaublad"
 
 #. Comment
 #: patterns/fish.desktop:2
@@ -90,12 +85,12 @@ msgstr "Bloemen"
 #. Comment
 #: patterns/night-rock.desktop:2
 msgid "Night Rock by Tigert"
-msgstr "Rots bij Nacht, door Tigert"
+msgstr "Rots bij nacht, door Tigert"
 
 #. Comment
 #: patterns/pavement.desktop:2
 msgid "Pavement"
-msgstr "Plavuizen"
+msgstr "Stoep"
 
 #. Comment
 #: patterns/rattan.desktop:2
diff --git a/translations/desktop_files/kdesktop-desktops/ru.po b/translations/desktop_files/kdesktop-desktops/ru.po
index f9156bba1..b33d9084d 100644
--- a/translations/desktop_files/kdesktop-desktops/ru.po
+++ b/translations/desktop_files/kdesktop-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-07-17 18:15+0000\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: 2024-04-06 08:44+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -38,45 +40,38 @@ msgstr "Черепицей"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:17
-#, fuzzy
-#| msgid "Centered"
 msgid "Center Tiled"
-msgstr "По центру"
+msgstr "По центру черепицей"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:22
-#, fuzzy
-#| msgid "Centered"
 msgid "Centered Maxpect"
-msgstr "По центру"
+msgstr "По центру пропорционально"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:27
 msgid "Tiled Maxpect"
-msgstr ""
+msgstr "Черепицей пропорционально"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:32
 msgid "Scaled"
-msgstr ""
+msgstr "Ра�т�нуть"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:37
-#, fuzzy
-#| msgid "Centered"
 msgid "Centered Auto Fit"
-msgstr "По центру"
+msgstr "�втозаполнение по центру"
 
 #. Name
 #: kdesktopSetAsBackground.desktop:42
 msgid "Scale & Crop"
-msgstr ""
+msgstr "Ма�штабирование � кадрированием"
 
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
-#, fuzzy
 msgid "TDE Web Desktop"
-msgstr "Рабочий �тол TDE"
+msgstr "Рабочий веб-�тол TDE"
 
 #. Comment
 #: patterns/fish.desktop:2
@@ -101,7 +96,7 @@ msgstr "Мо�това�"
 #. Comment
 #: patterns/rattan.desktop:2
 msgid "Rattan"
-msgstr ""
+msgstr "Rattan"
 
 #. Comment
 #: patterns/stonewall2.desktop:2
diff --git a/translations/desktop_files/kdesktop-icons/es_AR.po b/translations/desktop_files/kdesktop-icons/es_AR.po
new file mode 100644
index 000000000..77be998ea
--- /dev/null
+++ b/translations/desktop_files/kdesktop-icons/es_AR.po
@@ -0,0 +1,277 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kdesktop-icons/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: Home.desktop:2
+#, fuzzy
+msgid "Home"
+msgstr "Personal"
+
+#. GenericName
+#: Home.desktop:4
+msgid "Personal Files"
+msgstr "Archivos personales"
+
+#. Comment
+#: Home.desktop:6
+msgid "Contains personal files"
+msgstr "Contiene archivos personales"
+
+#. Name
+#: My_Computer:5
+msgid "My Computer"
+msgstr "Este Equipo"
+
+#. Comment
+#: My_Computer:7
+msgid "Access to storage media"
+msgstr "Acceso a los medios de almacenamiento"
+
+#. Name
+#: My_Documents:5
+msgid "My Documents"
+msgstr "Mis documentos"
+
+#. Comment
+#: My_Documents:7
+msgid "Contains personal documents"
+msgstr "Contiene documentos personales"
+
+#. Name
+#: My_Network_Places:5
+msgid "My Network Places"
+msgstr "Mis sitios de red"
+
+#. Comment
+#: My_Network_Places:7
+msgid "Access to network places and remote hosts"
+msgstr "Acceso a lugares de red y hosts remotos"
+
+#. Name
+#: Printers:5
+msgid "Printers"
+msgstr "Impresoras"
+
+#. Comment
+#: Printers:7
+msgid "Manage print jobs"
+msgstr "Gestionar los trabajos de impresión"
+
+#. Name
+#: System.desktop:2
+msgid "System"
+msgstr "Sistema"
+
+#. GenericName
+#: System.desktop:4
+msgid "System Locations"
+msgstr "Lugares del sistema"
+
+#. Comment
+#: System.desktop:6
+msgid "Access to system places"
+msgstr "Acceso a los directorios del sistema"
+
+#. Name
+#: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12
+#: Templates/DVDROM-Device.desktop:12 Templates/ZIP-Device.desktop:12
+msgid "Eject"
+msgstr "Expulsar"
+
+#. Name
+#: Templates/Directory.desktop:2
+msgid "Folder..."
+msgstr "Carpeta..."
+
+#. Comment
+#: Templates/Directory.desktop:3
+msgid "Enter folder name:"
+msgstr "Ingresá el nombre de la carpeta:"
+
+#. Name
+#: Templates/Floppy.desktop:3
+msgid "Format"
+msgstr "Formato"
+
+#. Name
+#: Templates/HTMLFile.desktop:2
+msgid "HTML File..."
+msgstr "Archivo HTML..."
+
+#. Comment
+#: Templates/HTMLFile.desktop:3
+msgid "Enter HTML filename:"
+msgstr "Ingresá el nombre del archivo HTML:"
+
+#. Name
+#: Templates/TextFile.desktop:2
+msgid "Text File..."
+msgstr "Archivo de texto..."
+
+#. Comment
+#: Templates/TextFile.desktop:3
+msgid "Enter text filename:"
+msgstr "Ingresá el nombre del archivo de texto:"
+
+#. Name
+#: Templates/linkCAMERA.desktop:2
+msgid "Camera Device..."
+msgstr "Cámara (Dispositivo)..."
+
+#. Comment
+#: Templates/linkCAMERA.desktop:3
+msgid "New camera"
+msgstr "Nueva cámara"
+
+#. Name
+#: Templates/linkCDROM.desktop:2
+msgid "CD-ROM Device..."
+msgstr "Unidad de CD-ROM..."
+
+#. Comment
+#: Templates/linkCDROM.desktop:3
+msgid "New CD-ROM Device"
+msgstr "Nueva unidad de CD-ROM"
+
+#. Name
+#: Templates/linkCDWRITER.desktop:2
+msgid "CDWRITER Device..."
+msgstr "Grabadora de CD..."
+
+#. Comment
+#: Templates/linkCDWRITER.desktop:3
+msgid "New CDWRITER Device"
+msgstr "Nueva grabadora de CD"
+
+#. Name
+#: Templates/linkDVDROM.desktop:2
+msgid "DVD-ROM Device..."
+msgstr "Unidad de DVD-ROM..."
+
+#. Comment
+#: Templates/linkDVDROM.desktop:3
+msgid "New DVD-ROM Device"
+msgstr "Nueva unidad de DVD-ROM"
+
+#. Name
+#: Templates/linkFloppy.desktop:2
+msgid "Floppy Device..."
+msgstr "Unidad de diskettes..."
+
+#. Comment
+#: Templates/linkFloppy.desktop:3
+msgid "New Floppy Device"
+msgstr "Nueva unidad de diskettes"
+
+#. Name
+#: Templates/linkHD.desktop:2
+msgid "Hard Disc Device..."
+msgstr "Disco duro..."
+
+#. Comment
+#: Templates/linkHD.desktop:3
+msgid "New Hard Disc"
+msgstr "Nuevo disco duro"
+
+#. Name
+#: Templates/linkMO.desktop:2
+msgid "MO Device..."
+msgstr "Dispositivo de MO..."
+
+#. Comment
+#: Templates/linkMO.desktop:3
+msgid "New MO Device"
+msgstr "Nuevo dispositivo de MO"
+
+#. Name
+#: Templates/linkNFS.desktop:2
+msgid "NFS..."
+msgstr "NFS..."
+
+#. Comment
+#: Templates/linkNFS.desktop:3
+msgid "New NFS Link"
+msgstr "Nuevo enlace NFS"
+
+#. Name
+#: Templates/linkProgram.desktop:2
+msgid "Link to Application..."
+msgstr "Enlace a aplicación..."
+
+#. Comment
+#: Templates/linkProgram.desktop:3
+msgid "New Link to Application"
+msgstr "Nuevo enlace a aplicación"
+
+#. Name
+#: Templates/linkURL.desktop:2
+msgid "Link to Location (URL)..."
+msgstr "Enlace a dirección (URL)..."
+
+#. Comment
+#: Templates/linkURL.desktop:3
+msgid "Enter link to location (URL):"
+msgstr "Ingresá el enlace a la dirección (URL):"
+
+#. Name
+#: Templates/linkZIP.desktop:2
+msgid "ZIP Device..."
+msgstr "Unidad ZIP..."
+
+#. Comment
+#: Templates/linkZIP.desktop:3
+msgid "New ZIP Device"
+msgstr "Nueva unidad ZIP"
+
+#. Name
+#: Trash:8
+msgid "Trash"
+msgstr "Papelera de reciclaje"
+
+#. Comment
+#: Trash:10
+msgid "Contains removed files"
+msgstr "Contiene archivos eliminados"
+
+#. Name
+#. GenericName
+#: Web_Browser:6 Web_Browser:8
+msgid "Web Browser"
+msgstr "Navegador web"
+
+#. Comment
+#: Web_Browser:10
+msgid "Browse the World Wide Web"
+msgstr "Navegar por la World Wide Web"
+
+#. Name
+#: directory.autostart:3
+msgid "Autostart"
+msgstr "Inicio automático"
+
+#. Name
+#: directory.desktop:5
+msgid "Desktop"
+msgstr "Escritorio"
+
+#. Name
+#: directory.templates:3
+msgid "Templates"
+msgstr "Plantillas"
diff --git a/translations/desktop_files/kdesktop-icons/ka.po b/translations/desktop_files/kdesktop-icons/ka.po
index c0fa20edb..2a9708604 100644
--- a/translations/desktop_files/kdesktop-icons/ka.po
+++ b/translations/desktop_files/kdesktop-icons/ka.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-icons/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:2
 msgid "Home"
-msgstr "ს�ხლში"
+msgstr "ს�წყისი"
 
 #. GenericName
 #: Home.desktop:4
@@ -28,39 +29,38 @@ msgstr "პირ�დი ს�ქ�ღ�ლდეები"
 
 #. Comment
 #: Home.desktop:6
-#, fuzzy
 msgid "Contains personal files"
-msgstr "პირ�დი ს�ქ�ღ�ლდეები"
+msgstr "შეიც�ვს პირ�დ ფ�ილებს"
 
 #. Name
 #: My_Computer:5
 msgid "My Computer"
-msgstr ""
+msgstr "ჩემი კ�მპიუტერი"
 
 #. Comment
 #: My_Computer:7
 msgid "Access to storage media"
-msgstr ""
+msgstr "წვდ�მ� ს�ც�ვზე"
 
 #. Name
 #: My_Documents:5
 msgid "My Documents"
-msgstr ""
+msgstr "ჩემი დ�კუმენტები"
 
 #. Comment
 #: My_Documents:7
 msgid "Contains personal documents"
-msgstr ""
+msgstr "შეიც�ვს პირ�დ დ�კუმენტებს"
 
 #. Name
 #: My_Network_Places:5
 msgid "My Network Places"
-msgstr "დ�შ�რებული �დგილები"
+msgstr "ჩემი ქსელის მდებ�რე�ბები"
 
 #. Comment
 #: My_Network_Places:7
 msgid "Access to network places and remote hosts"
-msgstr ""
+msgstr "წვდ�მ� ქსელის მდებ�რე�ბებთ�ნ დ� დ�შ�რებულ ჰ�სტებთ�ნ"
 
 #. Name
 #: Printers:5
@@ -70,7 +70,7 @@ msgstr "პრინტერები"
 #. Comment
 #: Printers:7
 msgid "Manage print jobs"
-msgstr ""
+msgstr "ბეჭდვის დ�ვ�ლებების მ�რთვ�"
 
 #. Name
 #: System.desktop:2
@@ -80,18 +80,18 @@ msgstr "სისტემ�"
 #. GenericName
 #: System.desktop:4
 msgid "System Locations"
-msgstr "სისტემური მის�მ�რთები"
+msgstr "სისტემური მდებ�რე�ბები"
 
 #. Comment
 #: System.desktop:6
 msgid "Access to system places"
-msgstr ""
+msgstr "წვდ�მ� სისტემურ მდებ�რე�ბებთ�ნ"
 
 #. Name
 #: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12
 #: Templates/DVDROM-Device.desktop:12 Templates/ZIP-Device.desktop:12
 msgid "Eject"
-msgstr "CD-ს �მ�ღებ�"
+msgstr "CD-ის �მ�ღებ�"
 
 #. Name
 #: Templates/Directory.desktop:2
@@ -116,7 +116,7 @@ msgstr "HTML ფ�ილი..."
 #. Comment
 #: Templates/HTMLFile.desktop:3
 msgid "Enter HTML filename:"
-msgstr "HTML ფ�ილის ს�ხელი შეიყვ�ნეთ:"
+msgstr "შეიყვ�ნეთ HTML ფ�ილის ს�ხელი:"
 
 #. Name
 #: Templates/TextFile.desktop:2
@@ -131,7 +131,7 @@ msgstr "შეიყვ�ნეთ ტექსტური ფ�ილის
 #. Name
 #: Templates/linkCAMERA.desktop:2
 msgid "Camera Device..."
-msgstr "კ�მერის მ�წყ�ბილ�ბ� "
+msgstr "კ�მერის მ�წყ�ბილ�ბ�..."
 
 #. Comment
 #: Templates/linkCAMERA.desktop:3
@@ -141,7 +141,7 @@ msgstr "�ხ�ლი კ�მერ�"
 #. Name
 #: Templates/linkCDROM.desktop:2
 msgid "CD-ROM Device..."
-msgstr "CD-ROM მ�წყ�ბილ�ბ�"
+msgstr "CD-ROM მ�წყ�ბილ�ბ�..."
 
 #. Comment
 #: Templates/linkCDROM.desktop:3
@@ -151,7 +151,7 @@ msgstr "�ხ�ლი CD-ROM მ�წყ�ბილ�ბ�"
 #. Name
 #: Templates/linkCDWRITER.desktop:2
 msgid "CDWRITER Device..."
-msgstr "CDWRITER მ�წყ�ბილ�ბ�"
+msgstr "CDWRITER მ�წყ�ბილ�ბ�..."
 
 #. Comment
 #: Templates/linkCDWRITER.desktop:3
@@ -161,7 +161,7 @@ msgstr "�ხ�ლი CDWRITER მ�წყ�ბილ�ბ�"
 #. Name
 #: Templates/linkDVDROM.desktop:2
 msgid "DVD-ROM Device..."
-msgstr "DVD-ROM მ�წყ�ბილ�ბ�"
+msgstr "DVD-ROM მ�წყ�ბილ�ბ�..."
 
 #. Comment
 #: Templates/linkDVDROM.desktop:3
@@ -171,27 +171,27 @@ msgstr "�ხ�ლი DVD-ROM მ�წყ�ბილ�ბ�"
 #. Name
 #: Templates/linkFloppy.desktop:2
 msgid "Floppy Device..."
-msgstr "დრეკ�დი დისკის წ�მყვ�ნი"
+msgstr "დისკეტ�..."
 
 #. Comment
 #: Templates/linkFloppy.desktop:3
 msgid "New Floppy Device"
-msgstr "�ხ�ლი დრეკ�დი დისკის წ�მყვ�ნი"
+msgstr "�ხ�ლი დისკეტის მ�წყ�ბილ�ბ�"
 
 #. Name
 #: Templates/linkHD.desktop:2
 msgid "Hard Disc Device..."
-msgstr "ხისტი დისკი..."
+msgstr "მყ�რი დისკის მ�წყ�ბილ�ბ�..."
 
 #. Comment
 #: Templates/linkHD.desktop:3
 msgid "New Hard Disc"
-msgstr "�ხ�ლი ხისტი დისკი"
+msgstr "�ხ�ლი მყ�რი დისკი"
 
 #. Name
 #: Templates/linkMO.desktop:2
 msgid "MO Device..."
-msgstr "MO მ�წყ�ბილ�ბ�"
+msgstr "MO მ�წყ�ბილ�ბ�..."
 
 #. Comment
 #: Templates/linkMO.desktop:3
@@ -201,7 +201,7 @@ msgstr "�ხ�ლი MO მ�წყ�ბილ�ბ�"
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS..."
 
 #. Comment
 #: Templates/linkNFS.desktop:3
@@ -221,12 +221,12 @@ msgstr "პრ�გრ�მის �ხ�ლი ბმული"
 #. Name
 #: Templates/linkURL.desktop:2
 msgid "Link to Location (URL)..."
-msgstr "�დგილმდებ�რე�ბის ბმული (URL)..."
+msgstr "მდებ�რე�ბის ბმული (URL)..."
 
 #. Comment
 #: Templates/linkURL.desktop:3
 msgid "Enter link to location (URL):"
-msgstr "შეიყვ�ნეთ პრ�გრ�მის ბმული ბმული (URL)"
+msgstr "შეიყვ�ნეთ პრ�გრ�მის ბმული (URL):"
 
 #. Name
 #: Templates/linkZIP.desktop:2
@@ -241,23 +241,23 @@ msgstr "�ხ�ლი ZIP მ�წყ�ბილ�ბ�"
 #. Name
 #: Trash:8
 msgid "Trash"
-msgstr "ურნ�"
+msgstr "ნ�გვის ყუთი"
 
 #. Comment
 #: Trash:10
 msgid "Contains removed files"
-msgstr ""
+msgstr "შეიც�ვს წ�შლილ ფ�ილებს"
 
 #. Name
 #. GenericName
 #: Web_Browser:6 Web_Browser:8
 msgid "Web Browser"
-msgstr ""
+msgstr "ვებ ბრ�უზერი"
 
 #. Comment
 #: Web_Browser:10
 msgid "Browse the World Wide Web"
-msgstr ""
+msgstr "მუშ��ბ� ინტერნეტში"
 
 #. Name
 #: directory.autostart:3
@@ -267,7 +267,7 @@ msgstr "�ვტ�გ�შვებ�"
 #. Name
 #: directory.desktop:5
 msgid "Desktop"
-msgstr "ს�მუშ�� დ�ფ�"
+msgstr "ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: directory.templates:3
diff --git a/translations/desktop_files/kdesktop-icons/nl.po b/translations/desktop_files/kdesktop-icons/nl.po
index 0635903ec..519c6abaa 100644
--- a/translations/desktop_files/kdesktop-icons/nl.po
+++ b/translations/desktop_files/kdesktop-icons/nl.po
@@ -1,76 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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-01-07 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdesktop-icons/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:2
 msgid "Home"
-msgstr ""
+msgstr "Persoonlijke map"
 
 #. GenericName
 #: Home.desktop:4
 msgid "Personal Files"
-msgstr "Persoonlijke map"
+msgstr "Persoonlijke bestanden"
 
 #. Comment
 #: Home.desktop:6
-#, fuzzy
 msgid "Contains personal files"
-msgstr "Persoonlijke map"
+msgstr "Bevat uw persoonlijke bestanden"
 
 #. Name
 #: My_Computer:5
 msgid "My Computer"
-msgstr ""
+msgstr "Mijn computer"
 
 #. Comment
 #: My_Computer:7
 msgid "Access to storage media"
-msgstr ""
+msgstr "Toegang tot opslagapparaten"
 
 #. Name
 #: My_Documents:5
 msgid "My Documents"
-msgstr "Documenten"
+msgstr "Mijn documenten"
 
 #. Comment
 #: My_Documents:7
 msgid "Contains personal documents"
-msgstr ""
+msgstr "Bevat uw persoonlijke documenten"
 
 #. Name
 #: My_Network_Places:5
 msgid "My Network Places"
-msgstr "Externe plekken"
+msgstr "Mijn externe locaties"
 
 #. Comment
 #: My_Network_Places:7
 msgid "Access to network places and remote hosts"
-msgstr ""
+msgstr "Toegang tot netwerklocaties en externe hosts"
 
 #. Name
 #: Printers:5
 msgid "Printers"
-msgstr ""
+msgstr "Printers"
 
 #. Comment
 #: Printers:7
 msgid "Manage print jobs"
-msgstr ""
+msgstr "Beheer afdruktaken"
 
 #. Name
 #: System.desktop:2
@@ -85,7 +85,7 @@ msgstr "Systeemlocaties"
 #. Comment
 #: System.desktop:6
 msgid "Access to system places"
-msgstr ""
+msgstr "Toegang tot systeemlocaties"
 
 #. Name
 #: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12
@@ -96,12 +96,12 @@ msgstr "Uitwerpen"
 #. Name
 #: Templates/Directory.desktop:2
 msgid "Folder..."
-msgstr "Map..."
+msgstr "Map…"
 
 #. Comment
 #: Templates/Directory.desktop:3
 msgid "Enter folder name:"
-msgstr "Mapnaam invoeren:"
+msgstr "Geef de map een naam:"
 
 #. Name
 #: Templates/Floppy.desktop:3
@@ -111,27 +111,27 @@ msgstr "Formatteren"
 #. Name
 #: Templates/HTMLFile.desktop:2
 msgid "HTML File..."
-msgstr "HTML-bestand..."
+msgstr "Html-bestand…"
 
 #. Comment
 #: Templates/HTMLFile.desktop:3
 msgid "Enter HTML filename:"
-msgstr "Naam van HTML-bestand invoeren:"
+msgstr "Geef het html-bestand een naam:"
 
 #. Name
 #: Templates/TextFile.desktop:2
 msgid "Text File..."
-msgstr "Tekstbestand..."
+msgstr "Tekstbestand…"
 
 #. Comment
 #: Templates/TextFile.desktop:3
 msgid "Enter text filename:"
-msgstr "Naam van tekstbestand invoeren:"
+msgstr "Geef het tekstbestand een naam:"
 
 #. Name
 #: Templates/linkCAMERA.desktop:2
 msgid "Camera Device..."
-msgstr "Camera..."
+msgstr "Camera…"
 
 #. Comment
 #: Templates/linkCAMERA.desktop:3
@@ -141,7 +141,7 @@ msgstr "Nieuwe camera"
 #. Name
 #: Templates/linkCDROM.desktop:2
 msgid "CD-ROM Device..."
-msgstr "CD-romspeler..."
+msgstr "Cd-romspeler…"
 
 #. Comment
 #: Templates/linkCDROM.desktop:3
@@ -151,27 +151,27 @@ msgstr "Nieuwe cd-romspeler"
 #. Name
 #: Templates/linkCDWRITER.desktop:2
 msgid "CDWRITER Device..."
-msgstr "CD-writer..."
+msgstr "Cd-brander…"
 
 #. Comment
 #: Templates/linkCDWRITER.desktop:3
 msgid "New CDWRITER Device"
-msgstr "Nieuwe CD-writer"
+msgstr "Nieuwe cd-brander"
 
 #. Name
 #: Templates/linkDVDROM.desktop:2
 msgid "DVD-ROM Device..."
-msgstr "DVD-romspeler..."
+msgstr "Dvd-romspeler…"
 
 #. Comment
 #: Templates/linkDVDROM.desktop:3
 msgid "New DVD-ROM Device"
-msgstr "Nieuwe DVD-romspeler"
+msgstr "Nieuwe dvd-romspeler"
 
 #. Name
 #: Templates/linkFloppy.desktop:2
 msgid "Floppy Device..."
-msgstr "Diskettestation..."
+msgstr "Diskettestation…"
 
 #. Comment
 #: Templates/linkFloppy.desktop:3
@@ -181,7 +181,7 @@ msgstr "Nieuw diskettestation"
 #. Name
 #: Templates/linkHD.desktop:2
 msgid "Hard Disc Device..."
-msgstr "Harde Schijf..."
+msgstr "Harde schijf…"
 
 #. Comment
 #: Templates/linkHD.desktop:3
@@ -191,52 +191,52 @@ msgstr "Nieuwe harde schijf"
 #. Name
 #: Templates/linkMO.desktop:2
 msgid "MO Device..."
-msgstr "MO-apparaat..."
+msgstr "MO-apparaat…"
 
 #. Comment
 #: Templates/linkMO.desktop:3
 msgid "New MO Device"
-msgstr "Nieuw MO-aparaat"
+msgstr "Nieuw MO-apparaat"
 
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "Nfs…"
 
 #. Comment
 #: Templates/linkNFS.desktop:3
 msgid "New NFS Link"
-msgstr "Nieuwe NFS-koppeling"
+msgstr "Nieuwe nfs-koppeling"
 
 #. Name
 #: Templates/linkProgram.desktop:2
 msgid "Link to Application..."
-msgstr "Koppeling naar toepassing..."
+msgstr "Programmakoppeling…"
 
 #. Comment
 #: Templates/linkProgram.desktop:3
 msgid "New Link to Application"
-msgstr "Nieuwe koppeling naar toepassing"
+msgstr "Nieuwe koppeling naar programma"
 
 #. Name
 #: Templates/linkURL.desktop:2
 msgid "Link to Location (URL)..."
-msgstr "Koppeling naar locatie (URL-adres)..."
+msgstr "Locatiekoppeling (url)…"
 
 #. Comment
 #: Templates/linkURL.desktop:3
 msgid "Enter link to location (URL):"
-msgstr "Koppeling naar locatie invoeren (URL-adres):"
+msgstr "Voer een locatie (url) in:"
 
 #. Name
 #: Templates/linkZIP.desktop:2
 msgid "ZIP Device..."
-msgstr "ZIP-apparaat..."
+msgstr "Zip-apparaat…"
 
 #. Comment
 #: Templates/linkZIP.desktop:3
 msgid "New ZIP Device"
-msgstr "Nieuw ZIP-apparaat"
+msgstr "Nieuw zip-apparaat"
 
 #. Name
 #: Trash:8
@@ -246,23 +246,23 @@ msgstr "Prullenbak"
 #. Comment
 #: Trash:10
 msgid "Contains removed files"
-msgstr ""
+msgstr "Bevat verwijderde bestanden"
 
 #. Name
 #. GenericName
 #: Web_Browser:6 Web_Browser:8
 msgid "Web Browser"
-msgstr "webbrowser"
+msgstr "Webbrowser"
 
 #. Comment
 #: Web_Browser:10
 msgid "Browse the World Wide Web"
-msgstr ""
+msgstr "Surf op het wereldwijde web"
 
 #. Name
 #: directory.autostart:3
 msgid "Autostart"
-msgstr ""
+msgstr "Automatisch opstarten"
 
 #. Name
 #: directory.desktop:5
diff --git a/translations/desktop_files/kdesktop-icons/ru.po b/translations/desktop_files/kdesktop-icons/ru.po
index 7c71a4076..ba19e394f 100644
--- a/translations/desktop_files/kdesktop-icons/ru.po
+++ b/translations/desktop_files/kdesktop-icons/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2023-06-04 15:15+0000\n"
+"PO-Revision-Date: 2025-06-29 05:58+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kdesktop-icons/ru/>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: Home.desktop:2
@@ -92,7 +92,7 @@ msgstr "До�туп к �и�темному окружению"
 #: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12
 #: Templates/DVDROM-Device.desktop:12 Templates/ZIP-Device.desktop:12
 msgid "Eject"
-msgstr "Извлечь CD"
+msgstr "Извлечь"
 
 #. Name
 #: Templates/Directory.desktop:2
@@ -102,7 +102,7 @@ msgstr "Папку..."
 #. Comment
 #: Templates/Directory.desktop:3
 msgid "Enter folder name:"
-msgstr "Введите им� папки:"
+msgstr "Введите им� каталога:"
 
 #. Name
 #: Templates/Floppy.desktop:3
@@ -253,7 +253,7 @@ msgstr "Содержит удалённые файлы"
 #. GenericName
 #: Web_Browser:6 Web_Browser:8
 msgid "Web Browser"
-msgstr "Интернет обозреватель"
+msgstr "Веб-браузер"
 
 #. Comment
 #: Web_Browser:10
diff --git a/translations/desktop_files/kdesktop-icons/sv.po b/translations/desktop_files/kdesktop-icons/sv.po
index 416295ac6..d95290156 100644
--- a/translations/desktop_files/kdesktop-icons/sv.po
+++ b/translations/desktop_files/kdesktop-icons/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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-08-30 19:11+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-icons/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: Home.desktop:2
@@ -28,29 +29,28 @@ msgstr "Personliga filer"
 
 #. Comment
 #: Home.desktop:6
-#, fuzzy
 msgid "Contains personal files"
-msgstr "Personliga filer"
+msgstr "Innehåller personliga filer"
 
 #. Name
 #: My_Computer:5
 msgid "My Computer"
-msgstr ""
+msgstr "Den här datorn"
 
 #. Comment
 #: My_Computer:7
 msgid "Access to storage media"
-msgstr ""
+msgstr "Ã…tkomst till lagringsmedia"
 
 #. Name
 #: My_Documents:5
 msgid "My Documents"
-msgstr "Dokumentkatalog"
+msgstr "Mina dokument"
 
 #. Comment
 #: My_Documents:7
 msgid "Contains personal documents"
-msgstr ""
+msgstr "Innehåller personliga dokument"
 
 #. Name
 #: My_Network_Places:5
@@ -60,7 +60,7 @@ msgstr "Fjärrplatser"
 #. Comment
 #: My_Network_Places:7
 msgid "Access to network places and remote hosts"
-msgstr ""
+msgstr "Åtkomst till fjärrplatser och fjärrvärdar"
 
 #. Name
 #: Printers:5
@@ -70,12 +70,12 @@ msgstr "Skrivare"
 #. Comment
 #: Printers:7
 msgid "Manage print jobs"
-msgstr ""
+msgstr "Hantera utskriftsjobb"
 
 #. Name
 #: System.desktop:2
 msgid "System"
-msgstr ""
+msgstr "System"
 
 #. GenericName
 #: System.desktop:4
@@ -85,7 +85,7 @@ msgstr "Systemplatser"
 #. Comment
 #: System.desktop:6
 msgid "Access to system places"
-msgstr ""
+msgstr "Ã…tkomst till systemplatser"
 
 #. Name
 #: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12
@@ -106,7 +106,7 @@ msgstr "Ange katalognamn:"
 #. Name
 #: Templates/Floppy.desktop:3
 msgid "Format"
-msgstr ""
+msgstr "Formattera"
 
 #. Name
 #: Templates/HTMLFile.desktop:2
@@ -201,7 +201,7 @@ msgstr "Ny magneto-optisk enhet"
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS..."
 
 #. Comment
 #: Templates/linkNFS.desktop:3
@@ -241,28 +241,28 @@ msgstr "Ny Zip-enhet"
 #. Name
 #: Trash:8
 msgid "Trash"
-msgstr "Skräp"
+msgstr "Papperskorg"
 
 #. Comment
 #: Trash:10
 msgid "Contains removed files"
-msgstr ""
+msgstr "Innehåller borttagna filer"
 
 #. Name
 #. GenericName
 #: Web_Browser:6 Web_Browser:8
 msgid "Web Browser"
-msgstr "Webbläsaren"
+msgstr "Webbläsare"
 
 #. Comment
 #: Web_Browser:10
 msgid "Browse the World Wide Web"
-msgstr ""
+msgstr "Surfa på nätet"
 
 #. Name
 #: directory.autostart:3
 msgid "Autostart"
-msgstr ""
+msgstr "Autostart"
 
 #. Name
 #: directory.desktop:5
diff --git a/translations/desktop_files/kdesktop-icons/uk.po b/translations/desktop_files/kdesktop-icons/uk.po
index 01ba410c6..c95ca82e2 100644
--- a/translations/desktop_files/kdesktop-icons/uk.po
+++ b/translations/desktop_files/kdesktop-icons/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"PO-Revision-Date: 2025-02-22 09:41+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kdesktop-icons/uk/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:2
@@ -56,7 +56,7 @@ msgstr "Мі�тить о�оби�ті документи"
 #. Name
 #: My_Network_Places:5
 msgid "My Network Places"
-msgstr "Віддалені мі�ц�"
+msgstr "Мої Мережеві Мі�ц�"
 
 #. Comment
 #: My_Network_Places:7
diff --git a/translations/desktop_files/kfind-desktops/es_AR.po b/translations/desktop_files/kfind-desktops/es_AR.po
new file mode 100644
index 000000000..f46c0633d
--- /dev/null
+++ b/translations/desktop_files/kfind-desktops/es_AR.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 05:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: Kfind.desktop:8
+msgid "Find Files/Folders"
+msgstr ""
+
+#. Name
+#: findpart.desktop:7 kfindpart.desktop:5
+msgid "Find Part"
+msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/es_AR.po b/translations/desktop_files/khelpcenter-desktops/es_AR.po
new file mode 100644
index 000000000..888d45f9a
--- /dev/null
+++ b/translations/desktop_files/khelpcenter-desktops/es_AR.po
@@ -0,0 +1,215 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: Help.desktop:10
+msgid "Help"
+msgstr ""
+
+#. Name
+#: htmlsearch/htmlsearch.desktop:12
+msgid "Index"
+msgstr ""
+
+#. Comment
+#: htmlsearch/htmlsearch.desktop:14
+msgid "Index generation"
+msgstr ""
+
+#. Keywords
+#: htmlsearch/htmlsearch.desktop:16
+msgid "Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;"
+msgstr ""
+
+#. Name
+#: kcmhelpcenter.desktop:13
+msgid "Help Index"
+msgstr ""
+
+#. Comment
+#: kcmhelpcenter.desktop:15
+msgid "Help center search index configuration and generation"
+msgstr ""
+
+#. Keywords
+#: kcmhelpcenter.desktop:17
+msgid "khelpcenter;help;index;search;"
+msgstr ""
+
+#. Name
+#: khelpcenter.desktop:11
+msgid "KHelpCenter"
+msgstr ""
+
+#. Comment
+#: khelpcenter.desktop:13
+msgid "The Trinity Help Center"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man1.desktop:4
+msgid "(1) User Commands"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man2.desktop:4
+msgid "(2) System Calls"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man3.desktop:4
+msgid "(3) Subroutines"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man4.desktop:4
+msgid "(4) Devices"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man5.desktop:4
+msgid "(5) File Formats"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man6.desktop:4
+msgid "(6) Games"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man7.desktop:4
+msgid "(7) Miscellaneous"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man8.desktop:4
+msgid "(8) Sys. Administration"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/man9.desktop:4
+msgid "(9) Kernel"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/mann.desktop:4
+msgid "(n) New"
+msgstr ""
+
+#. Name
+#: plugins/adminguide.desktop:6
+msgid "TDE Admininstrator Guide"
+msgstr ""
+
+#. Name
+#: plugins/applets.desktop:6
+msgid "Applet Manuals"
+msgstr ""
+
+#. Name
+#: plugins/contact.desktop:6
+msgid "Contact Information"
+msgstr ""
+
+#. Name
+#: plugins/faq.desktop:6
+msgid "The TDE FAQ"
+msgstr ""
+
+#. Name
+#: plugins/hardwaremodules.desktop:6
+msgid "Hardware"
+msgstr ""
+
+#. Name
+#: plugins/info.desktop:7
+msgid "Browse Info Pages"
+msgstr ""
+
+#. Name
+#: plugins/kcontrolmodules.desktop:6
+msgid "Control Center Modules"
+msgstr ""
+
+#. Name
+#: plugins/konqplugins.desktop:6
+msgid "Konqueror Plugins"
+msgstr ""
+
+#. Name
+#: plugins/links.desktop:6
+msgid "TDE on the Web"
+msgstr ""
+
+#. Name
+#: plugins/quickstart.desktop:6
+msgid "Quickstart Guide"
+msgstr ""
+
+#. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
+#: plugins/support.desktop:6
+msgid "Supporting TDE"
+msgstr ""
+
+#. Name
+#: plugins/tdeioslaves.desktop:6
+msgid "Protocols"
+msgstr ""
+
+#. Comment
+#: plugins/tdeioslaves.desktop:8
+msgid "Information about the available protocols"
+msgstr ""
+
+#. Keywords
+#: plugins/tdeioslaves.desktop:10
+msgid "Protocol;IO slaves;Slaves;Network;Information;Timeout;"
+msgstr ""
+
+#. Name
+#: plugins/userguide.desktop:6
+msgid "TDE User Guide"
+msgstr ""
+
+#. Name
+#: plugins/visualdict.desktop:6
+msgid "A Visual Guide to TDE"
+msgstr ""
+
+#. Name
+#: plugins/welcome.desktop:6
+msgid "Welcome to TDE"
+msgstr ""
+
+#. Name
+#: plugins/Applications/.directory:7
+msgid "Application Manuals"
+msgstr ""
+
+#. Name
+#: plugins/Manpages/.directory:8
+msgid "UNIX manual pages"
+msgstr ""
+
+#. Name
+#: plugins/Scrollkeeper/.directory:5
+msgid "Scrollkeeper"
+msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/ka.po b/translations/desktop_files/khelpcenter-desktops/ka.po
index a49f9b9e5..59aae4df5 100644
--- a/translations/desktop_files/khelpcenter-desktops/ka.po
+++ b/translations/desktop_files/khelpcenter-desktops/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-06-05 18:15+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khelpcenter-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Help.desktop:10
@@ -35,6 +36,7 @@ msgstr "ინდექსის შექმნ�"
 #: htmlsearch/htmlsearch.desktop:16
 msgid "Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;"
 msgstr ""
+"Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;დ�ხმ�რებ�;ძებნ�;"
 
 #. Name
 #: kcmhelpcenter.desktop:13
@@ -44,22 +46,22 @@ msgstr "დ�ხმ�რების ინდექსი"
 #. Comment
 #: kcmhelpcenter.desktop:15
 msgid "Help center search index configuration and generation"
-msgstr "TDE-ს დ�ხმ�რების სისტემ�ში ინდექსების კ�ნფიგურ�ცი�"
+msgstr "დ�ხმ�რების ცენტრის ძებნის ინდექსის მ�რგებ� დ� შექმნ�"
 
 #. Keywords
 #: kcmhelpcenter.desktop:17
 msgid "khelpcenter;help;index;search;"
-msgstr ""
+msgstr "khelpcenter;help;index;search;ძებნ�;დ�ხმ�რებ�;ინდექსი;"
 
 #. Name
 #: khelpcenter.desktop:11
 msgid "KHelpCenter"
-msgstr ""
+msgstr "KHelpCenter"
 
 #. Comment
 #: khelpcenter.desktop:13
 msgid "The Trinity Help Center"
-msgstr "Trinity-ს დ�ხმ�რების ცენტრი"
+msgstr "Trinity-ის დ�ხმ�რების ცენტრი"
 
 #. Name
 #: plugins/Manpages/man1.desktop:4
@@ -84,7 +86,7 @@ msgstr "(4) მ�წყ�ბილ�ბები"
 #. Name
 #: plugins/Manpages/man5.desktop:4
 msgid "(5) File Formats"
-msgstr "(5) ფ�ილთ� ფ�რმ�ტები"
+msgstr "(5) ფ�ილის ფ�რმ�ტები"
 
 #. Name
 #: plugins/Manpages/man6.desktop:4
@@ -99,7 +101,7 @@ msgstr "(7) სხვ�დ�სხვ�"
 #. Name
 #: plugins/Manpages/man8.desktop:4
 msgid "(8) Sys. Administration"
-msgstr "(8) სისტემური �დმინისტრირებ�"
+msgstr "(8) სისტ. �დმინისტრირებ�"
 
 #. Name
 #: plugins/Manpages/man9.desktop:4
@@ -113,14 +115,13 @@ msgstr "(n) �ხ�ლი"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "TDE-ს მ�მხმ�რებლის ს�ხელმძღვ�ნელ�"
+msgstr "TDE-ის �დმინისტრ�ტ�რის ს�ხელმძღვ�ნელ�"
 
 #. Name
 #: plugins/applets.desktop:6
 msgid "Applet Manuals"
-msgstr "�პლეტთ� ს�ხელმძღვ�ნელ�"
+msgstr "�პლეტის ს�ხელმძღვ�ნელ�ები"
 
 #. Name
 #: plugins/contact.desktop:6
@@ -130,17 +131,17 @@ msgstr "ს�კ�ნტ�ქტ� ინფ�რმ�ცი�"
 #. Name
 #: plugins/faq.desktop:6
 msgid "The TDE FAQ"
-msgstr "TDE: ძირით�დი კითხვები"
+msgstr "TDE-ის ხ.დ.კ"
 
 #. Name
 #: plugins/hardwaremodules.desktop:6
 msgid "Hardware"
-msgstr "მ�წყ�ბილ�ბები"
+msgstr "�პ�რ�ტურ�"
 
 #. Name
 #: plugins/info.desktop:7
 msgid "Browse Info Pages"
-msgstr "ცნ�ბ�რის დ�თვ�ლიერებ�"
+msgstr "ინფ�რმ�ციის გვერდების დ�თვ�ლიერებ�"
 
 #. Name
 #: plugins/kcontrolmodules.desktop:6
@@ -150,7 +151,7 @@ msgstr "მ�რთვის ცენტრის მ�დულები"
 #. Name
 #: plugins/konqplugins.desktop:6
 msgid "Konqueror Plugins"
-msgstr "Konqueror-ის პლ�გინები"
+msgstr "Konqueror-ის დ�მ�ტებები"
 
 #. Name
 #: plugins/links.desktop:6
@@ -165,12 +166,12 @@ msgstr "სáƒ�ხელმძღვáƒ�ნელáƒ� დáƒ�მწყებთáƒ�áƒ
 #. Name
 #: plugins/releasenotes.desktop:6
 msgid "TDE Release Notes"
-msgstr ""
+msgstr "TDE-ის გ�მ�ცემის შენიშვნები"
 
 #. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
-msgstr "TDE-ს მხ�რდ�ჭერ�"
+msgstr "TDE-ის მხ�რდ�ჭერ�"
 
 #. Name
 #: plugins/tdeioslaves.desktop:6
@@ -180,22 +181,24 @@ msgstr "პრ�ტ�კ�ლები"
 #. Comment
 #: plugins/tdeioslaves.desktop:8
 msgid "Information about the available protocols"
-msgstr "ინფ�რმ�ცი� ხელმის�წვდ�მი პრ�ტ�კ�ების შეს�ხებ"
+msgstr "ინფ�რმ�ცი� ხელმის�წვდ�მი პრ�ტ�კ�ლების შეს�ხებ"
 
 #. Keywords
 #: plugins/tdeioslaves.desktop:10
 msgid "Protocol;IO slaves;Slaves;Network;Information;Timeout;"
 msgstr ""
+"Protocol;IO "
+"slaves;Slaves;Network;Information;Timeout;პრ�ტ�კ�ლი;ქსელი;ინფ�რმ�ცი�;"
 
 #. Name
 #: plugins/userguide.desktop:6
 msgid "TDE User Guide"
-msgstr "TDE-ს მ�მხმ�რებლის ს�ხელმძღვ�ნელ�"
+msgstr "TDE-ის მ�მხმ�რებლის ს�ხელმძღვ�ნელ�"
 
 #. Name
 #: plugins/visualdict.desktop:6
 msgid "A Visual Guide to TDE"
-msgstr "TDE-ს თვ�ლს�ჩინ� ს�ხელმძღვ�ნელ�"
+msgstr "TDE-ის თვ�ლს�ჩინ� ს�ხელმძღვ�ნელ�"
 
 #. Name
 #: plugins/welcome.desktop:6
@@ -204,16 +207,15 @@ msgstr "მ�გეს�ლმებ�თ TDE"
 
 #. Name
 #: plugins/Applications/.directory:7
-#, fuzzy
 msgid "Application Manuals"
-msgstr "�პლეტთ� ს�ხელმძღვ�ნელ�"
+msgstr "�პლიკ�ციის ს�ხელმძღვ�ნელ�ები"
 
 #. Name
 #: plugins/Manpages/.directory:8
 msgid "UNIX manual pages"
-msgstr ""
+msgstr "UNIX-ის ს�ხელმძღვ�ნელ�ს გვერდები"
 
 #. Name
 #: plugins/Scrollkeeper/.directory:5
 msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrollkeeper"
diff --git a/translations/desktop_files/khelpcenter-desktops/nl.po b/translations/desktop_files/khelpcenter-desktops/nl.po
index a6b9d7cde..d3331a8fe 100644
--- a/translations/desktop_files/khelpcenter-desktops/nl.po
+++ b/translations/desktop_files/khelpcenter-desktops/nl.po
@@ -1,51 +1,51 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-06-05 18:15+0000\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-01-07 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/khelpcenter-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Help.desktop:10
 msgid "Help"
-msgstr "Documentatie"
+msgstr "Hulp"
 
 #. Name
 #: htmlsearch/htmlsearch.desktop:12
-#, fuzzy
 msgid "Index"
-msgstr "Documentatie-index"
+msgstr "Inhoudsopgave"
 
 #. Comment
 #: htmlsearch/htmlsearch.desktop:14
 msgid "Index generation"
-msgstr "Indexgeneratie"
+msgstr "Inhoudsopgave samenstellen"
 
 #. Keywords
 #: htmlsearch/htmlsearch.desktop:16
 msgid "Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;"
-msgstr "help;html;zoeken;index;htdig;htsearch;htmerge;scope;taal;"
+msgstr "help;hulp;html;zoeken;index;htdig;htsearch;htmerge;scope;taal;"
 
 #. Name
 #: kcmhelpcenter.desktop:13
 msgid "Help Index"
-msgstr "Documentatie-index"
+msgstr "Hulp-inhoudsopgave"
 
 #. Comment
 #: kcmhelpcenter.desktop:15
 msgid "Help center search index configuration and generation"
-msgstr "Zoekindex van het documentatiecentrum instellen en genereren"
+msgstr "Inhoudsopgave van het hulpcentrum in- en samenstellen"
 
 #. Keywords
 #: kcmhelpcenter.desktop:17
@@ -55,17 +55,17 @@ msgstr "khelpcenter;help;index;search;hulp;zoeken;documentatie;handboek;"
 #. Name
 #: khelpcenter.desktop:11
 msgid "KHelpCenter"
-msgstr ""
+msgstr "KHelpCenter"
 
 #. Comment
 #: khelpcenter.desktop:13
 msgid "The Trinity Help Center"
-msgstr "Het Trinity-documentatiecentrum"
+msgstr "Het Trinity-hulpcentrum"
 
 #. Name
 #: plugins/Manpages/man1.desktop:4
 msgid "(1) User Commands"
-msgstr "(1) Gebruikercommando's"
+msgstr "(1) Gebruikersopdrachten"
 
 #. Name
 #: plugins/Manpages/man2.desktop:4
@@ -75,7 +75,7 @@ msgstr "(2) Systeemaanroepen"
 #. Name
 #: plugins/Manpages/man3.desktop:4
 msgid "(3) Subroutines"
-msgstr ""
+msgstr "(3) Subroutines"
 
 #. Name
 #: plugins/Manpages/man4.desktop:4
@@ -90,7 +90,7 @@ msgstr "(5) Bestandsformaten"
 #. Name
 #: plugins/Manpages/man6.desktop:4
 msgid "(6) Games"
-msgstr "(6) Spelletjes"
+msgstr "(6) Games"
 
 #. Name
 #: plugins/Manpages/man7.desktop:4
@@ -105,7 +105,7 @@ msgstr "(8) Systeembeheer"
 #. Name
 #: plugins/Manpages/man9.desktop:4
 msgid "(9) Kernel"
-msgstr ""
+msgstr "(9) Kernel"
 
 #. Name
 #: plugins/Manpages/mann.desktop:4
@@ -114,14 +114,13 @@ msgstr "(n) Nieuw"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "TDE's Gebruikershandboek"
+msgstr "TDE-beheerdershandboek"
 
 #. Name
 #: plugins/applets.desktop:6
 msgid "Applet Manuals"
-msgstr "Applet-handboeken"
+msgstr "Applethandboek"
 
 #. Name
 #: plugins/contact.desktop:6
@@ -131,27 +130,27 @@ msgstr "Contactinformatie"
 #. Name
 #: plugins/faq.desktop:6
 msgid "The TDE FAQ"
-msgstr "Veel voorkomde vragen over TDE"
+msgstr "Veelgestelde vragen"
 
 #. Name
 #: plugins/hardwaremodules.desktop:6
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #. Name
 #: plugins/info.desktop:7
 msgid "Browse Info Pages"
-msgstr "Info-pagina's doorbladeren"
+msgstr "Inforomatiepagina's doorbladeren"
 
 #. Name
 #: plugins/kcontrolmodules.desktop:6
 msgid "Control Center Modules"
-msgstr "Configuratiecentrummodules"
+msgstr "Systeeminstellingenmodules"
 
 #. Name
 #: plugins/konqplugins.desktop:6
 msgid "Konqueror Plugins"
-msgstr "Konqueror-plugins"
+msgstr "Konqueror-plug-ins"
 
 #. Name
 #: plugins/links.desktop:6
@@ -166,7 +165,7 @@ msgstr "Snelstartgids"
 #. Name
 #: plugins/releasenotes.desktop:6
 msgid "TDE Release Notes"
-msgstr ""
+msgstr "TDE-uitgaveopmerkingen"
 
 #. Name
 #: plugins/support.desktop:6
@@ -186,13 +185,12 @@ msgstr "Informatie over de beschikbare protocollen"
 #. Keywords
 #: plugins/tdeioslaves.desktop:10
 msgid "Protocol;IO slaves;Slaves;Network;Information;Timeout;"
-msgstr ""
-"protocol;IO slaves;slaves;network;informatie;timeout;netwerk;tijdslimiet;"
+msgstr "protocol;IO slaves;network;informatie;timeout;netwerk;tijdslimiet;"
 
 #. Name
 #: plugins/userguide.desktop:6
 msgid "TDE User Guide"
-msgstr "TDE's Gebruikershandboek"
+msgstr "TDE-gebruikershandboek"
 
 #. Name
 #: plugins/visualdict.desktop:6
@@ -202,7 +200,7 @@ msgstr "Een visuele TDE-gids"
 #. Name
 #: plugins/welcome.desktop:6
 msgid "Welcome to TDE"
-msgstr "Welkom bij TDE"
+msgstr "Welkom in TDE"
 
 #. Name
 #: plugins/Applications/.directory:7
@@ -217,4 +215,4 @@ msgstr "Unix-handboeken"
 #. Name
 #: plugins/Scrollkeeper/.directory:5
 msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrolpositie onthouden"
diff --git a/translations/desktop_files/khelpcenter-desktops/ru.po b/translations/desktop_files/khelpcenter-desktops/ru.po
index ee5f149d5..f9353fac5 100644
--- a/translations/desktop_files/khelpcenter-desktops/ru.po
+++ b/translations/desktop_files/khelpcenter-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-06-05 18:15+0000\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: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khelpcenter-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Help.desktop:10
@@ -35,6 +37,8 @@ msgstr "Создание индек�а"
 #: htmlsearch/htmlsearch.desktop:16
 msgid "Help;HTML;Search;Index;htdig;htsearch;htmerge;Scope;Language;"
 msgstr ""
+"Помощь;Справка;HTML;Пои�к;Указатель;Индек�;htdig;htsearch;htmerge;Обла�ть;Язы"
+"к;"
 
 #. Name
 #: kcmhelpcenter.desktop:13
@@ -49,7 +53,7 @@ msgstr "�а�тройка индек�ов �правочной �и�темы
 #. Keywords
 #: kcmhelpcenter.desktop:17
 msgid "khelpcenter;help;index;search;"
-msgstr ""
+msgstr "khelpcenter;помощь;�правка;указатель;индек�;пои�к;"
 
 #. Name
 #: khelpcenter.desktop:11
@@ -113,9 +117,8 @@ msgstr "(n) �овые"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "Руковод�тво пользовател� TDE"
+msgstr "Руковод�тво админи�тратора TDE"
 
 #. Name
 #: plugins/applets.desktop:6
@@ -165,7 +168,7 @@ msgstr "Руковод�тво дл� начинающих в TDE"
 #. Name
 #: plugins/releasenotes.desktop:6
 msgid "TDE Release Notes"
-msgstr ""
+msgstr "Примечани� к выпу�ку TDE"
 
 #. Name
 #: plugins/support.desktop:6
@@ -185,7 +188,7 @@ msgstr "Сведени� о протоколах ввода-вывода"
 #. Keywords
 #: plugins/tdeioslaves.desktop:10
 msgid "Protocol;IO slaves;Slaves;Network;Information;Timeout;"
-msgstr ""
+msgstr "протокол;IO slaves;slaves;Сеть;Информаци�;Тайм-аут;задержка;"
 
 #. Name
 #: plugins/userguide.desktop:6
@@ -215,4 +218,4 @@ msgstr "Страницы руковод�тв UNIX"
 #. Name
 #: plugins/Scrollkeeper/.directory:5
 msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrollkeeper"
diff --git a/translations/desktop_files/khotkeys-data/es_AR.po b/translations/desktop_files/khotkeys-data/es_AR.po
new file mode 100644
index 000000000..255952454
--- /dev/null
+++ b/translations/desktop_files/khotkeys-data/es_AR.po
@@ -0,0 +1,596 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2025-03-08 20:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/khotkeys-data/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:5
+#, fuzzy
+msgid "Basic Konqueror gestures."
+msgstr "Gestos básicos de Konqueror."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:8
+#, fuzzy
+msgid "Konqueror Gestures"
+msgstr "Gestos de Konqueror"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:13 trinity2b1.khotkeys:219
+#, fuzzy
+msgid "Konqueror window"
+msgstr "Ventana de Konqueror"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:20
+#: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
+#: trinity2b1.khotkeys:232
+#, fuzzy
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:35
+#, fuzzy
+msgid "Press, move left, release."
+msgstr "Pulsar, mover a la izquierda, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:37 trinity2b1.khotkeys:242
+#, fuzzy
+msgid "Back"
+msgstr "Retroceder"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:41
+msgid ""
+"Opera-style: Press, move up, release.\n"
+"NOTE: Conflicts with 'New Tab', and as such is disabled by default."
+msgstr ""
+"Estilo Opera: Pulsar, subir, soltar.\n"
+"NOTA: Entra en conflicto con \"Nueva solapa\", por lo que está deshabilitado "
+"por omisión."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:43
+#, fuzzy
+msgid "Stop Loading"
+msgstr "Detener la carga"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:58
+#: konqueror_gestures_trinity21.khotkeys:83
+#: konqueror_gestures_trinity21.khotkeys:108
+#: konqueror_gestures_trinity21.khotkeys:133
+#: konqueror_gestures_trinity21.khotkeys:158
+#: konqueror_gestures_trinity21.khotkeys:177
+#: konqueror_gestures_trinity21.khotkeys:202
+#: konqueror_gestures_trinity21.khotkeys:227
+#: konqueror_gestures_trinity21.khotkeys:252
+#: konqueror_gestures_trinity21.khotkeys:277
+#: konqueror_gestures_trinity21.khotkeys:306
+#: konqueror_gestures_trinity21.khotkeys:335
+#: konqueror_gestures_trinity21.khotkeys:360
+#: konqueror_gestures_trinity21.khotkeys:385 trinity2b1.khotkeys:257
+#: trinity2b1.khotkeys:289 trinity2b1.khotkeys:321 trinity2b1.khotkeys:353
+msgid "Gesture_triggers"
+msgstr "Activadores_de_gestos"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:66
+#, fuzzy
+msgid ""
+"Going up in URL/directory structure.\n"
+"Mozilla-style: Press, move up, move left, move up, release."
+msgstr ""
+"Subir en la estructura  de URL/directorios.\n"
+"Estilo Mozilla: Pulsar, subir, mover a la izquierda, subir, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
+#, fuzzy
+msgid "Up"
+msgstr "Subir"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:91
+msgid ""
+"Going up in URL/directory structure.\n"
+"Opera-style: Press, move up, move left, move up, release.\n"
+"NOTE: Conflicts with  \"Activate Previous Tab\", and as such is disabled by "
+"default."
+msgstr ""
+"Subir en la estructura de URL/directorios.\n"
+"Estilo Opera: Pulsar, subir, mover a la izquierda, subir, soltar.\n"
+"NOTA: Entra en conflicto con \"Activar la solapa anterior\", por lo que está "
+"deshabilitado por omisión."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:93
+#, fuzzy
+msgid "Up #2"
+msgstr "Subir #2"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:116
+#, fuzzy
+msgid "Press, move up, move right, release."
+msgstr "Pulsar, subir, mover a la derecha, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:118
+#, fuzzy
+msgid "Activate Next Tab"
+msgstr "Activar la siguiente solapa"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:141
+#, fuzzy
+msgid "Press, move up, move left, release."
+msgstr "Pulsar, subir, mover a la izquierda, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:143
+#, fuzzy
+msgid "Activate Previous Tab"
+msgstr "Activar la solapa anterior"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:185
+#, fuzzy
+msgid "Press, move down, move up, move down, release."
+msgstr "Pulsar, bajar, subir, bajar, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:187
+#, fuzzy
+msgid "Duplicate Tab"
+msgstr "Duplicar la solapa"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:210
+#, fuzzy
+msgid "Press, move down, move up, release."
+msgstr "Pulsar, bajar, subir, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:212
+#, fuzzy
+msgid "Duplicate Window"
+msgstr "Duplicar la ventana"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:235
+#, fuzzy
+msgid "Press, move right, release."
+msgstr "Pulsar, mover a la derecha, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:237 trinity2b1.khotkeys:274
+#, fuzzy
+msgid "Forward"
+msgstr "Avanzar"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:260
+msgid ""
+"Press, move down, move half up, move right, move down, release.\n"
+"(Drawing a lowercase 'h'.)"
+msgstr ""
+"Pulsar, bajar, subir hasta la mitad, mover a la derecha, bajar, soltar.\n"
+"(Dibujando una \"h\" minúscula.)"
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:262
+#, fuzzy
+msgid "Home"
+msgstr "Personal"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:289
+#, fuzzy
+msgid ""
+"Press, move right, move down, move right, release.\n"
+"Mozilla-style: Press, move down, move right, release."
+msgstr ""
+"Pulsar, mover a la derecha, bajar, mover a la derecha, soltar.\n"
+"Estilo Mozilla: Pulsar, bajar, mover a la derecha, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:291
+#, fuzzy
+msgid "Close Tab"
+msgstr "Cerrar la solapa"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:318
+msgid ""
+"Press, move up, release.\n"
+"Conflicts with Opera-style 'Up #2', which is disabled by default."
+msgstr ""
+"Pulsar, subir, soltar.\n"
+"Entra en conflicto con el \"Subir #2\" de Opera, por lo que está "
+"deshabilitado por omisión."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:320
+#, fuzzy
+msgid "New Tab"
+msgstr "Nueva solapa"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:343
+#, fuzzy
+msgid "Press, move down, release."
+msgstr "Pulsar, bajar, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:345
+#, fuzzy
+msgid "New Window"
+msgstr "Nueva ventana"
+
+#. Comment
+#: konqueror_gestures_trinity21.khotkeys:368
+#, fuzzy
+msgid "Press, move up, move down, release."
+msgstr "Pulsar, subir, bajar, soltar."
+
+#. Name
+#: konqueror_gestures_trinity21.khotkeys:370 trinity2b1.khotkeys:338
+#, fuzzy
+msgid "Reload"
+msgstr "Recargar"
+
+#. Comment
+#: printscreen.khotkeys:5
+msgid "This group contains actions that are set up by default."
+msgstr "Éste grupo contiene acciones que están configuradas por omisión."
+
+#. Name
+#: printscreen.khotkeys:8
+#, fuzzy
+msgid "Preset Actions"
+msgstr "Acciones preconfiguradas"
+
+#. Comment
+#: printscreen.khotkeys:17
+#, fuzzy
+msgid "Launches KSnapShot when PrintScrn is pressed."
+msgstr "Lanza KSnapShot cuando se pulsa la tecla ImprPant."
+
+#. Name
+#: printscreen.khotkeys:19
+#, fuzzy
+msgid "PrintScreen"
+msgstr "Imprimir la pantalla"
+
+#. Comment
+#: printscreen.khotkeys:33 printscreen.khotkeys:57 trinity2b1.khotkeys:46
+#: trinity2b1.khotkeys:71 trinity2b1.khotkeys:95 trinity2b1.khotkeys:163
+#: trinity2b1.khotkeys:203 trinity2b1.khotkeys:385
+msgid "Simple_action"
+msgstr "Acción_sencilla"
+
+#. Comment
+#: printscreen.khotkeys:41
+msgid ""
+"Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
+msgstr ""
+"Inicia KSnapShot en modo de captura de ventana cuando se presiona ALT+"
+"Imprimir Pantalla.\n"
+
+#. Name
+#: printscreen.khotkeys:43
+#, fuzzy
+msgid "PrintWindow"
+msgstr "PrintWindow"
+
+#. Comment
+#: trinity2b1.khotkeys:5
+msgid ""
+"This group contains various examples demonstrating most of the features of "
+"KHotkeys. (Note that this group and all its actions are disabled by default.)"
+msgstr ""
+"Éste grupo contiene varios ejemplos que muestran la mayor parte de las "
+"características de KHotKeys. (Mirá que este este grupo y todas sus acciones "
+"están deshabilitadas por omisión.)"
+
+#. Name
+#: trinity2b1.khotkeys:8
+#, fuzzy
+msgid "Examples"
+msgstr "Ejemplos"
+
+#. Comment
+#: trinity2b1.khotkeys:16
+#, fuzzy
+msgid ""
+"After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. "
+"Simple."
+msgstr ""
+"Tras pulsar Ctrl+Alt+I, se activará la ventana de KSIRC, en caso de que "
+"exista. Sencillo."
+
+#. Name
+#: trinity2b1.khotkeys:18
+#, fuzzy
+msgid "Activate KSIRC Window"
+msgstr "Activar la ventana de KSIRC"
+
+#. Comment
+#: trinity2b1.khotkeys:28
+#, fuzzy
+msgid "KSIRC window"
+msgstr "Ventana de KSIRC"
+
+#. Comment
+#: trinity2b1.khotkeys:34
+#, fuzzy
+msgid "KSIRC"
+msgstr "KSIRC"
+
+#. Comment
+#: trinity2b1.khotkeys:54
+msgid ""
+"After pressing Alt+Ctrl+H, 'Hello' input will be simulated just like if you "
+"typed it. Especially useful if you're lazy to type things like 'unsigned'. "
+"Every keypress in the input is separated by a colon ':' . Note that the "
+"keypresses mean really keypresses, so you have to write what you'd really "
+"press on the keyboard. In the table below, left column shows the input and "
+"the right column shows what to type.\n"
+"\n"
+"\"enter\" (i.e. new line)                Enter or Return\n"
+"a (i.e. small a)                          A\n"
+"A (i.e. capital a)                       Shift+A\n"
+": (colon)                                  Shift+;\n"
+"' '  (space)                              Space"
+msgstr ""
+"Tras pulsar Alt+Ctrl+H, se simulará la escritura de \"Hola\", exactamente "
+"como si la teclearas vos. Es especialmente útil si no querés molestarte en "
+"escribir cosas como \"sin firmar\". Cada pulsación se separa con dos puntos "
+"\":\". Mirá que las pulsaciones realmente lo son, de modo que tenés que "
+"escribir lo que realmente pulsarías en el teclado. En la tabla inferior, la "
+"columna izquierda muestra la entrada y la columna derecha muestra qué "
+"teclear.\n"
+"\n"
+"\"enter\" (es decir, salto de línea)                Intro o Retorno\n"
+"a (es decir, a minúscula)                          A\n"
+"A (es decir, A mayúscula)                       Mayúsculas+A\n"
+": (dos puntos)                                  Mayúsculas+;\n"
+"\" \"  (espacio)                              Espacio"
+
+#. Name
+#: trinity2b1.khotkeys:56
+msgid "Type 'Hello'"
+msgstr "Escribí \"Hola\""
+
+#. Comment
+#: trinity2b1.khotkeys:79
+msgid "This action runs Konsole, after pressing Ctrl+Alt+T."
+msgstr "Ésta acción ejecuta Konsole, tras pulsar Ctrl+Alt+T."
+
+#. Name
+#: trinity2b1.khotkeys:81
+#, fuzzy
+msgid "Run Konsole"
+msgstr "Ejecutar Konsole"
+
+#. Comment
+#: trinity2b1.khotkeys:103
+msgid ""
+"Read the comment on action \"Type 'Hello'\" first.\n"
+"\n"
+"Qt Designer uses Ctrl+F4 for closing windows (maybe because MS Windows does "
+"it that way *shrug*). But Ctrl+F4 in TDE stands for going to virtual desktop "
+"4, so it doesn't work in Qt Designer, and also, Qt Designer doesn't use "
+"TDE's standard Ctrl+W for closing the window.\n"
+"\n"
+"But the problem can be solved by remaping Ctrl+W to Ctrl+F4 when the active "
+"window is Qt Designer. When Qt Designer is active, every time Ctrl+W is "
+"pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, "
+"Ctrl+W remains working the usual way of course.\n"
+"\n"
+"We now need to specify three things: A new shortcut trigger on 'Ctrl+W', a "
+"new keyboard input action sending Ctrl+F4, and a new condition that the "
+"active window is Qt Designer.\n"
+"Qt Designer seems to always have title 'Qt Designer by Trolltech', so the "
+"condition will check for the active window having that title."
+msgstr ""
+"Leé el comentario sobre la acción \"Tecleá 'Hola'\" primero.\n"
+"\n"
+"Qt Designer usa Ctrl+F4 para cerrar las ventanas (tal vez porque MS Windows "
+"también lo hace así). Pero Ctrl+F4 en TDE significa ir al escritorio virutal "
+"4, por lo que no funciona en Qt Designer. Del mismo modo, Qt Designer no usa "
+"la secuencia Ctrl+W estándar de TDE para cerrar la ventana.\n"
+"\n"
+"Pero el problema se puede resolver reasignando Ctrl+W a Ctrl+F4 cuando la "
+"ventana activa es Qt Designer. Cuando Qt Designer esté activo, cada vez que "
+"se pulse Ctrl+W, en su lugar se enviará Ctrl+F4 a QtDesigner. Por supuesto, "
+"en otros programas, Ctrl+W seguirá funcionando de la manera habitual.\n"
+"\n"
+"Ahora es necesario indicar tres cosas: un nuevo atajo de teclado para \"Ctrl+"
+"W\", una nueva acción de entrada de teclado que envíe Ctrl+F4, y una nueva "
+"condición de que la ventana activa sea Qt Designer.\n"
+"Qt Designer siempre parece tener el título \"Qt Designer by Trolltech\", así "
+"que la condición comprobará si la ventana activa tiene ése título."
+
+#. Name
+#: trinity2b1.khotkeys:105
+#, fuzzy
+msgid "Remap Ctrl+W to Ctrl+F4 in Qt Designer"
+msgstr "Reasignar Ctrl+W a Ctrl+F4 en Qt Designer"
+
+#. Comment
+#: trinity2b1.khotkeys:123
+#, fuzzy
+msgid "Qt Designer"
+msgstr "Qt Designer"
+
+#. Comment
+#: trinity2b1.khotkeys:144
+msgid ""
+"By pressing Alt+Ctrl+W a DCOP call will be performed that will show the "
+"minicli. You can use any kind of DCOP call, just like using the command line "
+"'dcop' tool."
+msgstr ""
+"Al pulsar Alt+Ctrl+W se efectuará una llamada DCOP que mostrará la minilínea "
+"de órdenes. Podés usar cualquier tipo de llamada DCOP, examente igual que si "
+"usaras la herramienta \"dcop\" de la línea de órdenes."
+
+#. Name
+#: trinity2b1.khotkeys:146
+msgid "Perform DCOP call 'kdesktop KDesktopIface popupExecuteCommand()'"
+msgstr ""
+"Realizar la llamada DCOP \"kdesktop KDesktopIface popupExecuteCommand()\""
+
+#. Comment
+#: trinity2b1.khotkeys:171
+msgid ""
+"Read the comment on action \"Type 'Hello'\" first.\n"
+"\n"
+"Just like the \"Type 'Hello'\" action, this one simulates a keyboard input, "
+"specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps "
+"to the next song). The 'Send to specific window' checkbox is checked and a "
+"window with its class containing 'XMMS_Player' is specified; this will make "
+"the input always be sent to this window. This way, you can control XMMS even "
+"if it's e.g. on a different virtual desktop.\n"
+"\n"
+"(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
+"'XMMS_Player')."
+msgstr ""
+"Leé el comentario de lea acción \"Tecleá 'Hola'\" primero.\n"
+"\n"
+"Al igual que en la acción \"Teclee 'Hola'\", ésto simula una entrada por el "
+"teclado, concretamente, tras pulsar Ctrl+Alt+B, envía B a XMMS (B en XMMS "
+"salta a la siguiente canción). Se marca la casilla \"Enviar a una ventana "
+"concreta\" está activada y se indica una ventana cuya clase conenga "
+"\"XMMS_Player\"; ésto hará que los datos introducidos se envíen siempre a "
+"esta ventana. De esta manera, podés controlar XMMS incluso si, por ejemplo, "
+"te encontrás en otro escritorio virtual.\n"
+"\n"
+"(Ejecutá \"xprop\", pulsá en la ventana de XMMS y buscá WM_CLASS para ver "
+"\"XMMS_Player\")."
+
+#. Name
+#: trinity2b1.khotkeys:173
+#, fuzzy
+msgid "Next in XMMS"
+msgstr "Siguiente en XMMS"
+
+#. Comment
+#: trinity2b1.khotkeys:185
+#, fuzzy
+msgid "XMMS window"
+msgstr "Ventana de XMMS"
+
+#. Comment
+#: trinity2b1.khotkeys:191
+#, fuzzy
+msgid "XMMS Player window"
+msgstr "Ventana del reproductor XMMS"
+
+#. Comment
+#: trinity2b1.khotkeys:211
+msgid ""
+"Ok, Konqi in TDE has tabs, and now you can also have gestures. No need to "
+"use other browsers >;).\n"
+"\n"
+"Just press the middle mouse button and start drawing one of the gestures, "
+"and after you're finished, release the mouse button. If you only need to "
+"paste the selection, it still works, simply only click the middle mouse "
+"button. (You can change the mouse button to use in the global settings).\n"
+"\n"
+"Right now, there are these gestures available:\n"
+"move right and back left - Forward (ALt+Right)\n"
+"move left and back right - Back (Alt+Left)\n"
+"move up and back down  - Up (Alt+Up)\n"
+"circle anticlockwise - Reload (F5)\n"
+" (As soon as I find out which ones are in Opera or Mozilla, I'll add more "
+"and make sure they are the same. Or if you do it yourself, feel free to help "
+"me and send me your khotkeysrc.)\n"
+"\n"
+"The gestures shapes (some of the dialogs are from KGesture, thanks to Mike "
+"Pilone) can be simply entered by performing them in the configuration "
+"dialog. You can also look at your numeric pad to help you, gestures are "
+"recognized like a 3x3 grid of fields, numbered 1 to 9.\n"
+"\n"
+"Note that you must perform exactly the gesture to trigger the action. "
+"Because of this, it's possible to enter more gestures for the action. You "
+"should try to avoid complicated gestures where you change the direction of "
+"mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple "
+"to perform but e.g. 1236987 may be already quite difficult).\n"
+"\n"
+"The condition for all gestures are defined in this group. All these gestures "
+"are active only if the active window is Konqueror (class contains "
+"'konqueror')."
+msgstr ""
+"Dale, Konqi en TDE tiene solapas, y ahora también puede tener gestos. No "
+"necesitás usar otros navegadores >;).\n"
+"\n"
+"Simplemente pulsá el botón central del ratón y empezá a dibujar uno de los "
+"gestos, y una vez hayas finalizado, soltá el botón del mouse. Si sólo "
+"necesitás pegar la selección, sigue funcionando como antes, simplemente "
+"pulsá el botón central del mouse. (Podés cambiar el botón del mouse a usar "
+"en las opciones globales).\n"
+"\n"
+"Por ahora, están disponibles estos gestos:\n"
+"mover a la derecha y de nuevo a la izquierda - Avanzar (Alt+Derecha)\n"
+"mover a la izquierda y de nuevo a la derecha - Retroceder (Alt +Izquierda)\n"
+"subir y volver a bajar  - Subir (Alt+Arriba)\n"
+"círculo en sentido antihorario - Recargar (F5)\n"
+"(Tan pronto como se averigüen las que usan Opera o Mozilla, se añadirán más, "
+"asegurándose de que sean los mismos. O si querés hacerlo vos mismo, estás "
+"invitado a ayudar al autor y enviarle tu \"khotkeysrc\".)\n"
+"\n"
+"Las formas de los gestos (algunos de las ventanas son de KGesture, gracias a "
+"Mike Pilone) se pueden introducir simplemente realizándolas en la ventana de "
+"configuración. También podés mirar tu teclado numérico como ayuda, los "
+"gestos se reconocen como una rejilla 3x3 de campos numerados del 1 al 9.\n"
+"\n"
+"Observá que tenés que realizar exactamente el gesto que lance la acción. Por "
+"ello, es posible introducir más gestos para la acción. Deberías intentar "
+"evitar gestos complicados en los que cambie la dirección del mouse "
+"moviéndolo más de una vez (por ejemplo usá 45654 o 74123 ya que son simples "
+"de realizar, mientras que  1236987 ya puede ser bastante difícil).\n"
+"\n"
+"Las condiciones para todos estos gestos están definidas en este grupo. Todos "
+"estos gestos se activan sólo si la ventana activa es Konqueror (la clase "
+"contiene \"konqueror\")."
+
+#. Name
+#: trinity2b1.khotkeys:214
+#, fuzzy
+msgid "Konqi Gestures"
+msgstr "Gestor de Konqi"
+
+#. Comment
+#: trinity2b1.khotkeys:369
+msgid ""
+"After pressing Win+E (Tux+E), WWW browser will be launched and it will open "
+"http://www.trinitydesktop.org . You may run all kind of commands you can run "
+"in minicli (Alt+F2)."
+msgstr ""
+"Tras pulsar Win+E (Tux+E), se lanzará el navegador WWW y abrirá http://"
+"www.trinitydesktop.org. Podés ejecutar toda clase de órdenes que se pueda "
+"ejecutar en la minilínea de órdenes (Alt+F2)."
+
+#. Name
+#: trinity2b1.khotkeys:371
+msgid "Go to TDE Website"
+msgstr "Ir al sitio web de TDE"
diff --git a/translations/desktop_files/khotkeys-data/ka.po b/translations/desktop_files/khotkeys-data/ka.po
index 360f3ad26..7c8ca0578 100644
--- a/translations/desktop_files/khotkeys-data/ka.po
+++ b/translations/desktop_files/khotkeys-data/ka.po
@@ -1,52 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-12-19 05:12+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-data/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
 msgid "Basic Konqueror gestures."
-msgstr ""
+msgstr "Konqueror-ის ს�ბ�ზის� ჟესტები."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:8
 msgid "Konqueror Gestures"
-msgstr ""
+msgstr "Konqueror -ის ჟესტები"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:13 trinity2b1.khotkeys:219
 msgid "Konqueror window"
-msgstr ""
+msgstr "Konqueror -ის ფ�ნჯ�რ�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
 msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
 msgid "Press, move left, release."
-msgstr ""
+msgstr "დ��წექით, გ�დ�იტ�ნეთ მ�რცხნივ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:37 trinity2b1.khotkeys:242
 msgid "Back"
-msgstr ""
+msgstr "უკ�ნ"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:41
@@ -54,11 +55,14 @@ msgid ""
 "Opera-style: Press, move up, release.\n"
 "NOTE: Conflicts with 'New Tab', and as such is disabled by default."
 msgstr ""
+"Opera-ის სტილი. დ�წ�ლ�, მ�ღლ�, გ�უშვით\n"
+"შენიშვნ�: კ�ნფლიქტში� ჟესტთ�ნ '�ხ�ლი ჩ�ნ�რთი', �მიტ�მ ნ�გულისხმევ�დ "
+"გ�მ�რთული�."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:43
 msgid "Stop Loading"
-msgstr ""
+msgstr "ჩ�ტვირთვის გ�ჩერებ�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:58
@@ -77,7 +81,7 @@ msgstr ""
 #: konqueror_gestures_trinity21.khotkeys:385 trinity2b1.khotkeys:257
 #: trinity2b1.khotkeys:289 trinity2b1.khotkeys:321 trinity2b1.khotkeys:353
 msgid "Gesture_triggers"
-msgstr ""
+msgstr "Gesture_triggers"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:66
@@ -85,11 +89,14 @@ msgid ""
 "Going up in URL/directory structure.\n"
 "Mozilla-style: Press, move up, move left, move up, release."
 msgstr ""
+"URL/ს�ქ�ღ�ლდეების სტრუქტურ�ში მ�ღლ� �სვლ�.\n"
+"Mozilla-ის სტილი: დ��ჭირეთ, მ�ღლ� �სვლ�, მ�რცხნივ გ�სვლ�, მ�ღლ� �სვლ�, "
+"გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
 msgid "Up"
-msgstr ""
+msgstr "ჩ�რთული"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:91
@@ -99,62 +106,65 @@ msgid ""
 "NOTE: Conflicts with  \"Activate Previous Tab\", and as such is disabled by "
 "default."
 msgstr ""
+"მ�ღლ� �სვლ� URL-ის/ს�ქ�ღ�ლდის სტრუქტურ�ში.\n"
+"Opera-ის სტილი. დ��ჭირეთ, მ�ღლ�, მ�რცხნივ, მ�ღლ�, გ�უშვით.\n"
+"შენიშვნ�: კ�ნფლიქტში�   \"წინ� ჩ�ნ�რთის გ��ქტიურებ�სთ�ნ\"; დ� �მიტ�მ "
+"ნ�გულისხმევ�დ გ�თიშული�."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:93
 msgid "Up #2"
-msgstr ""
+msgstr "მ�ღლ� #2"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:116
 msgid "Press, move up, move right, release."
-msgstr ""
+msgstr "დ��წექით, მ�ღლ� �იტ�ნეთ, მ�რჯვნივ გ�იტ�ნეთ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:118
 msgid "Activate Next Tab"
-msgstr ""
+msgstr "შემდეგი ჩ�ნ�რთის გ��ქტიურებ�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:141
 msgid "Press, move up, move left, release."
-msgstr ""
+msgstr "დ��წექით, მ�ღლ� �იტ�ნეთ, მ�რივ გ�იტ�ნეთ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:143
 msgid "Activate Previous Tab"
-msgstr ""
+msgstr "წინ� ჩ�ნ�რთის გ��ქტიურებ�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:185
 msgid "Press, move down, move up, move down, release."
-msgstr ""
+msgstr "დ��წექით, დ�ბლ� ჩ�მ�იტ�ნეთ, მ�ღლ� �იტ�ნეთ, დ�ბლ� ჩ�მ�იტ�ნეთ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:187
 msgid "Duplicate Tab"
-msgstr ""
+msgstr "ჩ�ნ�რთის დუბლირებ�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:210
 msgid "Press, move down, move up, release."
-msgstr ""
+msgstr "დ��წექით, დ�ბლ� ჩ�მ�იტ�ნეთ, მ�ღლ� �იტ�ნეთ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:212
-#, fuzzy
 msgid "Duplicate Window"
-msgstr "�ხ�ლი ფ�ნჯ�რ�"
+msgstr "ფ�ნჯრის დუბლირებ�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:235
 msgid "Press, move right, release."
-msgstr ""
+msgstr "დ��წექით, მ�რჯვნივ გ�იტ�ნეთ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:237 trinity2b1.khotkeys:274
 msgid "Forward"
-msgstr ""
+msgstr "წინ"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:260
@@ -162,6 +172,8 @@ msgid ""
 "Press, move down, move half up, move right, move down, release.\n"
 "(Drawing a lowercase 'h'.)"
 msgstr ""
+"დ��ჭირეთ, ქვემ�თ, ნ�ხევრ�დ ზემ�თ, მ�რჯვნივ, ქვემ�თ, გ�უსვით\n"
+"(დ�ხ�ტეთ პ�ტ�რ� �ს� 'h'.)"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:262
@@ -174,11 +186,13 @@ msgid ""
 "Press, move right, move down, move right, release.\n"
 "Mozilla-style: Press, move down, move right, release."
 msgstr ""
+"დ��ჭირეთ, მ�რჯვნივ, ქვემ�თ, მ�რჯვნივ, გ�უშვით\n"
+"Mozilla-ის სტილი: დ��ჭირეთ, ქვემ�თ, მ�რჯვნივ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:291
 msgid "Close Tab"
-msgstr ""
+msgstr "ჩ�ნ�რთის დ�ხურვ�"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:318
@@ -186,16 +200,18 @@ msgid ""
 "Press, move up, release.\n"
 "Conflicts with Opera-style 'Up #2', which is disabled by default."
 msgstr ""
+"დ��ჭირეთ, ზემ�თ, გ�უშვით.\n"
+"კ�ნფლიქტში� Opera-ის სტილთ�ნ 'მ�ღლ� #2', რ�მელიც ნ�გულისხმევ�დ გ�მ�რთული�."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:320
 msgid "New Tab"
-msgstr ""
+msgstr "�ხ�ლი ჩ�ნ�რთი"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:343
 msgid "Press, move down, release."
-msgstr ""
+msgstr "დ��წექით, დ�ბლ� ჩ�მ�იტ�ნეთ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:345
@@ -205,50 +221,52 @@ msgstr "�ხ�ლი ფ�ნჯ�რ�"
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:368
 msgid "Press, move up, move down, release."
-msgstr ""
+msgstr "დ��წექით, მ�ღლ� �იტ�ნეთ, დ�ბლ� ჩ�მ�იტ�ნეთ, გ�უშვით."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:370 trinity2b1.khotkeys:338
 msgid "Reload"
-msgstr ""
+msgstr "თ�ვიდ�ნ ჩ�ტვირთვ�"
 
 #. Comment
 #: printscreen.khotkeys:5
 msgid "This group contains actions that are set up by default."
-msgstr ""
+msgstr "ეს ჯგუფი შეიც�ვს ქმედებებს, რ�მლებიც ნ�გულისხმევ�დ სრულდებ�."
 
 #. Name
 #: printscreen.khotkeys:8
 msgid "Preset Actions"
-msgstr ""
+msgstr "ქმედების მ�გ�ლითები"
 
 #. Comment
 #: printscreen.khotkeys:17
 msgid "Launches KSnapShot when PrintScrn is pressed."
-msgstr ""
+msgstr "გ�უშვებს KSnapShot-ს, რ�ც� ღილ�კს PrintScrn დ��ჭერთ."
 
 #. Name
 #: printscreen.khotkeys:19
 msgid "PrintScreen"
-msgstr ""
+msgstr "PrintScreen"
 
 #. Comment
 #: printscreen.khotkeys:33 printscreen.khotkeys:57 trinity2b1.khotkeys:46
 #: trinity2b1.khotkeys:71 trinity2b1.khotkeys:95 trinity2b1.khotkeys:163
 #: trinity2b1.khotkeys:203 trinity2b1.khotkeys:385
 msgid "Simple_action"
-msgstr ""
+msgstr "Simple_action"
 
 #. Comment
 #: printscreen.khotkeys:41
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
 msgstr ""
+"გ�უშვებს KSnapShot-ს ფ�ნჯრის გ�დ�ღების რეჟიმში, რ�ც� დ��წვებით ღილ�კებს "
+"Alt+PrintScrn.\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "ფ�ნჯრის სურ�თი"
 
 #. Comment
 #: trinity2b1.khotkeys:5
@@ -256,11 +274,14 @@ msgid ""
 "This group contains various examples demonstrating most of the features of "
 "KHotkeys. (Note that this group and all its actions are disabled by default.)"
 msgstr ""
+"ეს ჯგუფი შეიც�ვს სხვ�დ�სხვ� მ�გ�ლითებს KHotkeys-ის უმეტესი ფუნქციების "
+"ს�დემ�ნსტრ�ცი�დ. (დ�იმ�ხს�ვრეთ, რ�მ ეს ჯგუფი დ� მისი ქმედებები ნ�გულისხმებ�დ "
+"გ�თიშული�.)"
 
 #. Name
 #: trinity2b1.khotkeys:8
 msgid "Examples"
-msgstr ""
+msgstr "მ�გ�ლითები"
 
 #. Comment
 #: trinity2b1.khotkeys:16
@@ -268,21 +289,23 @@ msgid ""
 "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. "
 "Simple."
 msgstr ""
+"Ctrl+Alt+I-ის დ�წ�ლის შემდეგ KSIRC-ის ფ�ნჯ�რ� გ��ქტიურდებ�, თუ �რსებ�ბს. "
+"მ�რტივი�."
 
 #. Name
 #: trinity2b1.khotkeys:18
 msgid "Activate KSIRC Window"
-msgstr ""
+msgstr "KSIRC ფ�ნჯრის გ��ქტიურებ�"
 
 #. Comment
 #: trinity2b1.khotkeys:28
 msgid "KSIRC window"
-msgstr ""
+msgstr "KSIRC -ის ფ�ნჯ�რ�"
 
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -300,21 +323,33 @@ msgid ""
 ": (colon)                                  Shift+;\n"
 "' '  (space)                              Space"
 msgstr ""
+"Alt+Ctrl+H-ის დ�ჭერის შემდეგ მ�ხდებ� 'Hello'-ის შეყვ�ნ�, თითქ�ს ის �კრიფეთ. "
+"გ�ნს�კუთრებით ს�ს�რგებლ��, თუ გეზ�რებ�თ ისეთ სიტყვების კრეფ�, რ�გ�რიც�� "
+"'unsigned'. თით�ეული ღილ�კის დ�ჭერ� გ�მ�იყ�ფ� �რი წერტილით ':' . "
+"დ�იმ�ხს�ვრეთ, რ�მ ღილ�კის დ�ჭერ� �მ�ს პირდ�პირი გ�გებით ნიშნ�ვს, �სე რ�მ, თუ "
+"�კრეფ� გნებ�ვთ, ღილ�კს კლ�ვი�ტურ�ზე მ�რთლ� უნდ� დ��ჭირ�თ. ქვედ� ცხრილში "
+"მ�რცხნივ შეგიძლი�თ, იხილ�თ, რ� შეგყ�ვთ დ� მ�რჯვენ�ში, რ�ს �კრეფთ.\n"
+"\n"
+"\"enter\" (�ნუ �ხ�ლი ხ�ზი)                შესვლ� �ნ ხ�ზის გ�დ�ტ�ნ�\n"
+"a (�ნუ პ�ტ�რ� a)                          A\n"
+"A (�ნუ დიდი a)                       Shift+A\n"
+": (�რიწერტილი)                                  Shift+;\n"
+"' '  (ჰ�რე)                              გ�მ�ტ�ვებ�"
 
 #. Name
 #: trinity2b1.khotkeys:56
 msgid "Type 'Hello'"
-msgstr ""
+msgstr "�კრიფეთ 'Hello'"
 
 #. Comment
 #: trinity2b1.khotkeys:79
 msgid "This action runs Konsole, after pressing Ctrl+Alt+T."
-msgstr ""
+msgstr "ეს ქმედებ� გ�უშვებს კ�ნს�ლს, რ�ც� დ��წვებით Ctrl+Alt+T-ს."
 
 #. Name
 #: trinity2b1.khotkeys:81
 msgid "Run Konsole"
-msgstr ""
+msgstr "Konsole-ის გ�შვებ�"
 
 #. Comment
 #: trinity2b1.khotkeys:103
@@ -337,16 +372,33 @@ msgid ""
 "Qt Designer seems to always have title 'Qt Designer by Trolltech', so the "
 "condition will check for the active window having that title."
 msgstr ""
+"ჯერ წ�იკითხეთ კ�მენტ�რი მ�ქმედებ�ზე \"�კრიფეთ \"გ�მ�რჯ�ბ�\".\n"
+"\n"
+"Qt Designer იყენებს Ctrl+F4 ფ�ნჯრების დ�ხურვისთვის (შეიძლებ� იმიტ�მ, რ�მ MS "
+"Windows �სე �კეთებს *მხრები*). მ�გრ�მ Ctrl+F4 TDE-ში ნიშნ�ვს გ�დ�სვლ�ს "
+"ვირტუ�ლურ დესკტ�პზე 4, �მიტ�მ ის �რ მუშ��ბს Qt Designer-ში დ� �სევე, Qt "
+"Designer �რ იყენებს TDE-ის სტ�ნდ�რტულ Ctrl+W-ს ფ�ნჯრის დ�ხურვისთვის.\n"
+"\n"
+"მ�გრ�მ პრ�ბლემის მ�გვ�რებ� შეს�ძლებელი� Ctrl+W-ზე Ctrl+F4-ზე გ�დ�ტ�ნით, "
+"რ�დეს�ც �ქტიური ფ�ნჯ�რ� �რის Qt Designer. რ�დეს�ც Qt Designer �ქტიური�, "
+"ყ�ველ ჯერზე Ctrl+W დ�ჭერის�ს, Ctrl+F4 გ�დ�ეგზ�ვნებ� Qt Designer-ს. სხვ� "
+"�პლიკ�ციებში, Ctrl+W მუშ��ბს ჩვეულებრივ�დ, რ� თქმ� უნდ�.\n"
+"\n"
+"�ხლ� ჩვენ უნდ� დ�ვ�კ�ნკრეტ�თ ს�მი რ�მ: �ხ�ლი მ�ლს�ხმ�ბის ტრიგერი 'Ctrl+W'-"
+"ზე, კლ�ვი�ტურის შეყვ�ნის �ხ�ლი მ�ქმედებ� Ctrl+F4-ის გ�გზ�ვნით დ� �ხ�ლი "
+"პირ�ბ�, რ�მ �ქტიური ფ�ნჯ�რ� �რის Qt Designer.\n"
+"Qt Designer-ს, რ�გ�რც ჩ�ნს, ყ�ველთვის �ქვს ს�თ�ური „Qt Designer by Trolltech“"
+", �სე რ�მ, პირ�ბ� შე�მ�წმებს �მ ს�თ�ურის მქ�ნე �ქტიურ ფ�ნჯ�რ�ს."
 
 #. Name
 #: trinity2b1.khotkeys:105
 msgid "Remap Ctrl+W to Ctrl+F4 in Qt Designer"
-msgstr ""
+msgstr "Qt Designer-ში Ctrl+W -ის Ctrl+F4 -ზე გ�დ�რთვ�"
 
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr ""
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
@@ -355,11 +407,15 @@ msgid ""
 "minicli. You can use any kind of DCOP call, just like using the command line "
 "'dcop' tool."
 msgstr ""
+"Alt+Ctrl+W-ის დ�ჭერ� მ��ხდენს DCOP-ის ფუნქციის გ�მ�ძ�ხებ�ს, რ�მელიც minicli-"
+"ის �ჩვენებთ. შეგიძლი�თ, გ�მ�იყენ�თ DCOP-ის გ�მ�ძ�ხების ნებისმიერი ფუნქცი�, "
+"რ�გ�რც ეს ბრძ�ნების სტრიქ�ნში, 'dcop' ბრძ�ნებით ხდებ�."
 
 #. Name
 #: trinity2b1.khotkeys:146
 msgid "Perform DCOP call 'kdesktop KDesktopIface popupExecuteCommand()'"
 msgstr ""
+"DCOP-ის ფუნქცი� 'kdesktop KDesktopIface popupExecuteCommand()' გ�მ�ძ�ხებ�"
 
 #. Comment
 #: trinity2b1.khotkeys:171
@@ -376,21 +432,33 @@ msgid ""
 "(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
 "'XMMS_Player')."
 msgstr ""
+"ჯერ წ�იკითხეთ კ�მენტ�რი მ�ქმედებ�ზე \"�კრიფეთ \"გ�მ�რჯ�ბ�\".\n"
+"\n"
+"ისევე, რ�გ�რც \"�კრიფეთ \"Hello\" მ�ქმედებ�, ეს კლ�ვი�ტურ�ზე შეყვ�ნის "
+"სიმულ�ცი�ს �ხდენს, კერძ�დ, Ctrl+Alt+B დ�ჭერის შემდეგ, ის �გზ�ვნის B-ს XMMS-"
+"ში (B in XMMS გ�დ�დის შემდეგ სიმღერ�ზე). „კ�ნკრეტულ ფ�ნჯ�რ�ში გ�გზ�ვნ�“ "
+"მ�ნიშნული� დ� მითითებული� ფ�ნჯ�რ� თ�ვისი კლ�სით, რ�მელიც შეიც�ვს "
+"„XMMS_Player“; ეს გ�ხდის, რ�მ შეყვ�ნ� ყ�ველთვის გ�იგზ�ვნებ� �მ ფ�ნჯ�რ�ში. �მ "
+"გზით, თქვენ შეგიძლი�თ მ�რთ�თ XMMS მ�შინ�ც კი, თუ ეს �რის მ�გ. სხვ� ვირტუ�ლურ "
+"ს�მუშ�� მ�გიდ�ზე.\n"
+"\n"
+"(გ�უშვით 'xprop' დ� დ��წკ�პუნეთ XMMS ფ�ნჯ�რ�ზე დ� მ�ძებნეთ WM_CLASS, რ�მ "
+"ნ�ხ�თ 'XMMS_Player')."
 
 #. Name
 #: trinity2b1.khotkeys:173
 msgid "Next in XMMS"
-msgstr ""
+msgstr "შემდეგი XMMS_ში"
 
 #. Comment
 #: trinity2b1.khotkeys:185
 msgid "XMMS window"
-msgstr ""
+msgstr "XMMS -ის ფ�ნჯ�რ�"
 
 #. Comment
 #: trinity2b1.khotkeys:191
 msgid "XMMS Player window"
-msgstr ""
+msgstr "XMMS -ის დ�მკვრელის ფ�ნჯ�რ�"
 
 #. Comment
 #: trinity2b1.khotkeys:211
@@ -427,11 +495,43 @@ msgid ""
 "are active only if the active window is Konqueror (class contains "
 "'konqueror')."
 msgstr ""
+"კ�რგი, Konqi-ს TDE-ში �ქვს ჩ�ნ�რთები დ� �ხლ� შეგიძლი�თ ჟესტებიც. �რ �რის "
+"ს�ჭირ� სხვ� ბრ�უზერების გ�მ�ყენებ� >;).\n"
+"\n"
+"უბრ�ლ�დ დ��ჭირეთ მ�უსის შუ� ღილ�კს დ� დ�იწყეთ ერთ-ერთი ჟესტის დ�ხ�ტვ�, ხ�ლ� "
+"დ�სრულების შემდეგ გ��თ�ვისუფლეთ მ�უსის ღილ�კი. თუ მხ�ლ�დ �რჩევ�ნის ჩ�სმ� "
+"გჭირდებ�თ, ის მ�ინც მუშ��ბს, უბრ�ლ�დ დ��ჭირეთ მ�უსის შუ� ღილ�კს. (შეგიძლი�თ "
+"შეცვ�ლ�თ მ�უსის ღილ�კი გლ�ბ�ლურ პ�რ�მეტრებში გ�მ�ს�ყენებლ�დ).\n"
+"\n"
+"�მჟ�მ�დ ხელმის�წვდ�მი� ეს ჟესტები:\n"
+"გ�დ��დგილებ� მ�რჯვნივ დ� უკ�ნ მ�რცხნივ - წინ (ALt+მ�რჯვნივ)\n"
+"გ�დ��დგილებ� მ�რცხნივ დ� უკ�ნ მ�რჯვნივ - უკ�ნ (Alt+მ�რცხნივ)\n"
+"გ�დ��დგილებ� ზევით დ� ქვევით - ზემ�თ (Alt+Up)\n"
+"წრე ს��თის ისრის ს�წინ��ღმდეგ� მიმ�რთულებით - გ�დ�ტვირთვ� (F5)\n"
+" (რ�გ�რც კი გ�ვ�რკვევ რ�მელი� �პერ�ში �ნ მ�ზილ�ში, კიდევ დ�ვ�მ�ტებ დ� "
+"დ�ვრწმუნდები, რ�მ იგივე�. �ნ თუ თქვენ თვით�ნ გ��კეთებთ �მ�ს, თ�ვისუფლ�დ "
+"დ�მეხმ�რეთ დ� გ�მ�მიგზ�ვნეთ თქვენი khotkeysrc.)\n"
+"\n"
+"ჟესტების ფ�რმები (ზ�გიერთი დი�ლ�გი �რის KGesture-დ�ნ, მ�იკ პილ�ნის წყ�ლ�ბით) "
+"შეიძლებ� უბრ�ლ�დ შეიყვ�ნ�თ კ�ნფიგურ�ციის დი�ლ�გში მ�თი შესრულებით. თქვენ "
+"�სევე შეგიძლი�თ დ��თვ�ლიერ�თ თქვენი რიცხვითი პ�ნელი, რ�მელიც დ�გეხმ�რებ�თ, "
+"ჟესტები �ღი�რებული� ველების 3x3 ბ�დის მსგ�ვს�დ, დ�ნ�მრილი 1-დ�ნ 9-მდე.\n"
+"\n"
+"გ�ითვ�ლისწინეთ, რ�მ მ�ქმედების გ�ს��ქტიურებლ�დ ზუსტ�დ უნდ� შე�სრულ�თ ჟესტი. "
+"�მის გ�მ�, შეს�ძლებელი� მ�ქმედებისთვის მეტი ჟესტების შეყვ�ნ�. თქვენ უნდ� "
+"შეეც�დ�თ თ�ვიდ�ნ �იცილ�თ რთული ჟესტები, რ�დეს�ც მ�უსის გ�დ��დგილების "
+"მიმ�რთულებ�ს �რ�ერთხელ შეცვლით (�ნუ გ��კეთეთ მ�გ. 45654 �ნ 74123, რ�დგ�ნ "
+"ისინი მ�რტივი შეს�სრულებელი�, მ�გრ�მ მ�გ. 1236987 შეიძლებ� უკვე ს�კმ��დ "
+"რთული იყ�ს).\n"
+"\n"
+"�მ ჯგუფში გ�ნს�ზღვრული� ყველ� ჟესტის პირ�ბ�. ყველ� ეს ჟესტი �ქტიური� მხ�ლ�დ "
+"იმ შემთხვევ�ში, თუ �ქტიური ფ�ნჯ�რ� �რის Konqueror (კლ�სი შეიც�ვს "
+"'konqueror')."
 
 #. Name
 #: trinity2b1.khotkeys:214
 msgid "Konqi Gestures"
-msgstr ""
+msgstr "Konqi -ის ჟესტები"
 
 #. Comment
 #: trinity2b1.khotkeys:369
@@ -440,8 +540,11 @@ msgid ""
 "http://www.trinitydesktop.org . You may run all kind of commands you can run "
 "in minicli (Alt+F2)."
 msgstr ""
+"Win+E (Tux+E) დ�ჭერის შემდეგ �მ�ქმედდებ� WWW ბრ�უზერი დ� გ�იხსნებ� http://"
+"www.trinitydesktop.org . თქვენ შეგიძლი�თ გ�უშვ�თ ყველ� ს�ხის ბრძ�ნებ�, "
+"რ�მლის გ�შვებ�ც შეგიძლი�თ minicli-ში (Alt+F2)."
 
 #. Name
 #: trinity2b1.khotkeys:371
 msgid "Go to TDE Website"
-msgstr ""
+msgstr "TDE-ის ვებგვერდზე გ�დ�სვლ�"
diff --git a/translations/desktop_files/khotkeys-data/nl.po b/translations/desktop_files/khotkeys-data/nl.po
index b4dc4f0d2..0b2d3a5b8 100644
--- a/translations/desktop_files/khotkeys-data/nl.po
+++ b/translations/desktop_files/khotkeys-data/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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-01-12 12:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/khotkeys-data/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,9 +36,8 @@ msgstr "Konqueror-venster"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Konqueror-venster"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
@@ -56,7 +56,7 @@ msgid ""
 "NOTE: Conflicts with 'New Tab', and as such is disabled by default."
 msgstr ""
 "Opera-stijl: indrukken, omhoog bewegen, loslaten.\n"
-"Opmerking: Botst met 'Nieuw tabblad', en is standaard uitgeschakeld."
+"Let op: botst met ‘Nieuw tabblad’ en is standaard uitgeschakeld."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:43
@@ -88,8 +88,8 @@ msgid ""
 "Going up in URL/directory structure.\n"
 "Mozilla-style: Press, move up, move left, move up, release."
 msgstr ""
-"Omhoog gaan in de URL- of mappenstructuur.\n"
-"Mozilla-stijl: Indrukken, omhoog bewegen, naar links bewegen, omhoog "
+"Ga omhoog in de url- of mappenstructuur.\n"
+"Mozilla-stijl: indrukken, omhoog bewegen, naar links bewegen, omhoog "
 "bewegen, loslaten."
 
 #. Name
@@ -105,11 +105,10 @@ msgid ""
 "NOTE: Conflicts with  \"Activate Previous Tab\", and as such is disabled by "
 "default."
 msgstr ""
-"Omhoog gaan in de URL- of mappenstructuur.\n"
-"Opera-stijl: Indrukken, omhoog bewegen, naar links bewegen, omhoog bewegen,"
+"Ga omhoog gaan in de url- of mappenstructuur.\n"
+"Opera-stijl: indrukken, omhoog bewegen, naar links bewegen, omhoog bewegen, "
 "loslaten.\n"
-"Opmerking: Botst met \"Vorige tabblad activeren\", en is daarom standaard "
-"uitgeschakeld."
+"Let op: botst met ‘Vorig tabblad activeren’ en is standaard uitgeschakeld."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:93
@@ -146,7 +145,7 @@ msgstr ""
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:187
 msgid "Duplicate Tab"
-msgstr "Tabblad dupliceren"
+msgstr "Tabblad klonen"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:210
@@ -156,7 +155,7 @@ msgstr "Indrukken, naar beneden bewegen, naar boven bewegen, loslaten."
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:212
 msgid "Duplicate Window"
-msgstr "Venster dupliceren"
+msgstr "Venster klonen"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:235
@@ -176,12 +175,12 @@ msgid ""
 msgstr ""
 "Indrukken, naar beneden bewegen, half naar boven bewegen, naar rechts "
 "bewegen, naar beneden bewegen, loslaten.\n"
-"(het tekenen van een kleine 'h'.)"
+"(oftewel: het tekenen van een kleine letter ‘h’.)"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:262
 msgid "Home"
-msgstr ""
+msgstr "Startpagina"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:289
@@ -191,7 +190,7 @@ msgid ""
 msgstr ""
 "Indrukken, naar rechts bewegen, naar beneden bewegen, naar rechts bewegen, "
 "loslaten.\n"
-"Als in Mozilla: Indrukken, naar beneden bewegen, naar rechts bewegen, "
+"Mozilla-stijl: indrukken, naar beneden bewegen, naar rechts bewegen, "
 "loslaten."
 
 #. Name
@@ -206,8 +205,8 @@ msgid ""
 "Conflicts with Opera-style 'Up #2', which is disabled by default."
 msgstr ""
 "Indrukken, naar boven bewegen, loslaten.\n"
-"Botst met de tweede handeling omhoog gaan in Opera, staat daarom standaard "
-"uit."
+"Let op: botst met de tweede handeling omhoog gaan in Opera en is standaard "
+"uitgeschakeld."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:320
@@ -242,36 +241,36 @@ msgstr "Deze groep bevat handelingen die standaard zijn ingesteld."
 #. Name
 #: printscreen.khotkeys:8
 msgid "Preset Actions"
-msgstr "Voorgedefinieerde acties"
+msgstr "Voorgeprogrammeerde acties"
 
 #. Comment
 #: printscreen.khotkeys:17
 msgid "Launches KSnapShot when PrintScrn is pressed."
-msgstr "KSnapShot starten wanneer PrintScreen wordt ingedrukt."
+msgstr "Start KSnapShot als PrintScreen wordt ingedrukt."
 
 #. Name
 #: printscreen.khotkeys:19
 msgid "PrintScreen"
-msgstr ""
+msgstr "PrintScreen"
 
 #. Comment
 #: printscreen.khotkeys:33 printscreen.khotkeys:57 trinity2b1.khotkeys:46
 #: trinity2b1.khotkeys:71 trinity2b1.khotkeys:95 trinity2b1.khotkeys:163
 #: trinity2b1.khotkeys:203 trinity2b1.khotkeys:385
 msgid "Simple_action"
-msgstr "Eenvoudige_handeling"
+msgstr "Eenvoudige handeling"
 
 #. Comment
 #: printscreen.khotkeys:41
-#, fuzzy
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr "KSnapShot starten wanneer PrintScreen wordt ingedrukt."
+msgstr ""
+"Start KSnapShot in vensteropnamemodus als Alt+PrintScreen wordt ingedrukt.\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "PrintWindow"
 
 #. Comment
 #: trinity2b1.khotkeys:5
@@ -279,9 +278,9 @@ msgid ""
 "This group contains various examples demonstrating most of the features of "
 "KHotkeys. (Note that this group and all its actions are disabled by default.)"
 msgstr ""
-"Deze groep bevat verschillende voorbeelden die de mogelijkheden van KHotkeys "
-"tonen. (Opmerking: deze groep en alle bijbehorende handelingen zijn "
-"standaard uitgeschakeld.)"
+"Deze groep bevat diverse voorbeelden die de mogelijkheden van KHotkeys laten "
+"zien. (Let op: deze groep en alle bijbehorende acties zijn standaard "
+"uitgeschakeld.)"
 
 #. Name
 #: trinity2b1.khotkeys:8
@@ -294,8 +293,8 @@ msgid ""
 "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. "
 "Simple."
 msgstr ""
-"Wanneer u op Ctrl+Alt+I drukt zal het KSIRC-venster geactiveerd worden, "
-"indien aanwezig."
+"Als u op Ctrl+Alt+I drukt, zal het KSIRC-venster geactiveerd worden (indien "
+"aanwezig)."
 
 #. Name
 #: trinity2b1.khotkeys:18
@@ -310,7 +309,7 @@ msgstr "KSIRC-venster"
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -328,34 +327,33 @@ msgid ""
 ": (colon)                                  Shift+;\n"
 "' '  (space)                              Space"
 msgstr ""
-"Wanneer u op Ctrl+Alt+H drukt zal de invoer \"Hallo\" gesimuleerd worden "
-"alsof u het getypt hebt. Handig wanneer u te lui bent om dingen als "
-"'unsigned' te typen. Iedere toetsaanslag bij de invoer dient gescheiden te "
-"worden met een dubbele punt ';'. Merk op dat een toetsaanslag letterlijk "
-"genomen dient te worden, dus iedere toets die u indrukt dient opgeschreven "
-"te worden. In de onderstaande tabel bevat de linkerkolom de invoer en rechts "
-"wat u dient in te typen.\n"
+"Als u op Ctrl+Alt+H drukt, zal de invoer ‘Hallo’ verschijnen alsof u deze "
+"getypt hebt. Handig als u te lui bent om dingen als ‘unsigned’ te typen. "
+"Iedere toetsaanslag bij de invoer dient gescheiden te worden met een dubbele "
+"punt ‘:’. Let op: een toetsaanslag dient letterlijk genomen te worden, dus "
+"iedere toets die u indrukt dient opgeschreven te worden. In de onderstaande "
+"tabel bevat de linkerkolom de invoer en rechts wat u dient in te typen.\n"
 "\n"
-"\" Enter\" (nieuwe regel)         Enter of Return\n"
+"Enter (nieuwe regel)         Enter of Return\n"
 "a (kleine a)                             A\n"
 "A (hoofdletter a)                   Shift+A\n"
 ": (dubbele punt)                    Shift+;\n"
-"' ' (spatie)                               Space"
+"' ' (spatie)                               Spatiebalk"
 
 #. Name
 #: trinity2b1.khotkeys:56
 msgid "Type 'Hello'"
-msgstr "'Hallo' typen"
+msgstr "‘Hallo’ typen"
 
 #. Comment
 #: trinity2b1.khotkeys:79
 msgid "This action runs Konsole, after pressing Ctrl+Alt+T."
-msgstr "Deze handeling voert Konsole uit, nadat op Ctrl+Alt+T is gedrukt."
+msgstr "Deze actie opent Konsole nadat op Ctrl+Alt+T is gedrukt."
 
 #. Name
 #: trinity2b1.khotkeys:81
 msgid "Run Konsole"
-msgstr "Konsole uitvoeren"
+msgstr "Konsole openen"
 
 #. Comment
 #: trinity2b1.khotkeys:103
@@ -378,22 +376,23 @@ msgid ""
 "Qt Designer seems to always have title 'Qt Designer by Trolltech', so the "
 "condition will check for the active window having that title."
 msgstr ""
-"Lees de opmerking over de actie \"Hallo typen\" eerst.\n"
+"Lees eerst de opmerking omtrent de actie ‘Hallo typen’.\n"
+"\n"
+"Qt Designer maakt gebruik van Ctrl+F4 om vensters te sluiten (misschien "
+"omdat Microsoft Windows dat ook doet). Maar in TDE betekent Ctrl+4 het gaan "
+"naar het virtuele werkblad 4. Daardoor werkt de sneltoets niet in Qt "
+"Designer en wordt Ctrl+W, de standaard sluittoets binnen TDE, niet gebruikt."
 "\n"
-"Qt Designer gebruikt Ctrl+F4 om vensters te sluiten (misschien omdat "
-"Microsoft Windows dat ook doet). Maar in TDE betekent Ctrl+4 het gaan naar "
-"het virtuele bureaublad 4. Daardoor werkt de sneltoets niet in Qt Designer "
-"en wordt Ctrl+W, de standaard sluittoets binnen TDE, niet gebruikt.\n"
 "\n"
 "U kunt dit probleem oplossen door Ctrl+W naar Ctrl+F4 te laten verwijzen "
-"wanneer het actieve venster Qt Designer is. Wanneer Qt Designer actief is, "
-"zal iedere keer dat Ctrl+W wordt ingedrukt het signaal Ctrl+F4 naar Qt "
-"Designer gestuurd worden. Ctrl+W blijft in andere programma's gewoon "
-"dezelfde betekenis houden.\n"
+"indien het actieve venster Qt Designer is. Als Qt Designer actief is, zal "
+"iedere keer dat Ctrl+W wordt ingedrukt het signaal Ctrl+F4 naar Qt Designer "
+"worden gestuurd. Ctrl+W blijft in andere programma's gewoon dezelfde "
+"betekenis houden.\n"
 "\n"
 "Er dienen drie gegevens ingevuld te worden: de sneltoets zelf, de verzonden "
 "sneltoets en de voorwaarde dat het actieve venster Qt Designer moet zijn.\n"
-"Qt Designer heeft altijd de titel 'Qt Designer by Trolltech', dus de "
+"Qt Designer heeft altijd de titel ‘Qt Designer by Trolltech’, dus de "
 "voorwaarde zal eerst controleren of het venster die titel heeft."
 
 #. Name
@@ -404,7 +403,7 @@ msgstr "Ctrl+W omzetten naar Ctrl+F4 in Qt Designer"
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr ""
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
@@ -414,13 +413,13 @@ msgid ""
 "'dcop' tool."
 msgstr ""
 "Door Alt+Ctrl+W in te drukken zal er een DCOP-aanroep uitgevoerd worden dat "
-"venster \"Commando uitvoeren\" laat zien. U kunt iedere andere DCOP-aanroep "
-"gebruiken, net zoals met de commandoregelvariant 'dcop'."
+"het venster ‘Opdracht uitvoeren’ opent. U kunt iedere andere DCOP-aanroep "
+"gebruiken, net zoals met de opdrachtregelvariant ‘dcop’."
 
 #. Name
 #: trinity2b1.khotkeys:146
 msgid "Perform DCOP call 'kdesktop KDesktopIface popupExecuteCommand()'"
-msgstr "DCOP-aanroep uitvoeren: 'kdesktop KDesktopIface popupExecuteCommand()'"
+msgstr "DCOP-aanroep uitvoeren: ‘kdesktop KDesktopIface popupExecuteCommand()’"
 
 #. Comment
 #: trinity2b1.khotkeys:171
@@ -437,18 +436,18 @@ msgid ""
 "(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
 "'XMMS_Player')."
 msgstr ""
-"Lees eerst de toelichting bij handeling \"Hallo typen\".\n"
+"Lees eerst de toelichting bij de actie ‘Hallo typen’.\n"
 "\n"
-"Net als \"Type hallo\" simuleert deze een toetsenbordinvoer. In dit geval "
-"wordt na het indrukken van de toetsencombinatie Ctrl+Alt+B,  de 'B' gestuurt "
-"naar XMMS (B in XMMS gaat naar de volgende track). Als het keuzevakje 'Naar "
-"specifiek venster sturen' is geselecteerd en een venster met de klasse "
-"'XMMS_Player' isopgegeven zal deze toetsenbordinvoer altijd naar het XMMS-"
-"venster worden gestuurd. Op die manier kunt u XMMS ook bedienen terwijl u "
-"bijv. op een ander virtueel bureaublad aan het werk bent. \n"
+"Net als de actie ‘Hallo typen’, simuleert deze een toetsenbordinvoer. In dit "
+"geval wordt na het indrukken van de toetsencombinatie Ctrl+Alt+B, de ‘B’ "
+"gestuurt naar XMMS (B in XMMS gaat naar het volgende spoor). Als het "
+"keuzevakje ‘Naar specifiek venster sturen’ is aangekruist en een venster met "
+"de klasse ‘XMMS_Player’ is opgegeven, zal deze toetsenbordinvoer altijd naar "
+"het XMMS-venster worden gestuurd. Op die manier kunt u XMMS ook bedienen "
+"terwijl u bijv. op een ander virtueel werkblad aan het werk bent.\n"
 "\n"
-" (Voer 'xprop' uit en klik op het XMMS-venster en zoek naar WM-CLASS om "
-"'XMMS_Player' te zien)."
+"(Voer ‘xprop’ uit en klik op het XMMS-venster, en zoek naar WM-CLASS om "
+"‘XMMS_Player’ te zien.)"
 
 #. Name
 #: trinity2b1.khotkeys:173
@@ -463,7 +462,7 @@ msgstr "XMMS-venster"
 #. Comment
 #: trinity2b1.khotkeys:191
 msgid "XMMS Player window"
-msgstr "Afspeelvenster XMMS"
+msgstr "XMMS-afspeelvenster"
 
 #. Comment
 #: trinity2b1.khotkeys:211
@@ -500,39 +499,40 @@ msgid ""
 "are active only if the active window is Konqueror (class contains "
 "'konqueror')."
 msgstr ""
-"Ok, Konqi in TDE heeft tabbladen en nu kunt u ook gebaren gebruiken. "
-"Geenreden meer om andere browsers te gebruiken >;).\n"
+"Oké, Konqi in TDE heeft tabbladen en u kunt voortaan tevens gebruikmaken van "
+"gebaren. Geen reden meer om andere browsers te gebruiken >;).\n"
 "\n"
-"Houdt eenvoudigweg de middelste muisknop ingedrukten begin met het tekenen "
-"van één van de gebaren. Laat als u klaar bent de middelste muisknop weer los."
-"Als u alleen een selectie wilt plakken dan werkt dit ook. Klik gewoon met de "
-"middelste muisknop. (U kunt de te gebruiken muisknop wijzigen in de globale "
-"instellingen).\n"
+"Houdt eenvoudigweg de middelste muisknop ingedrukt en begin met het tekenen "
+"van een van de gebaren. Laat, als u klaar bent, de middelste muisknop weer "
+"los. Als u alleen een selectie wilt plakken, kan kunt u met de middelste "
+"muisknop klikken zonder deze ingedrukt te houden. (U kunt de te gebruiken "
+"muisknop wijzigen in de globale instellingen.)\n"
 "\n"
 "Momenteel zijn er enkele gebaren bechikbaar:\n"
-"Beweeg naar rechts en dan terug naar links - Vooruit (Alt + Pijl rechts)\n"
-"Beweeg naar links en dan terug naar rechts - Terug (Alt + Pijl links)\n"
-"Beweeg omhoog en dan terug naar beneden - Boven (Alt + Pijl omhoog)\n"
-"Draai de muis rechtsom in een cirkel - Herladen (F5)\n"
-"(Zodra ik uitgevonden welke in Opera of Mozila worden gebruikt zal ik er "
-"meer toevoegen en er voor zorgendat ze hetzelfde werken. Of als u ze zelf "
+"* Beweeg naar rechts en dan terug naar links: Vooruit (Alt + Pijl rechts);\n"
+"* Beweeg naar links en dan terug naar rechts: Terug (Alt + Pijl links);\n"
+"* Beweeg omhoog en dan terug naar beneden: Ga omhoog (Alt + Pijl omhoog);\n"
+"* Draai de muis rechtsom in een cirkel: Herladen (F5).\n"
+"(Zodra ik uitgevonden welke in Opera of Mozilla worden gebruikt, zal ik er "
+"meer toevoegen en ervoor zorgen dat ze hetzelfde werken. Of als u ze zelf "
 "toevoegt, wees zo vrij om me te helpen en stuur me uw khotkeysrc-bestand.)\n"
 "\n"
-"De gebaarvormen (enkele dialogen komen van KGesture, met dank aan Mike "
-"Pilone) kunnen worden ingevoerd door ze te tekenen in de "
-"configuratiedialoog. U kunt ook naar uw numerieke klavier kijken om u te "
-"helpen. GEbaren worden herkend als een raster van 3 bij 3 velden, genummerd "
-"van 1 tot 9.\n"
+"De gebaren (enkele dialoogvensters komen van KGesture, met dank aan Mike "
+"Pilone) kunnen worden ingevoerd door ze te tekenen op het "
+"instellingenscherm. U kunt ook naar uw numerieke toetsenbord (klavier) "
+"kijken om u te helpen. Gebaren worden herkend als een rooster van 3 bij 3 "
+"velden, genummerd van 1 tot 9.\n"
 "\n"
-"Opmerking: u moet de gebaar exact uitvoeren om de gewenstehandeling te "
+"Let op: u dient gebaren precies zo uit te voeren om de gewenste handeling te "
 "activeren. Daarom is het mogelijk om meerdere gebaren aan een handeling toe "
 "te wijzen. Probeer complexe bewegingen, waarbij de richting van de muis "
-"meerdere malen wordt veranderd, te vermijden. Bijv. de beweging 45654 of "
-"74123 is eenvoudig uit te voeren terwijl 1236987 al vrij moeilijk kan zijn.\n"
+"meerdere malen wordt veranderd, te vermijden. Voorbeeld: de beweging 45654 "
+"of 74123 is eenvoudig uit te voeren, terwijl 1236987 al vrij moeilijk kan "
+"zijn.\n"
 "\n"
-"De condities voor alle gebaren zijn gedefinieerd in deze groep. Alle gebaren "
-"worden alleen geactiveerd als een venster van Konqueror de focus heeft "
-"(vensterklasse bevat 'konqueror')."
+"De voorwaarden van alle gebaren zijn opgegeven in deze groep. Alle gebaren "
+"worden alleen geactiveerd als een venster van Konqueror de focus heeft ("
+"vensterklasse bevat ‘konqueror’)."
 
 #. Name
 #: trinity2b1.khotkeys:214
@@ -546,11 +546,11 @@ msgid ""
 "http://www.trinitydesktop.org . You may run all kind of commands you can run "
 "in minicli (Alt+F2)."
 msgstr ""
-"Wanneer u Win+E (Tux+E) indrukt, zal de webbrowser gestart worden met de "
-"pagina http://www.trinitydesktop.org. U kunt alle commando's uitvoeren die u "
-"ook in het venster \"Commando uitvoeren\" (Alt+F2) kunt aanroepen."
+"Als u Win+E (Tux+E) indrukt, zal de webbrowser geopend worden met de pagina "
+"https://www.trinitydesktop.org. U kunt alle opdrachten uitvoeren die u ook "
+"in het venster ‘Opdracht uitvoeren’ (Alt+F2) kunt aanroepen."
 
 #. Name
 #: trinity2b1.khotkeys:371
 msgid "Go to TDE Website"
-msgstr "Naar TDE-website gaan"
+msgstr "TDE-website openen"
diff --git a/translations/desktop_files/khotkeys-data/ru.po b/translations/desktop_files/khotkeys-data/ru.po
index 916db27c0..e665c4d5f 100644
--- a/translations/desktop_files/khotkeys-data/ru.po
+++ b/translations/desktop_files/khotkeys-data/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-data/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,9 +37,8 @@ msgstr "Окно Konqueror"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Окно Konqueror"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
@@ -80,7 +81,7 @@ msgstr "О�тановить загрузку"
 #: konqueror_gestures_trinity21.khotkeys:385 trinity2b1.khotkeys:257
 #: trinity2b1.khotkeys:289 trinity2b1.khotkeys:321 trinity2b1.khotkeys:353
 msgid "Gesture_triggers"
-msgstr ""
+msgstr "Триггеры_же�тов"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:66
@@ -89,7 +90,7 @@ msgid ""
 "Mozilla-style: Press, move up, move left, move up, release."
 msgstr ""
 "Перейти на два уровн� выше.\n"
-"Ро�черк Mozilla: нажать, вверх, влево, вверх, отпу�тить"
+"Ро�черк Mozilla: нажать, вверх, влево, вверх, отпу�тить."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
@@ -256,15 +257,16 @@ msgstr "Про�тое дей�твие"
 
 #. Comment
 #: printscreen.khotkeys:41
-#, fuzzy
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr "Запу�к KSnapShot при нажатии кнопки PrintScreen."
+msgstr ""
+"Запу�к KSnapShot в режиме захвата активного окна при нажатии Alt+PrintScreen."
+"\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "Снимок окна"
 
 #. Comment
 #: trinity2b1.khotkeys:5
@@ -300,7 +302,7 @@ msgstr "Окно KSIRC"
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -318,8 +320,20 @@ msgid ""
 ": (colon)                                  Shift+;\n"
 "' '  (space)                              Space"
 msgstr ""
-"При нажатии Alt+Ctrl+H будет �мулирован ввод �лова \"Hello\" как будто бы вы "
-"набивали его вручную � клавиатуры."
+"При нажатии Alt+Ctrl+H будет �мулирован ввод �лова \"Hello\", как будто бы "
+"вы набрали его вручную � клавиатуры. О�обенно полезно, е�ли вам лень вводить "
+"такие вещи, как например «unsigned». Каждое нажатие клавиши при вводе "
+"отдел�ет�� двоеточием ':'. Обратите внимание, что нажати� клавиш на �амом "
+"деле означают нажати� клавиш, по�тому зде�ь вам нужно указывать то, что вы "
+"на �амом деле нажимаете на клавиатуре. В таблице ниже в левом �толбце "
+"показан желаемый ввод, а в правом �толбце показано, что должно быть указано "
+"в на�тройках.\n"
+"\n"
+"\"enter\" (т.е. перевод �троки)        Enter или Return\n"
+"a (т.е. �трочна� a)                  A\n"
+"A (т.е. заглавна� a)                 Shift+A\n"
+": (двоеточие)                        Shift+;\n"
+"' ' (пробел)                         Space"
 
 #. Name
 #: trinity2b1.khotkeys:56
@@ -357,9 +371,25 @@ msgid ""
 "Qt Designer seems to always have title 'Qt Designer by Trolltech', so the "
 "condition will check for the active window having that title."
 msgstr ""
-"По Ctrl+W будет �мулировано нажатие Ctrl+F4 дл� закрыти� окна Qt Designer.\n"
-"Пои�к окна Qt Designer о�уще�твл�ет�� по заголовку \"Qt Designer by Trolltech"
-"\"."
+"Сначала прочтите комментарий к дей�твию «ввод \"Hello\"».\n"
+"\n"
+"Qt Designer и�пользует Ctrl+F4 дл� закрыти� окон (возможно, потому, что MS "
+"Windows делает �то именно так *ну что � ними подделаешь*). �о �очетание "
+"клавиш Ctrl+F4 в TDE и�пользует�� дл� перехода на 4-й виртуальный рабочий "
+"�тол, по�тому оно не работает в Qt Designer, а также Qt Designer не "
+"и�пользует �тандартное �очетание клавиш TDE дл� закрыти� окон — Ctrl+W.\n"
+"\n"
+"�о проблему можно решить, переназначив Ctrl+W на Ctrl+F4, когда активным "
+"окном �вл�ет�� Qt Designer. Когда Qt Designer активен, каждый раз при "
+"нажатии Ctrl+W вме�то �того в Qt Designer будет отправл�ть�� Ctrl+F4, а в "
+"других приложени�х Ctrl+W, конечно, продолжит работать как обычно.\n"
+"\n"
+"Теперь нам нужно указать три вещи: новый триггер бы�трого вызова «Ctrl+W», "
+"новое дей�твие ввода � клавиатуры, отправл�ющее Ctrl+F4, и новое у�ловие, "
+"�огла�но которому активным окном �вл�ет�� Qt Designer.\n"
+"Кажет��, заголовком Qt Designer в�егда �вл�ет�� «Qt Designer by Trolltech», "
+"по�тому в у�ловие можно про�то провер�ть, что активное окно имеет данный "
+"заголовок."
 
 #. Name
 #: trinity2b1.khotkeys:105
@@ -369,7 +399,7 @@ msgstr "Замена Ctrl+W на Ctrl+F4 дл� Qt Designer"
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr ""
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
@@ -402,11 +432,18 @@ msgid ""
 "(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
 "'XMMS_Player')."
 msgstr ""
-"При нажатии Ctrl+Alt+B �мулирует�� нажатие клавиши \"B\" дл� окна XMMS "
-"(перейти на �ледующую композицию). Окно XMMS ищет�� по кла��у окна "
-"\"XMMS_Player\".\n"
-"Кла�� окна вы можете определить, запу�тив программу \"xprop\" и нажав "
-"кур�ором мыши на окне."
+"Сначала прочтите комментарий к дей�твию «ввод \"Hello\"».\n"
+"\n"
+"Как и дей�твие «ввод \"Hello\"», оно имитирует ввод � клавиатуры, а именно: "
+"по�ле нажати� Ctrl+Alt+B оно отправл�ет B в XMMS (B в XMMS переходит на "
+"�ледующую пе�ню). Параметр «Пере�ылать ввод в» у�тановлен в значение «"
+"Указанное окно», а также указан кла�� окна: «XMMS_Player»; �то приведёт к "
+"тому, что ввод в�егда будет отправл�ть�� в �то окно. Таким образом, вы "
+"можете управл�ть XMMS, даже е�ли он находит��, например, на другом "
+"виртуальном рабочем �толе.\n"
+"\n"
+"(Запу�тите \"xprop\", щёлкните по окну XMMS и найдите WM_CLASS, чтобы "
+"увидеть «XMMS_Player»)."
 
 #. Name
 #: trinity2b1.khotkeys:173
@@ -458,17 +495,39 @@ msgid ""
 "are active only if the active window is Konqueror (class contains "
 "'konqueror')."
 msgstr ""
-"С вер�ии 3.1 Konqueror поддерживает работу � вкладками.\n"
-"�ажмите �реднюю кнопку мыши, �делайте необходимый ро�черк и отпу�тите "
-"кнопку. В�тавка тек�та по �редней кнопки мыши по прежнему работает (е�ли вы "
-"не двигаете мышь).\n"
-"До�тупны �ледующие ро�черки:\n"
-"вправо и влево - Вперёд (Alt+Стрелка вправо)\n"
-"влево и вправо - �азад (Alt+Стрелка влево)\n"
-"вверх и вниз - Вверх (Alt+Стрелка вверх)\n"
-"окружно�ть против ча�овой �трелки - Обновить (F5)\n"
-"Вы можете легко указать ро�черки, выбрав направлени� движени� мыши. В�е �ти "
-"ро�черки работают только в окне Konqueror (кла�� окна \"konqueror\")."
+"Ок, в Konqi в TDE теперь е�ть вкладки, и теперь вы также можете и�пользовать "
+"же�ты. Другие браузеры больше не нужны >;).\n"
+"\n"
+"Про�то нажмите �реднюю кнопку мыши и начните ри�овать один из же�тов, а "
+"по�ле того, как закончите, отпу�тите кнопку мыши. Е�ли вы хотите про�то "
+"в�тавить тек�т из буфера выделени� то, �то тоже работает: про�то нажмите "
+"�реднюю кнопку мыши. (Вы можете изменить и�пользуемую кнопку мыши в "
+"глобальных на�тройках).\n"
+"\n"
+"�а данный момент до�тупны �ледующие же�ты:\n"
+"- движение вправо и назад влево — Вперёд (ALt+Right)\n"
+"- движение влево и назад вправо — �азад (Alt+Влево)\n"
+"- движение вверх и назад вниз — Вверх (Alt+Up)\n"
+"- круг против ча�овой �трелки — Перезагрузить (F5)\n"
+"  (Как только � узнаю, какие из них е�ть в Opera или Mozilla, � добавлю еще "
+"и позабочу�ь, чтобы они были такими же. Или, е�ли вы �делаете �то �ами, не "
+"�те�н�йте�ь помочь мне и пришлите мне �вой hotkeysrc.)\n"
+"\n"
+"Формы же�тов (некоторые диалоговые окна вз�ты из KGesture, �па�ибо Майку "
+"Пилону) можно вводить про�то нари�овав их в окне на�троек. Вы также можете "
+"пред�тавить �ебе цифровой блок клавиатуры: же�ты ра�познают�� как �етка "
+"полей 3x3 � номерами от 1 до 9.\n"
+"\n"
+"Обратите внимание, что вы должны в точно�ти выполнить же�т, чтобы вызвать "
+"нужное дей�твие. Из-за �того дл� одного дей�тви� допу�кае�ть вводить больше "
+"одного же�та. Вам �ледует также �тарать�� избегать �ложных же�тов (при "
+"которых приходит�� мен�ть направление движени� мыши более одного раза, "
+"например, 45654 или 74123 про�ты в и�полнении, но, например, 1236987 может "
+"быть уже довольно �ложным).\n"
+"\n"
+"В �той группе определ�ют�� у�лови� дл� в�ех же�тов. В�е �ти же�ты активны, "
+"только е�ли активным окном �вл�ет�� Konqueror (кла�� окна �одержит "
+"«konqueror»)."
 
 #. Name
 #: trinity2b1.khotkeys:214
diff --git a/translations/desktop_files/khotkeys.desktop/af.po b/translations/desktop_files/khotkeys.desktop/af.po
index be2870a5c..682055a45 100644
--- a/translations/desktop_files/khotkeys.desktop/af.po
+++ b/translations/desktop_files/khotkeys.desktop/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Inset Aksies"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Stel kortpad sleutels op"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Globale sleutel bindings;sleutel scheme;sleutel bindings;kortpaaie;"
diff --git a/translations/desktop_files/khotkeys.desktop/ar.po b/translations/desktop_files/khotkeys.desktop/ar.po
index 2d07f41d3..ccfb06dcb 100644
--- a/translations/desktop_files/khotkeys.desktop/ar.po
+++ b/translations/desktop_files/khotkeys.desktop/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "نشاطات الإدخال"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr ""
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "م�ايتح، م�اتيح الاختصارات العامّة، خريطة الم�اتيح، م�اتيح الاختصارات،  "
diff --git a/translations/desktop_files/khotkeys.desktop/be.po b/translations/desktop_files/khotkeys.desktop/be.po
index 4b973b830..56237a3aa 100644
--- a/translations/desktop_files/khotkeys.desktop/be.po
+++ b/translations/desktop_files/khotkeys.desktop/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Дзе�нні"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "�а�таўленні клавішных �каротаў"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Клавішы;Глабальны� �кароты;Скароты;Рухі;Рухі мышы;Keys;Global key bindings;"
diff --git a/translations/desktop_files/khotkeys.desktop/bg.po b/translations/desktop_files/khotkeys.desktop/bg.po
index dd618ff6d..b6a74b04d 100644
--- a/translations/desktop_files/khotkeys.desktop/bg.po
+++ b/translations/desktop_files/khotkeys.desktop/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Дей�тви�"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "�а�тройване на же�тове � мишката"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "бърз; клавиш; бързи; до�тъп; клавишна; комбинаци�; же�тове; мишка; же�т; "
diff --git a/translations/desktop_files/khotkeys.desktop/bn.po b/translations/desktop_files/khotkeys.desktop/bn.po
index a0c5cd849..11c2e5a96 100644
--- a/translations/desktop_files/khotkeys.desktop/bn.po
+++ b/translations/desktop_files/khotkeys.desktop/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr ""
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "হট-কী সেটিংস কনফিগার কর�ন"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/br.po b/translations/desktop_files/khotkeys.desktop/br.po
index d93de6717..5ef953964 100644
--- a/translations/desktop_files/khotkeys.desktop/br.po
+++ b/translations/desktop_files/khotkeys.desktop/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Oberoù enkas"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Kefluniañ dibarzhoù Hotkey"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/bs.po b/translations/desktop_files/khotkeys.desktop/bs.po
index ab9d28045..77afd643d 100644
--- a/translations/desktop_files/khotkeys.desktop/bs.po
+++ b/translations/desktop_files/khotkeys.desktop/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Akcije unosa"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Podesite opcije kratica tastature"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;tipke;kratice "
diff --git a/translations/desktop_files/khotkeys.desktop/ca.po b/translations/desktop_files/khotkeys.desktop/ca.po
index f4e6f3b48..2114d4fe7 100644
--- a/translations/desktop_files/khotkeys.desktop/ca.po
+++ b/translations/desktop_files/khotkeys.desktop/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Accions d'entrada"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configura l'arranjament de les tecles ràpides"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Tecles;lligams de tecles globals;Lligams de tecles;gestos;gestos de ratolí;"
diff --git a/translations/desktop_files/khotkeys.desktop/cs.po b/translations/desktop_files/khotkeys.desktop/cs.po
index c9593b247..f10bbd2f4 100644
--- a/translations/desktop_files/khotkeys.desktop/cs.po
+++ b/translations/desktop_files/khotkeys.desktop/cs.po
@@ -1,34 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+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"
+"POT-Creation-Date: 2024-09-22 18:11+0000\n"
+"PO-Revision-Date: 2024-09-21 08:41+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/khotkeys-khotkeysdesktop/cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr "Démon KHotKeys"
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr "Zpracovává vstupní �innosti pro sou�asné sezení"
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Vstupní �innosti"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
-msgstr "Nastavení horkých kláves"
+msgstr "Nastavení klávesových zkratek"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
-msgstr ""
-"Klávesy;Globální klávesové zkratky;Schéma kláves;Klávesové zkratky;Zkratky;"
-"Gesta;"
+msgstr "Klávesy;Globální klávesové zkratky;Klávesové zkratky;Gesta;Gesta myší;"
diff --git a/translations/desktop_files/khotkeys.desktop/csb.po b/translations/desktop_files/khotkeys.desktop/csb.po
index 000c0f5cb..2eb8eb73d 100644
--- a/translations/desktop_files/khotkeys.desktop/csb.po
+++ b/translations/desktop_files/khotkeys.desktop/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Klawiszowé dzéjania"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Kònfigùracëjô klawiszowëch skrodzënów"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "klawisze;globalné klawiszowé skrodzënë;schemë skrodzënów;gestë;mësz;"
diff --git a/translations/desktop_files/khotkeys.desktop/cy.po b/translations/desktop_files/khotkeys.desktop/cy.po
index 252bc5896..f39193943 100644
--- a/translations/desktop_files/khotkeys.desktop/cy.po
+++ b/translations/desktop_files/khotkeys.desktop/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr ""
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Ffurfweddu gosodiadau BysyllBrys"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "Bysyll;Bysellau;Rhwymiadau bysell eang;Ystumiau;Ystumiau llygoden;"
diff --git a/translations/desktop_files/khotkeys.desktop/da.po b/translations/desktop_files/khotkeys.desktop/da.po
index 41364bfd8..1beb91640 100644
--- a/translations/desktop_files/khotkeys.desktop/da.po
+++ b/translations/desktop_files/khotkeys.desktop/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Indgiv handlinger"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Opsætning af genvejstast"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "Taster;Globale tastebindinger;Tastebindinger;Gester;Muse-gester;"
diff --git a/translations/desktop_files/khotkeys.desktop/de.po b/translations/desktop_files/khotkeys.desktop/de.po
index 0d48872e2..a105ff7a7 100644
--- a/translations/desktop_files/khotkeys.desktop/de.po
+++ b/translations/desktop_files/khotkeys.desktop/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Tastenkombinationen"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Tastenkombinationen festlegen"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Tasten;Tastenzuordnung;Tastenkürzel;Kurzbefehle;Tastenschema;Tastaturlayout;"
diff --git a/translations/desktop_files/khotkeys.desktop/el.po b/translations/desktop_files/khotkeys.desktop/el.po
index d456cecb9..9e3cc8ed2 100644
--- a/translations/desktop_files/khotkeys.desktop/el.po
+++ b/translations/desktop_files/khotkeys.desktop/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Ενέ�γειες εισόδου"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Ρυθμίσεις HotKeys"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Πλήκτ�α;Καθολικοί συνδυασμοί πλήκτ�ων;Συνδυασμοί πλήκτ�ων;Gestures;Mouse "
diff --git a/translations/desktop_files/khotkeys.desktop/eo.po b/translations/desktop_files/khotkeys.desktop/eo.po
index a4ad2f35a..d9c883882 100644
--- a/translations/desktop_files/khotkeys.desktop/eo.po
+++ b/translations/desktop_files/khotkeys.desktop/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Enir-agadoj"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Agordo de klavkomando"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "klavoj;malloka;signifoj;asocioj;kombinoj;klavkombinoj;muzo;"
diff --git a/translations/desktop_files/khotkeys.desktop/es.po b/translations/desktop_files/khotkeys.desktop/es.po
index b26ea8dc3..5bb3283f0 100644
--- a/translations/desktop_files/khotkeys.desktop/es.po
+++ b/translations/desktop_files/khotkeys.desktop/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Introducir acciones"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configuración de las preferencias de Hotkey"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Teclas;Asociaciones de teclas globales;Asociaciones de teclas;Gestos;Gestos "
diff --git a/translations/desktop_files/khotkeys.desktop/es_AR.po b/translations/desktop_files/khotkeys.desktop/es_AR.po
new file mode 100644
index 000000000..67ea25c43
--- /dev/null
+++ b/translations/desktop_files/khotkeys.desktop/es_AR.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
+msgid "Input Actions"
+msgstr ""
+
+#. Comment
+#: kcontrol/khotkeys.desktop:13
+msgid "Configure Hotkey settings"
+msgstr ""
+
+#. Keywords
+#: kcontrol/khotkeys.desktop:15
+msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
+msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/et.po b/translations/desktop_files/khotkeys.desktop/et.po
index 26b394199..3200353a0 100644
--- a/translations/desktop_files/khotkeys.desktop/et.po
+++ b/translations/desktop_files/khotkeys.desktop/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Sisestustoimingud"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Kiirklahvide seadistused"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Klahvid;Globaalsed kiirklahvid;Klahviskeem;Kiirklahvid;Klahvide seosed;"
diff --git a/translations/desktop_files/khotkeys.desktop/eu.po b/translations/desktop_files/khotkeys.desktop/eu.po
index 82470f17f..ff822ecd0 100644
--- a/translations/desktop_files/khotkeys.desktop/eu.po
+++ b/translations/desktop_files/khotkeys.desktop/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Sarrerako ekintzak"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Konfiguratu Hotkey-ren ezarpenak"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Teklak;Tekla elkarketa orokorrak;Tekla elkarketak;Keinuak;Saguaren keinuak;"
diff --git a/translations/desktop_files/khotkeys.desktop/fa.po b/translations/desktop_files/khotkeys.desktop/fa.po
index 0721190b8..b7d91f230 100644
--- a/translations/desktop_files/khotkeys.desktop/fa.po
+++ b/translations/desktop_files/khotkeys.desktop/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "کنشهای ورودی"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "پیکربندی تنظیمات کلید میان‌بر"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "کلیدها، مقیدسازیهای کلید سراسری، مقیدسازیهای کلید، حرکات، حرکات موشی;"
diff --git a/translations/desktop_files/khotkeys.desktop/fi.po b/translations/desktop_files/khotkeys.desktop/fi.po
index 31aaee43c..1f4583d5b 100644
--- a/translations/desktop_files/khotkeys.desktop/fi.po
+++ b/translations/desktop_files/khotkeys.desktop/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Syöttötoiminnot"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Muokkaa pikanäppäinten asetuksia"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Näppäimet;Yleiset näppäinsidokset;Näppäinteema;Näppäinsidokset;pikavalinnat;"
diff --git a/translations/desktop_files/khotkeys.desktop/fr.po b/translations/desktop_files/khotkeys.desktop/fr.po
index f6873be58..553cb9e47 100644
--- a/translations/desktop_files/khotkeys.desktop/fr.po
+++ b/translations/desktop_files/khotkeys.desktop/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Actions d'entrées"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configurer les réglages des raccourcis clavier"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "touches;raccourcis clavier globaux;raccourcis clavier;gestes;gestes de la "
diff --git a/translations/desktop_files/khotkeys.desktop/fy.po b/translations/desktop_files/khotkeys.desktop/fy.po
index ebd2fb87f..cab5c489d 100644
--- a/translations/desktop_files/khotkeys.desktop/fy.po
+++ b/translations/desktop_files/khotkeys.desktop/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Ynfieraksjes"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Fluchtoetsen ynstelle"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "keys;toetsen;toetsenbindingen;key bindings;toetsbiningen;sneltoetsen;"
diff --git a/translations/desktop_files/khotkeys.desktop/ga.po b/translations/desktop_files/khotkeys.desktop/ga.po
index d49870365..16488cf6c 100644
--- a/translations/desktop_files/khotkeys.desktop/ga.po
+++ b/translations/desktop_files/khotkeys.desktop/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Gníomhartha Ionchurtha"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr ""
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Eochracha;Ceangail chomhchoiteanna eochracha;Ceangail chomhchoiteanna;Gothaí;"
diff --git a/translations/desktop_files/khotkeys.desktop/gl.po b/translations/desktop_files/khotkeys.desktop/gl.po
index ed0911582..1c622c8b1 100644
--- a/translations/desktop_files/khotkeys.desktop/gl.po
+++ b/translations/desktop_files/khotkeys.desktop/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Accións de Entrada"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configurar opcións de HotKeys"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Teclas;Atallos de teclado globais;Atallos de teclado;Xestos;Xestos co rato;"
diff --git a/translations/desktop_files/khotkeys.desktop/he.po b/translations/desktop_files/khotkeys.desktop/he.po
index 12d66690d..174c749ce 100644
--- a/translations/desktop_files/khotkeys.desktop/he.po
+++ b/translations/desktop_files/khotkeys.desktop/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "פעולות קלט"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "שינוי הגדרות מקשי הקיצור"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "מקשי�;תפקידי מקשי� גלובליי�;תצורת מקשי�;תפקידי מקשי�;קיצורי�;קיצורי� של "
diff --git a/translations/desktop_files/khotkeys.desktop/hi.po b/translations/desktop_files/khotkeys.desktop/hi.po
index acff01701..3a89fc8b5 100644
--- a/translations/desktop_files/khotkeys.desktop/hi.po
+++ b/translations/desktop_files/khotkeys.desktop/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr ""
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "हॉट-की विन�यास कॉन�फ़िगर करें"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "क�ंजिया�;ग�लोबल की-बाइंडिंग�स;की-बाइंडिंग�स;गेस�चर�स;माउस गेस�चर�स;"
diff --git a/translations/desktop_files/khotkeys.desktop/hr.po b/translations/desktop_files/khotkeys.desktop/hr.po
index 208e39222..c1f5a6a81 100644
--- a/translations/desktop_files/khotkeys.desktop/hr.po
+++ b/translations/desktop_files/khotkeys.desktop/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Aktivnosti unosa"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Konfiguriranje postavki pre�aca"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;Tipke;Opći "
diff --git a/translations/desktop_files/khotkeys.desktop/hu.po b/translations/desktop_files/khotkeys.desktop/hu.po
index 0557fb00a..0aea25d16 100644
--- a/translations/desktop_files/khotkeys.desktop/hu.po
+++ b/translations/desktop_files/khotkeys.desktop/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Beviteli műveletek"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "A használható parancsok beállítása"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "billentyűk;globális billentyűparancs;billentyűparancs;műveletek;"
diff --git a/translations/desktop_files/khotkeys.desktop/is.po b/translations/desktop_files/khotkeys.desktop/is.po
index 8f5efc1ed..0638870b3 100644
--- a/translations/desktop_files/khotkeys.desktop/is.po
+++ b/translations/desktop_files/khotkeys.desktop/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Inntaksaðgerðir"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Stillingar flýtilykla"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "Lyklar;Hnappar;Flýtihnappar;Flýtilyklar;Lyklabindingar;"
diff --git a/translations/desktop_files/khotkeys.desktop/it.po b/translations/desktop_files/khotkeys.desktop/it.po
index 4a98a3771..95b1c4032 100644
--- a/translations/desktop_files/khotkeys.desktop/it.po
+++ b/translations/desktop_files/khotkeys.desktop/it.po
@@ -1,33 +1,44 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+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"
+"POT-Creation-Date: 2024-09-22 18:11+0000\n"
+"PO-Revision-Date: 2024-09-26 03:10+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-khotkeysdesktop/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr "Demone KHotkeys"
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr "Gestisce le azioni di input per la sessione corrente"
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Azioni di immissione"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configura impostazioni di Hotkey"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "tasti;associazioni globali di tasti;schema di tasti;associazioni di tasti;"
diff --git a/translations/desktop_files/khotkeys.desktop/ja.po b/translations/desktop_files/khotkeys.desktop/ja.po
index 00142ad51..94ba9d02e 100644
--- a/translations/desktop_files/khotkeys.desktop/ja.po
+++ b/translations/desktop_files/khotkeys.desktop/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "入力アクション"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "ホットキー�設定"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "キー;グロー�ルキー;キー�インド;ジェス�ャー;マウスジェス�ャー;"
diff --git a/translations/desktop_files/khotkeys.desktop/ka.po b/translations/desktop_files/khotkeys.desktop/ka.po
index 0237907e5..b31cfa959 100644
--- a/translations/desktop_files/khotkeys.desktop/ka.po
+++ b/translations/desktop_files/khotkeys.desktop/ka.po
@@ -1,32 +1,45 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+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"
+"POT-Creation-Date: 2024-09-22 18:11+0000\n"
+"PO-Revision-Date: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-khotkeysdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr "დემ�ნი KHotkeys"
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr "�მუშ�ვებს შეყვ�ნის ქმედებები მიმდინ�რე სესიისთვის"
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "შეტ�ნის ქმედებები"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
-msgstr "კლ�ვიშთ� კ�მბინ�ციის კ�ნფიგურირებ�"
+msgstr "სწრ�ფი ღილ�კების მ�რგებ�"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
+"Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;ჟესტები;"
+"გლ�ბ�ლური ღილ�კები;"
diff --git a/translations/desktop_files/khotkeys.desktop/khotkeys.desktop.pot b/translations/desktop_files/khotkeys.desktop/khotkeys.desktop.pot
index 2a06c1b3a..6368b8c33 100644
--- a/translations/desktop_files/khotkeys.desktop/khotkeys.desktop.pot
+++ b/translations/desktop_files/khotkeys.desktop/khotkeys.desktop.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr ""
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr ""
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/kk.po b/translations/desktop_files/khotkeys.desktop/kk.po
index e75084749..fb6835033 100644
--- a/translations/desktop_files/khotkeys.desktop/kk.po
+++ b/translations/desktop_files/khotkeys.desktop/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Енгізу әрекеттері"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Пернелер тірке�імдерді баптау"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/km.po b/translations/desktop_files/khotkeys.desktop/km.po
index 2435b41a0..7831dbe1d 100644
--- a/translations/desktop_files/khotkeys.desktop/km.po
+++ b/translations/desktop_files/khotkeys.desktop/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "អំពើបញ្ចូល"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "កំណ�់​រចនាសម្ព�ន្ធ​ការ​កំណ�់​គ្រាប់ចុច​បន្ទាន់"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "គ្រាប់ចុច;ការ​ចង​គ្រាប់ចុច​សកល;ការ​ចង​គ្រាប់ចុច;កាយវិការ;កាយវិការ​កណ្ដុរ;"
diff --git a/translations/desktop_files/khotkeys.desktop/ko.po b/translations/desktop_files/khotkeys.desktop/ko.po
index 9b73448a8..bc02823af 100644
--- a/translations/desktop_files/khotkeys.desktop/ko.po
+++ b/translations/desktop_files/khotkeys.desktop/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "입력 �작"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "단축키 설정"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/lt.po b/translations/desktop_files/khotkeys.desktop/lt.po
index 22d1e2138..2dc35efe0 100644
--- a/translations/desktop_files/khotkeys.desktop/lt.po
+++ b/translations/desktop_files/khotkeys.desktop/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Įvesties veiksmai"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Konfigūruoti klavišų kombinacijų nustatymus"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;klavišai;"
diff --git a/translations/desktop_files/khotkeys.desktop/lv.po b/translations/desktop_files/khotkeys.desktop/lv.po
index c1e18bf04..c2f632a19 100644
--- a/translations/desktop_files/khotkeys.desktop/lv.po
+++ b/translations/desktop_files/khotkeys.desktop/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr ""
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Konfigurē karsto taustiņu parametrus"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Taustiņi;Glob�l�s taustiņu sasaistes;Taustiņu shēma;Taustiņu sasaistes;mouse "
diff --git a/translations/desktop_files/khotkeys.desktop/mk.po b/translations/desktop_files/khotkeys.desktop/mk.po
index 62cbd0f56..bc2e92550 100644
--- a/translations/desktop_files/khotkeys.desktop/mk.po
+++ b/translations/desktop_files/khotkeys.desktop/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Влезни деј�тва"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Конфигурирајте ги по�тавувањата за брзите копчиња"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures; Копчиња;"
diff --git a/translations/desktop_files/khotkeys.desktop/ms.po b/translations/desktop_files/khotkeys.desktop/ms.po
index 03712e0ec..d8fd9e426 100644
--- a/translations/desktop_files/khotkeys.desktop/ms.po
+++ b/translations/desktop_files/khotkeys.desktop/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Tindakan Input"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Konfigur seting Kekunci Panas"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/mt.po b/translations/desktop_files/khotkeys.desktop/mt.po
index 7e60ad40c..4b5beeb13 100644
--- a/translations/desktop_files/khotkeys.desktop/mt.po
+++ b/translations/desktop_files/khotkeys.desktop/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr ""
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Konfigurazzjoni tal-hotkeys"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/nb.po b/translations/desktop_files/khotkeys.desktop/nb.po
index 935094c00..30e05637b 100644
--- a/translations/desktop_files/khotkeys.desktop/nb.po
+++ b/translations/desktop_files/khotkeys.desktop/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Input-handlinger"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Sett opp hurtigtaster"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "Taster;generelle hurtigtaster;hurtigtaster;bevegelser;musebevegelser;"
diff --git a/translations/desktop_files/khotkeys.desktop/nds.po b/translations/desktop_files/khotkeys.desktop/nds.po
index 0bef36f51..1333b87e0 100644
--- a/translations/desktop_files/khotkeys.desktop/nds.po
+++ b/translations/desktop_files/khotkeys.desktop/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Ingaavakschonen"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Akschonen för besünner Ingaven instellen"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Tasten;Globale Tastkombinatschonen;Tastschema;Tastkombinatschonen;"
diff --git a/translations/desktop_files/khotkeys.desktop/ne.po b/translations/desktop_files/khotkeys.desktop/ne.po
index f708b8827..7090f26aa 100644
--- a/translations/desktop_files/khotkeys.desktop/ne.po
+++ b/translations/desktop_files/khotkeys.desktop/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "आगत कार�य"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "हटक�ञ�जी सेटिङ कन�फिगर गर�न�होस�"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "क�ञ�जीहरू; विश�वव�यापी क�ञ�जी बाइन�डिङ; क�ञ�जी बाइन�डिङ; सङ�केत; माउस सङ�केत;"
diff --git a/translations/desktop_files/khotkeys.desktop/nl.po b/translations/desktop_files/khotkeys.desktop/nl.po
index 8468f8c6b..3b095ef8c 100644
--- a/translations/desktop_files/khotkeys.desktop/nl.po
+++ b/translations/desktop_files/khotkeys.desktop/nl.po
@@ -1,33 +1,44 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+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"
+"POT-Creation-Date: 2024-09-22 18:11+0000\n"
+"PO-Revision-Date: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/khotkeys-khotkeysdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr "KHotkeys-dachtergronddienst"
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr "Voer invoeracties binnen de huidige sessie uit"
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Invoeracties"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Sneltoetsen instellen"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "keys;toetsen;toetsenbindingen;key bindings;sneltoetsen;globale "
diff --git a/translations/desktop_files/khotkeys.desktop/nn.po b/translations/desktop_files/khotkeys.desktop/nn.po
index 68fb23944..54c37c16d 100644
--- a/translations/desktop_files/khotkeys.desktop/nn.po
+++ b/translations/desktop_files/khotkeys.desktop/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Innhandlingar"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Set opp snøggtastar"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "tastar;globale snøggtastar;tasteoppsett;snøggtastar;snarvegar;"
diff --git a/translations/desktop_files/khotkeys.desktop/pa.po b/translations/desktop_files/khotkeys.desktop/pa.po
index dd4e0513b..481335468 100644
--- a/translations/desktop_files/khotkeys.desktop/pa.po
+++ b/translations/desktop_files/khotkeys.desktop/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "ਇੰਪ�ੱਟ ਕਾਰਵਾਈਆਂ"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "ਹਾਟਕੀ ਸੈਟਿੰਗ ਸੰਰਚਨਾ"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "Keys;Global key bindings;Key bindings;Gestures;ਮਾਊਸ gestures; ਸਵਿੱਚਾਂ;"
diff --git a/translations/desktop_files/khotkeys.desktop/pl.po b/translations/desktop_files/khotkeys.desktop/pl.po
index 04848b0cd..72c083ed5 100644
--- a/translations/desktop_files/khotkeys.desktop/pl.po
+++ b/translations/desktop_files/khotkeys.desktop/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Akcje klawiszowe"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Konfiguracja skrótów klawiszowych"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "klawisze;globalne skróty klawiszowe;schematy skrótów;gesty;mysz;"
diff --git a/translations/desktop_files/khotkeys.desktop/pt.po b/translations/desktop_files/khotkeys.desktop/pt.po
index 499f66a40..35fda0d8c 100644
--- a/translations/desktop_files/khotkeys.desktop/pt.po
+++ b/translations/desktop_files/khotkeys.desktop/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Acções de Entrada"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configurar as opções de teclas"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "teclas;teclas globais;esquema de teclas;atribuições de teclas;gestos;gestos "
diff --git a/translations/desktop_files/khotkeys.desktop/pt_BR.po b/translations/desktop_files/khotkeys.desktop/pt_BR.po
index 0433b7fcb..65723159c 100644
--- a/translations/desktop_files/khotkeys.desktop/pt_BR.po
+++ b/translations/desktop_files/khotkeys.desktop/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Ações de Entrada"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configura definições de teclas de atalho"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Teclas;Teclas de atalho globais;esquema de teclado;gestos; gestos do mouse;"
diff --git a/translations/desktop_files/khotkeys.desktop/ro.po b/translations/desktop_files/khotkeys.desktop/ro.po
index f69a6ffcb..0fb41db6f 100644
--- a/translations/desktop_files/khotkeys.desktop/ro.po
+++ b/translations/desktop_files/khotkeys.desktop/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Acțiuni de intrare"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Configurează setările Hotkey"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "taste;asocieri globale de taste;schemă taste;asocieri taste;acceleratori;"
diff --git a/translations/desktop_files/khotkeys.desktop/ru.po b/translations/desktop_files/khotkeys.desktop/ru.po
index bbf9f217f..f65dff6d2 100644
--- a/translations/desktop_files/khotkeys.desktop/ru.po
+++ b/translations/desktop_files/khotkeys.desktop/ru.po
@@ -1,33 +1,45 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+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"
+"POT-Creation-Date: 2024-09-22 18:11+0000\n"
+"PO-Revision-Date: 2024-09-29 19:45+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-khotkeysdesktop/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr "Демон KHotkeys"
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr "Обрабатывает дей�тви� ввода дл� текущего �еан�а"
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Дей�тви�"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "�а�тройка дей�твий по комбинаци�м клавиш и ро�черкам мышью"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;мышь;ро�черк;"
diff --git a/translations/desktop_files/khotkeys.desktop/rw.po b/translations/desktop_files/khotkeys.desktop/rw.po
index c9cf92674..fb2da29b5 100644
--- a/translations/desktop_files/khotkeys.desktop/rw.po
+++ b/translations/desktop_files/khotkeys.desktop/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Kwinjiza Ibikorwa"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Kuboneza amagenamiterere Butozihuta"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Buto;Ibyafataranyijwe urufunguzo rusange;Ibyafatanyijwe by'urufunguzo;"
diff --git a/translations/desktop_files/khotkeys.desktop/se.po b/translations/desktop_files/khotkeys.desktop/se.po
index 6350425d9..3a42654d0 100644
--- a/translations/desktop_files/khotkeys.desktop/se.po
+++ b/translations/desktop_files/khotkeys.desktop/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr ""
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Heivet jođánisboaluid"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "boalut;oppalaš jođánisboalut;boallo�oahkádusat;boallo�atnasat;njuolgobálgát;"
diff --git a/translations/desktop_files/khotkeys.desktop/sk.po b/translations/desktop_files/khotkeys.desktop/sk.po
index 0aeff9eb3..b0b52341c 100644
--- a/translations/desktop_files/khotkeys.desktop/sk.po
+++ b/translations/desktop_files/khotkeys.desktop/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Vstupné akcie"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Nastavenia klávesových skratiek"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Klávesy;Globálne klávesové skratky;schéma kláves;klávesové skratky;gestá;"
diff --git a/translations/desktop_files/khotkeys.desktop/sl.po b/translations/desktop_files/khotkeys.desktop/sl.po
index a5d2442bc..a13ac0b65 100644
--- a/translations/desktop_files/khotkeys.desktop/sl.po
+++ b/translations/desktop_files/khotkeys.desktop/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Vhodna dejanja"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Nastavitve vro�ih tipk"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "tipke;globalne vezi tipk;vezi tipk;tipkovne vezi;gibi;miškini gibi;"
diff --git a/translations/desktop_files/khotkeys.desktop/sr.po b/translations/desktop_files/khotkeys.desktop/sr.po
index 3edb41966..3d0999cb7 100644
--- a/translations/desktop_files/khotkeys.desktop/sr.po
+++ b/translations/desktop_files/khotkeys.desktop/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "�кције улаза"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Подешавање по�тавки пречица"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application "
diff --git a/translations/desktop_files/khotkeys.desktop/sr@Latn.po b/translations/desktop_files/khotkeys.desktop/sr@Latn.po
index 01738a5d5..65ee3f77f 100644
--- a/translations/desktop_files/khotkeys.desktop/sr@Latn.po
+++ b/translations/desktop_files/khotkeys.desktop/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Akcije ulaza"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Podešavanje postavki pre�ica"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key scheme;Key bindings;shortcuts;application "
diff --git a/translations/desktop_files/khotkeys.desktop/sv.po b/translations/desktop_files/khotkeys.desktop/sv.po
index 5fe2ac129..3720baaeb 100644
--- a/translations/desktop_files/khotkeys.desktop/sv.po
+++ b/translations/desktop_files/khotkeys.desktop/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Inmatningsåtgärder"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Anpassa Hotkey-inställningar"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "tangenter;globala tangentbindningar;tangentbindningar;gester;musgester;"
diff --git a/translations/desktop_files/khotkeys.desktop/ta.po b/translations/desktop_files/khotkeys.desktop/ta.po
index 338638c36..8553f5c50 100644
--- a/translations/desktop_files/khotkeys.desktop/ta.po
+++ b/translations/desktop_files/khotkeys.desktop/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "உள�ளீட�ட� செயல�கள�"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "�ÕìÌÅ¢¨º «¨�ôÒ¸¨Ç ¯ûǨ�"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "விசைகள�;உலகலாவிய விசை பிணைப�ப�கள�;விசை திட�டம�;விசை பிணைப�ப�கள�;க�ற�க�க�வழிகள�;"
diff --git a/translations/desktop_files/khotkeys.desktop/te.po b/translations/desktop_files/khotkeys.desktop/te.po
index c00a8be3c..f4c2b0816 100644
--- a/translations/desktop_files/khotkeys.desktop/te.po
+++ b/translations/desktop_files/khotkeys.desktop/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "మ�లాంశ చర�యల�"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr ""
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/tg.po b/translations/desktop_files/khotkeys.desktop/tg.po
index 763960128..63f1d8b5c 100644
--- a/translations/desktop_files/khotkeys.desktop/tg.po
+++ b/translations/desktop_files/khotkeys.desktop/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "�малҳо"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr ""
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/th.po b/translations/desktop_files/khotkeys.desktop/th.po
index 26db4a138..a29a9e126 100644
--- a/translations/desktop_files/khotkeys.desktop/th.po
+++ b/translations/desktop_files/khotkeys.desktop/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "�าร�ระทำเพื่อใส่ข้อมูล"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "ตั้งค่าปุ่มลัด"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "ปุ่มพิมพ์;ปุ่มพิมพ์ส่วน�ลาง;ชุดปุ่มพิมพ์;�ารจับคู่ปุ่มพิมพ์;ปุ่มพิมพ์ลัด;�ป้นพิมพ์ลัด;ปุ่มพิมพ์ลัด�อพพลิเคชัน;"
diff --git a/translations/desktop_files/khotkeys.desktop/tr.po b/translations/desktop_files/khotkeys.desktop/tr.po
index c0c4c7812..190824500 100644
--- a/translations/desktop_files/khotkeys.desktop/tr.po
+++ b/translations/desktop_files/khotkeys.desktop/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Girdi Eylemleri"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Kısayol ayarlarını yapılandır"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Tuşlar;Küresel tuş bağlantıları;Tuş bağlantıları;Kısayollar;Uygulama "
diff --git a/translations/desktop_files/khotkeys.desktop/tt.po b/translations/desktop_files/khotkeys.desktop/tt.po
index c12ba69fc..e57b243de 100644
--- a/translations/desktop_files/khotkeys.desktop/tt.po
+++ b/translations/desktop_files/khotkeys.desktop/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Kertü Ğämälläre"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Qaynar töymälärne caylaw"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
diff --git a/translations/desktop_files/khotkeys.desktop/uk.po b/translations/desktop_files/khotkeys.desktop/uk.po
index 14520fc76..765e83968 100644
--- a/translations/desktop_files/khotkeys.desktop/uk.po
+++ b/translations/desktop_files/khotkeys.desktop/uk.po
@@ -1,33 +1,45 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Roman Savochenko <roman@oscada.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+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"
+"POT-Creation-Date: 2024-09-22 18:11+0000\n"
+"PO-Revision-Date: 2024-10-02 18:11+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
+"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-khotkeysdesktop/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr "KHotkeys Демон"
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr "Обробл�є вхідну активні�ть поточного �еан�у"
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Ввід"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "�алаштуванн� швидких клавіш"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "клавіші;глобальні прив'�зки клавіш;�хема клавіш;прив'�зка клавіш; же�ти; "
diff --git a/translations/desktop_files/khotkeys.desktop/uz.po b/translations/desktop_files/khotkeys.desktop/uz.po
index f0513b29d..da2a3e5fd 100644
--- a/translations/desktop_files/khotkeys.desktop/uz.po
+++ b/translations/desktop_files/khotkeys.desktop/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Kiritish amallari"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr ""
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Gestures;Mouse gestures;Tugmalar;Umumiy tugmalar birikmasi;Tugmalar "
diff --git a/translations/desktop_files/khotkeys.desktop/uz@cyrillic.po b/translations/desktop_files/khotkeys.desktop/uz@cyrillic.po
index 2138179c2..dcabf5e7b 100644
--- a/translations/desktop_files/khotkeys.desktop/uz@cyrillic.po
+++ b/translations/desktop_files/khotkeys.desktop/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Киритиш амаллари"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr ""
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Gestures;Mouse gestures;Тугмалар;Умумий тугмалар бирикма�и;Тугмалар "
diff --git a/translations/desktop_files/khotkeys.desktop/vi.po b/translations/desktop_files/khotkeys.desktop/vi.po
index 8e0f4f7bd..5dd11b72a 100644
--- a/translations/desktop_files/khotkeys.desktop/vi.po
+++ b/translations/desktop_files/khotkeys.desktop/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,16 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Gõ Phím nóng"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Cấu hình các thiết lập v� phím nóng"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr "Phím;tổ hợp phím toàn cục;tổ hợp phím;gõ phím;di chuyển chuột;"
diff --git a/translations/desktop_files/khotkeys.desktop/wa.po b/translations/desktop_files/khotkeys.desktop/wa.po
index 6297e75fe..f8adaa102 100644
--- a/translations/desktop_files/khotkeys.desktop/wa.po
+++ b/translations/desktop_files/khotkeys.desktop/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "Accions en intrêye"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "Apontiaedjes des tchuzes Hotkeys"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Tapes;globås rascourtis;rascourtis;djesses;manire di bodjî;manire di bodjî "
diff --git a/translations/desktop_files/khotkeys.desktop/zh_CN.po b/translations/desktop_files/khotkeys.desktop/zh_CN.po
index afaae8f0c..30fc396af 100644
--- a/translations/desktop_files/khotkeys.desktop/zh_CN.po
+++ b/translations/desktop_files/khotkeys.desktop/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "输入动作"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "�置热键设置"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;键;全局键绑定;"
diff --git a/translations/desktop_files/khotkeys.desktop/zh_TW.po b/translations/desktop_files/khotkeys.desktop/zh_TW.po
index 3ade977dd..fe2e38b68 100644
--- a/translations/desktop_files/khotkeys.desktop/zh_TW.po
+++ b/translations/desktop_files/khotkeys.desktop/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:09+0200\n"
+"POT-Creation-Date: 2024-09-22 18:11+0000\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"
@@ -17,17 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: khotkeys.desktop:12
+#: app/khotkeys.desktop:4
+msgid "KHotkeys Daemon"
+msgstr ""
+
+#. Comment
+#: app/khotkeys.desktop:6
+msgid "Handles input actions for the current session"
+msgstr ""
+
+#. Name
+#: kcontrol/khotkeys.desktop:11
 msgid "Input Actions"
 msgstr "輸入動作"
 
 #. Comment
-#: khotkeys.desktop:14
+#: kcontrol/khotkeys.desktop:13
 msgid "Configure Hotkey settings"
 msgstr "設定熱�設定值"
 
 #. Keywords
-#: khotkeys.desktop:16
+#: kcontrol/khotkeys.desktop:15
 msgid "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;"
 msgstr ""
 "Keys;Global key bindings;Key bindings;Gestures;Mouse gestures;按�;全域按建連"
diff --git a/translations/desktop_files/kicker-desktops/es_AR.po b/translations/desktop_files/kicker-desktops/es_AR.po
new file mode 100644
index 000000000..ab6b77849
--- /dev/null
+++ b/translations/desktop_files/kicker-desktops/es_AR.po
@@ -0,0 +1,374 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-19 16:24+0200\n"
+"PO-Revision-Date: 2025-03-07 16:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kicker-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: applets/clock/clockapplet.desktop:4
+msgid "Clock"
+msgstr "Reloj"
+
+#. Comment
+#: applets/clock/clockapplet.desktop:6
+msgid "An analog and digital clock"
+msgstr "Reloj analógico/digital"
+
+#. Name
+#: applets/launcher/quicklauncher.desktop:3
+msgid "Quick Launcher"
+msgstr "Lanzador rápido"
+
+#. Comment
+#: applets/launcher/quicklauncher.desktop:5
+msgid "Directly access your frequently used applications"
+msgstr "Acceso directo a los programas usados más frecuentemente"
+
+#. Name
+#: applets/lockout/lockout.desktop:3
+msgid "Lock/Logout Buttons"
+msgstr "Botones de bloqueo/salida"
+
+#. Comment
+#: applets/lockout/lockout.desktop:5
+msgid "Adds buttons for locking screen and session logout"
+msgstr "Añade botones para bloquear la sesión y para salirse de ésta"
+
+#. Name
+#: applets/media/mediaapplet.desktop:3
+msgid "Storage Media"
+msgstr "Dispositivos de almacenamiento"
+
+#. Comment
+#: applets/media/mediaapplet.desktop:5
+msgid "Directly access your storage media"
+msgstr "Acceso directo a tus dispositivos de almacenamiento"
+
+#. Name
+#: applets/menu/menuapplet.desktop:4
+msgid "Menu"
+msgstr "Menú"
+
+#. Comment
+#: applets/menu/menuapplet.desktop:6
+msgid "Applet embedding standalone menubars"
+msgstr "Un applet que incluye barras de menú autónomas"
+
+#. Name
+#: applets/minipager/minipagerapplet.desktop:4
+msgid "Desktop Preview & Pager"
+msgstr "Paginador y previsualizador del escritorio"
+
+#. Comment
+#: applets/minipager/minipagerapplet.desktop:6
+msgid "Preview, manage and switch to multiple virtual desktops"
+msgstr "Previsualizar, gestionar y cambiar a múltiples escritorios virtuales"
+
+#. Name
+#: applets/naughty/naughtyapplet.desktop:3
+msgid "Runaway Process Catcher"
+msgstr "Capturador de procesos desbocados"
+
+#. Comment
+#: applets/naughty/naughtyapplet.desktop:5
+msgid "Detect and end broken processes which consume too much CPU time"
+msgstr "Detectar procesos rotos que consumen demasiado tiempo del procesador"
+
+#. Name
+#: applets/run/runapplet.desktop:3
+msgid "Run Command"
+msgstr "Ejecutar comando"
+
+#. Comment
+#: applets/run/runapplet.desktop:5
+msgid "Launch single commands without a terminal window"
+msgstr "Lanzar órdenes individuales sin ventana de terminal"
+
+#. Name
+#: applets/swallow/swallowapplet.desktop:3
+msgid "Swallow Applet"
+msgstr "Applet contenedor"
+
+#. Comment
+#: applets/swallow/swallowapplet.desktop:5
+msgid "The swallow panel applet"
+msgstr "El applet del panel contenedor"
+
+#. Name
+#: applets/systemtray/systemtrayapplet.desktop:3
+msgid "System Tray"
+msgstr "Bandeja del sistema"
+
+#. Comment
+#: applets/systemtray/systemtrayapplet.desktop:5
+msgid "The system tray panel applet"
+msgstr "La bandeja del sistema (applet del panel)"
+
+#. Name
+#: applets/taskbar/taskbarapplet.desktop:3
+msgid "Taskbar"
+msgstr "Barra de tareas"
+
+#. Comment
+#: applets/taskbar/taskbarapplet.desktop:5
+msgid "The default task bar for window management"
+msgstr "La barra de tareas predeterminada para gestionar las ventanas"
+
+#. Name
+#: applets/trash/trashapplet.desktop:3
+msgid "Trash"
+msgstr "Papelera de reciclaje"
+
+#. Comment
+#: applets/trash/trashapplet.desktop:5
+msgid "Displays the trashcan and allows files to be dropped onto it"
+msgstr "Muestra la papelera y permite tirar archivos en ella"
+
+#. Name
+#: extensions/dockbar/dockbarextension.desktop:2
+msgid "Dock Application Bar"
+msgstr "Barra para anclar aplicaciones"
+
+#. Comment
+#: extensions/dockbar/dockbarextension.desktop:4
+msgid "Dock application bar extension."
+msgstr "Extensión Barra para anclar programas."
+
+#. Name
+#: extensions/kasbar/kasbarextension.desktop:2
+msgid "KasBar"
+msgstr "KasBar"
+
+#. Comment
+#: extensions/kasbar/kasbarextension.desktop:4
+msgid "An alternative taskbar panel applet."
+msgstr "Barra de tareas alternativa (applets del panel)."
+
+#. Name
+#: extensions/sidebar/sidebarextension.desktop:2
+msgid "Universal Sidebar"
+msgstr "Barra lateral universal"
+
+#. Comment
+#: extensions/sidebar/sidebarextension.desktop:4
+msgid "Wrapper around Konqueror's navigation panel"
+msgstr "Envoltura para el panel de navegación de Konqueror"
+
+#. Name
+#: extensions/taskbar/taskbarextension.desktop:2
+msgid "External Taskbar"
+msgstr "Barra de tareas externa"
+
+#. Comment
+#: extensions/taskbar/taskbarextension.desktop:4
+msgid "External taskbar panel extension"
+msgstr "Extensión del panel con barra de tareas externa"
+
+#. Name
+#: kicker/buttons/bookmarks.desktop:2
+msgid "Bookmarks Menu"
+msgstr "Marcadores"
+
+#. Comment
+#: kicker/buttons/bookmarks.desktop:4
+msgid "Your Konqueror bookmarks"
+msgstr "Tus marcadores de Konqueror"
+
+#. Name
+#: kicker/buttons/browser.desktop:2
+msgid "Quick File Browser"
+msgstr "Navegador rápido de archivos"
+
+#. Comment
+#: kicker/buttons/browser.desktop:4
+msgid "A menu that lists files in a given folder"
+msgstr "Un menú que le muestra los archivos de una carpeta"
+
+#. Name
+#: kicker/buttons/desktop.desktop:2
+msgid "Show Desktop"
+msgstr "Mostrar escritorio"
+
+#. Comment
+#: kicker/buttons/desktop.desktop:4
+msgid "A button that gives quick access to the desktop when pressed"
+msgstr "Un botón que muestra rápidamente el escritorio al pulsarlo"
+
+#. Name
+#: kicker/buttons/exec.desktop:2
+msgid "Non-TDE Application Launcher"
+msgstr "Programas No-TDE"
+
+#. Comment
+#: kicker/buttons/exec.desktop:4
+msgid "A launcher for programs not in the TDE Menu"
+msgstr "Te permite ejecutar programas que no están en el Menu TDE"
+
+#. Name
+#: kicker/buttons/kmenu.desktop:2
+msgid "TDE Menu"
+msgstr "Menú de TDE"
+
+#. Comment
+#: kicker/buttons/kmenu.desktop:4
+msgid "Applications and common actions"
+msgstr "Programas y acciones comunes"
+
+#. Name
+#: kicker/buttons/windowlist.desktop:2
+msgid "Window List Menu"
+msgstr "Menú de la lista de ventanas"
+
+#. Comment
+#: kicker/buttons/windowlist.desktop:4
+msgid "A menu that lists all open windows"
+msgstr "Un menú que muestra todas las ventanas abiertas"
+
+#. Name
+#: kicker/core/childpanelextension.desktop:2
+msgid "Panel"
+msgstr "Panel"
+
+#. Comment
+#: kicker/core/childpanelextension.desktop:4
+msgid "Child panel extension."
+msgstr "Extensión Panel hijo."
+
+#. Comment
+#: kicker/interfaces/kickoffsearchplugin.desktop:5
+msgid "A search plugin for Kickoff"
+msgstr "Un complemento de búsqueda para Kickoff"
+
+#. Name
+#: kicker/kcmkicker.desktop:10
+msgid "Configure the Panel"
+msgstr "Configuración del panel"
+
+#. Name
+#: kicker/panel.desktop:10
+msgid "Trinity Panel"
+msgstr "Panel de Trinity"
+
+#. Name
+#: menuext/find/find.desktop:2
+msgid "Find"
+msgstr "Buscar"
+
+#. Comment
+#: menuext/find/find.desktop:4
+msgid "Menu for starting a file or web search"
+msgstr "Menú para comenzar la búsqueda de un archivo o página/sitio web"
+
+#. Name
+#: menuext/find/kfind.desktop:11
+msgid "Find Files"
+msgstr "Encontrar archivos"
+
+#. Name
+#: menuext/find/websearch.desktop:8
+msgid "Web Search"
+msgstr "Búsqueda web"
+
+#. Name
+#: menuext/kate/katesessionmenu.desktop:2
+msgid "Kate Session Menu"
+msgstr "Menú de la sesión de Kate"
+
+#. Comment
+#: menuext/kate/katesessionmenu.desktop:4
+msgid "Allows you to open Kate with a specified session, or create a new one"
+msgstr "Te permite abrir Kate con una sesión específica, o crear una nueva"
+
+#. Name
+#: menuext/konq-profiles/konquerormenu.desktop:2
+msgid "Konqueror Profiles"
+msgstr "Perfiles de Konqueror"
+
+#. Comment
+#: menuext/konq-profiles/konquerormenu.desktop:4
+msgid "Menu for accessing the Konqueror profiles"
+msgstr "Menú para acceder a los perfiles de Konqueror"
+
+#. Name
+#: menuext/konsole/konsolemenu.desktop:2
+msgid "Terminal Sessions"
+msgstr "Sesiones de terminal"
+
+#. Comment
+#: menuext/konsole/konsolemenu.desktop:4
+msgid "Menu for starting a terminal emulator with a session or bookmark"
+msgstr "Menú para iniciar un emulador de terminal con una sesión o marcador"
+
+#. Name
+#: menuext/prefmenu/prefmenu.desktop:2
+msgid "Trinity Control Center"
+msgstr "Configuración de Trinity"
+
+#. Comment
+#: menuext/prefmenu/prefmenu.desktop:4
+msgid "Trinity Control Center modules menu"
+msgstr "Menú de los módulos del Centro de control de Trinity"
+
+#. Name
+#: menuext/recentdocs/recentdocs.desktop:2
+msgid "Recent Documents"
+msgstr "Documentos recientes"
+
+#. Comment
+#: menuext/recentdocs/recentdocs.desktop:4
+msgid "Menu of documents you have used recently"
+msgstr "Menú de los documentos recientemente usados"
+
+#. Name
+#: menuext/remote/remotemenu.desktop:2
+msgid "Network Folders"
+msgstr "Carpetas de red"
+
+#. Comment
+#: menuext/remote/remotemenu.desktop:4
+msgid "Menu of network folders"
+msgstr "Menú de las carpetas de red"
+
+#. Name
+#: menuext/system/systemmenu.desktop:2
+msgid "System Menu"
+msgstr "Menú del sistema"
+
+#. Comment
+#: menuext/system/systemmenu.desktop:4
+msgid "Menu of important system places"
+msgstr "Menú de lugares importantes del sistema"
+
+#. Name
+#: menuext/tdeprint/printmenu.desktop:2
+msgid "Print System"
+msgstr "Sistema de impresión"
+
+#. Comment
+#: menuext/tdeprint/printmenu.desktop:4
+msgid "Menu for the print system"
+msgstr "Menú para el sistema de impresión"
+
+#. Name
+#: menuext/tom/tom.desktop:2
+msgid "TOM"
+msgstr "TOM"
+
+#. Comment
+#: menuext/tom/tom.desktop:4
+msgid "A task oriented menu system"
+msgstr "Un sistema de menú orientado a tareas"
diff --git a/translations/desktop_files/kicker-desktops/ka.po b/translations/desktop_files/kicker-desktops/ka.po
index da4e8fdce..281dba253 100644
--- a/translations/desktop_files/kicker-desktops/ka.po
+++ b/translations/desktop_files/kicker-desktops/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 16:24+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: 2024-12-10 22:12+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kicker-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -29,13 +30,12 @@ msgstr "�ნ�ლ�გური დ� ციფრული ს��თი
 #. Name
 #: applets/launcher/quicklauncher.desktop:3
 msgid "Quick Launcher"
-msgstr "სწრ�ფი დ�წყებ�"
+msgstr "სწრ�ფი გ�მშვები"
 
 #. Comment
 #: applets/launcher/quicklauncher.desktop:5
-#, fuzzy
 msgid "Directly access your frequently used applications"
-msgstr "თქვენი შენ�ხვის მედიის პირდ�პირი წვდ�მ�"
+msgstr "პირდ�პირი წვდ�მ� თქვენს ხშირ�დ გ�მ�ყენებულ �პლიკ�ციებთ�ნ"
 
 #. Name
 #: applets/lockout/lockout.desktop:3
@@ -45,17 +45,17 @@ msgstr "დáƒ�ბლáƒ�კვის/გáƒ�მáƒ�სვლის ღილáƒ�კá
 #. Comment
 #: applets/lockout/lockout.desktop:5
 msgid "Adds buttons for locking screen and session logout"
-msgstr ""
+msgstr "დ��მ�ტებს ღილ�კებს ეკრ�ნის დ�ბლ�კვის� დ� სესიიდ�ნ გ�სვლისთვის"
 
 #. Name
 #: applets/media/mediaapplet.desktop:3
 msgid "Storage Media"
-msgstr "მ�ნ�ცემთ� შენ�ხვის მ�წყ�ბილ�ბები"
+msgstr "ს�ც�ვის მედი�"
 
 #. Comment
 #: applets/media/mediaapplet.desktop:5
 msgid "Directly access your storage media"
-msgstr "თქვენი შენ�ხვის მედიის პირდ�პირი წვდ�მ�"
+msgstr "პირდ�პირ წვდ�მ� თქვენი ს�ც�ვის მედი�ზე"
 
 #. Name
 #: applets/menu/menuapplet.desktop:4
@@ -76,26 +76,29 @@ msgstr "ს�მუშ�� დ�ფის� დ� გვერდები
 #: applets/minipager/minipagerapplet.desktop:6
 msgid "Preview, manage and switch to multiple virtual desktops"
 msgstr ""
+"ერთზე მეტი ვირტუ�ლური ს�მუშ�� მ�გიდის გ�დ�ხედვ�, მ�რთვ� დ� მ�თ შ�რის გ�დ�რთვ�"
 
 #. Name
 #: applets/naughty/naughtyapplet.desktop:3
 msgid "Runaway Process Catcher"
-msgstr ""
+msgstr "გ�ქცეული პრ�ცესის დ�მჭერი"
 
 #. Comment
 #: applets/naughty/naughtyapplet.desktop:5
 msgid "Detect and end broken processes which consume too much CPU time"
 msgstr ""
+"�ღმ��ჩინეთ დ� დ��სრულეთ დ�კიდებული პრ�ცესები, რ�მლებიც მეტისმეტ�დ ბევრ CPU-"
+"ის დრ�ს იყენებენ"
 
 #. Name
 #: applets/run/runapplet.desktop:3
 msgid "Run Command"
-msgstr "ბრძ�ნების შესრულებ�"
+msgstr "ბრძ�ნების გ�შვებ�"
 
 #. Comment
 #: applets/run/runapplet.desktop:5
 msgid "Launch single commands without a terminal window"
-msgstr ""
+msgstr "გ�უშვით ერთი ბრძ�ნებ� ტერმინ�ლის ფ�ნჯრის გ�რეშე"
 
 #. Name
 #: applets/swallow/swallowapplet.desktop:3
@@ -120,43 +123,42 @@ msgstr "სისტემური პ�ნელის �პლეტი"
 #. Name
 #: applets/taskbar/taskbarapplet.desktop:3
 msgid "Taskbar"
-msgstr "�მ�ც�ნ�თ� პ�ნელი"
+msgstr "�მ�ც�ნების პ�ნელი"
 
 #. Comment
 #: applets/taskbar/taskbarapplet.desktop:5
 msgid "The default task bar for window management"
-msgstr "ფ�ნჯრის მ�რთვის ძირით�დი პულტი"
+msgstr "ნ�გულისხმევი �მ�ც�ნის პ�ნელი ფ�ნჯრის მ�რთვისთვის"
 
 #. Name
 #: applets/trash/trashapplet.desktop:3
 msgid "Trash"
-msgstr "ურნ�"
+msgstr "ნ�გვის ყუთი"
 
 #. Comment
 #: applets/trash/trashapplet.desktop:5
 msgid "Displays the trashcan and allows files to be dropped onto it"
-msgstr ""
+msgstr "�ჩვენებს ნ�გვის ყუთს დ� ს�შუ�ლებ�ს გ�ძლევთ, მ�სში ფ�ილები ჩ�ყ�რ�თ"
 
 #. Name
 #: extensions/dockbar/dockbarextension.desktop:2
-#, fuzzy
 msgid "Dock Application Bar"
-msgstr "�რ� TDE-ს პრ�გრ�მების"
+msgstr "�პლიკ�ციების პ�ნელის მიმ�გრებ�"
 
 #. Comment
 #: extensions/dockbar/dockbarextension.desktop:4
 msgid "Dock application bar extension."
-msgstr ""
+msgstr "�პლიკ�ციის პ�ნელის გ�ფ�რთ�ების მიმ�გრებ�."
 
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
 msgid "An alternative taskbar panel applet."
-msgstr "�ლტერნ�ტიული �მ�ც�ნ�თ� პ�ნელის �პლეტი"
+msgstr "�ლტერნ�ტიული �მ�ც�ნ�თ� პ�ნელის �პლეტი."
 
 #. Name
 #: extensions/sidebar/sidebarextension.desktop:2
@@ -171,12 +173,12 @@ msgstr "Konqueror -ის პáƒ�ნელის დáƒ�მმუშáƒ�ვებáƒ
 #. Name
 #: extensions/taskbar/taskbarextension.desktop:2
 msgid "External Taskbar"
-msgstr "გ�ფ�რთ�ვებული �მ�ც�ნ�თ� პ�ნელი"
+msgstr "გ�რე �მ�ც�ნების პ�ნელი"
 
 #. Comment
 #: extensions/taskbar/taskbarextension.desktop:4
 msgid "External taskbar panel extension"
-msgstr "გ�რე პულტის� დ� პ�ნელის გ�ფ�რთ�ებ�"
+msgstr "გ�რე �მ�ც�ნების პ�ნელის გ�ფ�რთ�ებ�"
 
 #. Name
 #: kicker/buttons/bookmarks.desktop:2
@@ -191,43 +193,44 @@ msgstr "Konqueror-ის თქვენი ს�ნიშნეები"
 #. Name
 #: kicker/buttons/browser.desktop:2
 msgid "Quick File Browser"
-msgstr "ფ�ილების სწრ�ფი ნუსხ�"
+msgstr "სწრ�ფი ფ�ილების ბრ�უზერი"
 
 #. Comment
 #: kicker/buttons/browser.desktop:4
-#, fuzzy
 msgid "A menu that lists files in a given folder"
-msgstr "ყველ� გ�ხსნილი ფ�ნჯრის სიის მენიუ"
+msgstr "მენიუ, რ�მელიც მითითებული ს�ქ�ღ�ლდის ფ�ილებს შეიც�ვს"
 
 #. Name
 #: kicker/buttons/desktop.desktop:2
 msgid "Show Desktop"
-msgstr "ს�მუშ�� დ�ფის ჩვენებ�"
+msgstr "ს�მუშ�� მ�გიდის ჩვენებ�"
 
 #. Comment
 #: kicker/buttons/desktop.desktop:4
 msgid "A button that gives quick access to the desktop when pressed"
 msgstr ""
+"ღილ�კი, რ�მელიც, რ�ც� დ��წვებით, ს�მუშ�� მ�გიდ�სთ�ნ სწრ�ფი წვდ�მის "
+"ს�შუ�ლებ�ს მ�გცემთ"
 
 #. Name
 #: kicker/buttons/exec.desktop:2
 msgid "Non-TDE Application Launcher"
-msgstr "�რ� TDE-ს პრ�გრ�მების"
+msgstr "�რ� TDE-ს პრ�გრ�მების გ�მშვები"
 
 #. Comment
 #: kicker/buttons/exec.desktop:4
 msgid "A launcher for programs not in the TDE Menu"
-msgstr ""
+msgstr "გ�მშვები პრ�გრ�მებითვის, რ�მლებიც TDE-ის მენიუში �რ��"
 
 #. Name
 #: kicker/buttons/kmenu.desktop:2
 msgid "TDE Menu"
-msgstr "TDE მენიუ"
+msgstr "TDE-ის მენიუ"
 
 #. Comment
 #: kicker/buttons/kmenu.desktop:4
 msgid "Applications and common actions"
-msgstr "პრ�გრ�მები დ� ს�ზ�გ�დ� ქმედებები"
+msgstr "პრ�გრ�მები დ� ზ�გ�დი ქმედებები"
 
 #. Name
 #: kicker/buttons/windowlist.desktop:2
@@ -247,52 +250,52 @@ msgstr "პ�ნელი"
 #. Comment
 #: kicker/core/childpanelextension.desktop:4
 msgid "Child panel extension."
-msgstr "შვილეული პ�ნელის გ�ფ�რთ�ვებ�"
+msgstr "შვილი პ�ნელის გ�ფ�რთ�ვებ�."
 
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "ძებნის დ�მ�ტებ� Kickoff-სთვის"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
 msgid "Configure the Panel"
-msgstr "პ�ნელის კ�ნფიგურირებ�"
+msgstr "პ�ნელის მ�რგებ�"
 
 #. Name
 #: kicker/panel.desktop:10
 msgid "Trinity Panel"
-msgstr "Trinity-ს პ�ნელი"
+msgstr "Trinity-ის პ�ნელი"
 
 #. Name
 #: menuext/find/find.desktop:2
 msgid "Find"
-msgstr "ძიებ�"
+msgstr "ძებნ�"
 
 #. Comment
 #: menuext/find/find.desktop:4
 msgid "Menu for starting a file or web search"
-msgstr "ფ�ილში �ნ ვებში ძიების დ�წყების მენიუ"
+msgstr "ფ�ილის �ნ ვებში ძებნის დ�წყების მენიუ"
 
 #. Name
 #: menuext/find/kfind.desktop:11
 msgid "Find Files"
-msgstr "ფ�ილთ� ძიებ�"
+msgstr "ფ�ილების ძებნ�"
 
 #. Name
 #: menuext/find/websearch.desktop:8
 msgid "Web Search"
-msgstr "ვებ ძიებ�"
+msgstr "ძებნ� ინტერნეტში"
 
 #. Name
 #: menuext/kate/katesessionmenu.desktop:2
 msgid "Kate Session Menu"
-msgstr ""
+msgstr "Kate-ის სესიის მენიუ"
 
 #. Comment
 #: menuext/kate/katesessionmenu.desktop:4
 msgid "Allows you to open Kate with a specified session, or create a new one"
-msgstr ""
+msgstr "ს�შუ�ლებ�ს გ�ძლევთ, გ�ხსნ�თ Kate მითითებული სესიით, �ნ �ხ�ლი შექმნ�თ"
 
 #. Name
 #: menuext/konq-profiles/konquerormenu.desktop:2
@@ -302,34 +305,32 @@ msgstr "Konqueror-ის პრ�ფილები"
 #. Comment
 #: menuext/konq-profiles/konquerormenu.desktop:4
 msgid "Menu for accessing the Konqueror profiles"
-msgstr "Konqueror-ის პრ�ფილების წვდ�მის მენიუ"
+msgstr "Konqueror-ის პრ�ფილებთ�ნ წვდ�მის მენიუ"
 
 #. Name
 #: menuext/konsole/konsolemenu.desktop:2
 msgid "Terminal Sessions"
-msgstr "სერმინ�ლის სე�ნსები"
+msgstr "ტერმინ�ლის სესიები"
 
 #. Comment
 #: menuext/konsole/konsolemenu.desktop:4
-#, fuzzy
 msgid "Menu for starting a terminal emulator with a session or bookmark"
-msgstr "ფ�ილში �ნ ვებში ძიების დ�წყების მენიუ"
+msgstr "მენუ ტერმინ�ლის ემულ�ტ�რის სესიით �ნ ს�ნიშნეთი გ�ს�შვებ�დ"
 
 #. Name
 #: menuext/prefmenu/prefmenu.desktop:2
 msgid "Trinity Control Center"
-msgstr "ს�კ�ნტრ�ლ� ცენტრი"
+msgstr "Trinity-ის კ�ნტრ�ლის ცენტრი"
 
 #. Comment
 #: menuext/prefmenu/prefmenu.desktop:4
-#, fuzzy
 msgid "Trinity Control Center modules menu"
-msgstr "ს�კ�ნტრ�ლ� ცენტრი"
+msgstr "Trinity-ის კ�ნტრ�ლის ცენტრის მ�დულების მენიუ"
 
 #. Name
 #: menuext/recentdocs/recentdocs.desktop:2
 msgid "Recent Documents"
-msgstr "ბ�ლ� დ�კუმენტები"
+msgstr "უ�ხლესი დ�კუმენტები"
 
 #. Comment
 #: menuext/recentdocs/recentdocs.desktop:4
@@ -344,17 +345,17 @@ msgstr "ქსელური ს�ქ�ღ�ლდეები"
 #. Comment
 #: menuext/remote/remotemenu.desktop:4
 msgid "Menu of network folders"
-msgstr "ქსელური დ�სტების მენიუ"
+msgstr "ქსელური ს�ქ�ღ�ლდეების მენიუ"
 
 #. Name
 #: menuext/system/systemmenu.desktop:2
 msgid "System Menu"
-msgstr "სისტემის მენიუ"
+msgstr "სისტემური მენიუ"
 
 #. Comment
 #: menuext/system/systemmenu.desktop:4
 msgid "Menu of important system places"
-msgstr "სისტემის მნიშვნელ�ვ�ნ �დგილთ� მენიუ"
+msgstr "სისტემის მნიშვნელ�ვ�ნი �დგილების მენიუ"
 
 #. Name
 #: menuext/tdeprint/printmenu.desktop:2
@@ -369,7 +370,7 @@ msgstr "ბეჭდვის სისტემის მენიუ"
 #. Name
 #: menuext/tom/tom.desktop:2
 msgid "TOM"
-msgstr ""
+msgstr "TOM"
 
 #. Comment
 #: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/kicker-desktops/nl.po b/translations/desktop_files/kicker-desktops/nl.po
index 1b0c32ebd..bbed82d27 100644
--- a/translations/desktop_files/kicker-desktops/nl.po
+++ b/translations/desktop_files/kicker-desktops/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 16:24+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: 2024-12-22 23:32+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kicker-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -39,14 +40,12 @@ msgstr "Directe toegang tot uw veelgebruikte programma's"
 #. Name
 #: applets/lockout/lockout.desktop:3
 msgid "Lock/Logout Buttons"
-msgstr "Vergrendel/afmeldknoppen"
+msgstr "Vergrendel-/Afmeldknoppen"
 
 #. Comment
 #: applets/lockout/lockout.desktop:5
 msgid "Adds buttons for locking screen and session logout"
-msgstr ""
-"Voegt knoppen toe voor het vergrendelen van het scherm en het afsluiten van "
-"de sessie"
+msgstr "Voegt knoppen toe voor schermvergrendeling en afsluiten van de sessie"
 
 #. Name
 #: applets/media/mediaapplet.desktop:3
@@ -60,55 +59,53 @@ msgstr "Directe toegang tot uw opslagmedia"
 
 #. Name
 #: applets/menu/menuapplet.desktop:4
-#, fuzzy
 msgid "Menu"
-msgstr "TDE-menu"
+msgstr "Menu"
 
 #. Comment
 #: applets/menu/menuapplet.desktop:6
 msgid "Applet embedding standalone menubars"
-msgstr "Een applet die losstaande menubalken insluit"
+msgstr "Een applet dat losse menubalken samenvoegt"
 
 #. Name
 #: applets/minipager/minipagerapplet.desktop:4
 msgid "Desktop Preview & Pager"
-msgstr "Bureaubladvoorbeeld en pager"
+msgstr "Bureaubladvoorvertoning en -wisselaar"
 
 #. Comment
 #: applets/minipager/minipagerapplet.desktop:6
 msgid "Preview, manage and switch to multiple virtual desktops"
-msgstr "Vooruitblik, beheer en schakel naar meerdere virtuele bureaubladen"
+msgstr "Bekijk, beheer en schakel tussen meerdere virtuele werkbladen"
 
 #. Name
 #: applets/naughty/naughtyapplet.desktop:3
 msgid "Runaway Process Catcher"
-msgstr "Processenmonitor"
+msgstr "Procesmonitor"
 
 #. Comment
 #: applets/naughty/naughtyapplet.desktop:5
 msgid "Detect and end broken processes which consume too much CPU time"
-msgstr ""
-"Detecteer en stop gebroken processen die teveel processortijd consumeren"
+msgstr "Detecteer en stop vastgelopen processen"
 
 #. Name
 #: applets/run/runapplet.desktop:3
 msgid "Run Command"
-msgstr "Commando uitvoeren"
+msgstr "Opdracht uitvoeren"
 
 #. Comment
 #: applets/run/runapplet.desktop:5
 msgid "Launch single commands without a terminal window"
-msgstr "Voer losse commando's uit zonder een terminalvenster"
+msgstr "Voer losse opdrachten uit zonder een terminalvenster"
 
 #. Name
 #: applets/swallow/swallowapplet.desktop:3
 msgid "Swallow Applet"
-msgstr "Inbeddingsapplet"
+msgstr "Insluitapplet"
 
 #. Comment
 #: applets/swallow/swallowapplet.desktop:5
 msgid "The swallow panel applet"
-msgstr "Applet voor het inbedden van X-toepassingen"
+msgstr "Een applet voor het insluiten van X-programma's"
 
 #. Name
 #: applets/systemtray/systemtrayapplet.desktop:3
@@ -118,7 +115,7 @@ msgstr "Systeemvak"
 #. Comment
 #: applets/systemtray/systemtrayapplet.desktop:5
 msgid "The system tray panel applet"
-msgstr "De systeemvak paneelapplet"
+msgstr "De systeemvak-paneelapplet"
 
 #. Name
 #: applets/taskbar/taskbarapplet.desktop:3
@@ -145,22 +142,22 @@ msgstr ""
 #. Name
 #: extensions/dockbar/dockbarextension.desktop:2
 msgid "Dock Application Bar"
-msgstr "Extra systeemvak"
+msgstr "Dockbalk"
 
 #. Comment
 #: extensions/dockbar/dockbarextension.desktop:4
 msgid "Dock application bar extension."
-msgstr "Een balk waarin toepassingen hun pictogram kunnen plaatsen"
+msgstr "Een balk waarop programma's een pictogram kunnen plaatsen."
 
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr "Kasbar"
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
 msgid "An alternative taskbar panel applet."
-msgstr "Een alternatieve taakbalk paneelapplet."
+msgstr "Een alternatieve taakbalkapplet."
 
 #. Name
 #: extensions/sidebar/sidebarextension.desktop:2
@@ -170,7 +167,7 @@ msgstr "Universele zijbalk"
 #. Comment
 #: extensions/sidebar/sidebarextension.desktop:4
 msgid "Wrapper around Konqueror's navigation panel"
-msgstr "Een container rond Konqueror's navigatiepaneel"
+msgstr "Een applet voor Konquerors navigatiepaneel"
 
 #. Name
 #: extensions/taskbar/taskbarextension.desktop:2
@@ -180,7 +177,7 @@ msgstr "Externe taakbalk"
 #. Comment
 #: extensions/taskbar/taskbarextension.desktop:4
 msgid "External taskbar panel extension"
-msgstr "Externe taakbalk"
+msgstr "Een applet met een externe taakbalk"
 
 #. Name
 #: kicker/buttons/bookmarks.desktop:2
@@ -190,17 +187,17 @@ msgstr "Bladwijzermenu"
 #. Comment
 #: kicker/buttons/bookmarks.desktop:4
 msgid "Your Konqueror bookmarks"
-msgstr "Uw bladwijzers in Konqueror"
+msgstr "Uw Konqueror-bladwijzers"
 
 #. Name
 #: kicker/buttons/browser.desktop:2
 msgid "Quick File Browser"
-msgstr ""
+msgstr "Bestandsbeheer"
 
 #. Comment
 #: kicker/buttons/browser.desktop:4
 msgid "A menu that lists files in a given folder"
-msgstr "Een menu dat de bestanden uit de opgegeven map toont"
+msgstr "Een menu dat bestanden uit een opgegeven map toont"
 
 #. Name
 #: kicker/buttons/desktop.desktop:2
@@ -251,12 +248,12 @@ msgstr "Paneel"
 #. Comment
 #: kicker/core/childpanelextension.desktop:4
 msgid "Child panel extension."
-msgstr "Dochterpaneelextensie."
+msgstr "Dochterpaneel-applet."
 
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Een zoekplug-in voor Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -266,7 +263,7 @@ msgstr "Paneel instellen"
 #. Name
 #: kicker/panel.desktop:10
 msgid "Trinity Panel"
-msgstr "Trinity Paneel"
+msgstr "Trinity-paneel"
 
 #. Name
 #: menuext/find/find.desktop:2
@@ -276,7 +273,7 @@ msgstr "Zoeken"
 #. Comment
 #: menuext/find/find.desktop:4
 msgid "Menu for starting a file or web search"
-msgstr "Menu voor het zoeken naar bestanden of op internet"
+msgstr "Een menu voor het zoeken naar bestanden of op internet"
 
 #. Name
 #: menuext/find/kfind.desktop:11
@@ -286,19 +283,17 @@ msgstr "Bestanden zoeken"
 #. Name
 #: menuext/find/websearch.desktop:8
 msgid "Web Search"
-msgstr "Web-zoekopdracht"
+msgstr "Online-zoekopdracht"
 
 #. Name
 #: menuext/kate/katesessionmenu.desktop:2
 msgid "Kate Session Menu"
-msgstr "Kate sessiemenu"
+msgstr "Kate-sessiemenu"
 
 #. Comment
 #: menuext/kate/katesessionmenu.desktop:4
 msgid "Allows you to open Kate with a specified session, or create a new one"
-msgstr ""
-"Stelt u in staat om Kate te openen met een opgegeven sessie, of u kunt een "
-"nieuwe sessie aanmaken"
+msgstr "Open Kate met een opgegeven sessie of maak een nieuwe aan"
 
 #. Name
 #: menuext/konq-profiles/konquerormenu.desktop:2
@@ -308,28 +303,29 @@ msgstr "Konqueror-profielen"
 #. Comment
 #: menuext/konq-profiles/konquerormenu.desktop:4
 msgid "Menu for accessing the Konqueror profiles"
-msgstr "Menu voor toegang tot de Konqueror-profielen"
+msgstr "Een menu met toegang tot Konqueror-profielen"
 
 #. Name
 #: menuext/konsole/konsolemenu.desktop:2
 msgid "Terminal Sessions"
-msgstr "Terminal-sessies"
+msgstr "Terminalsessies"
 
 #. Comment
 #: menuext/konsole/konsolemenu.desktop:4
 msgid "Menu for starting a terminal emulator with a session or bookmark"
 msgstr ""
-"Menu voor het starten van een terminalemulatie met een sessie of bladwijzer"
+"Een menu voor het starten van een terminalemulator met een sessie of "
+"bladwijzer"
 
 #. Name
 #: menuext/prefmenu/prefmenu.desktop:2
 msgid "Trinity Control Center"
-msgstr "Configuratiecentrum"
+msgstr "TDE-systeeminstellingen"
 
 #. Comment
 #: menuext/prefmenu/prefmenu.desktop:4
 msgid "Trinity Control Center modules menu"
-msgstr "Menu met Configuratiemodules"
+msgstr "Een menu met systeeminstellingenmodules"
 
 #. Name
 #: menuext/recentdocs/recentdocs.desktop:2
@@ -339,7 +335,7 @@ msgstr "Recente documenten"
 #. Comment
 #: menuext/recentdocs/recentdocs.desktop:4
 msgid "Menu of documents you have used recently"
-msgstr "Menu met documenten die u recentelijk hebt geopend"
+msgstr "Menu met documenten die u onlangs heeft geopend"
 
 #. Name
 #: menuext/remote/remotemenu.desktop:2
@@ -349,7 +345,7 @@ msgstr "Netwerkmappen"
 #. Comment
 #: menuext/remote/remotemenu.desktop:4
 msgid "Menu of network folders"
-msgstr "Menu met netwerkmappen"
+msgstr "Een menu met netwerkmappen"
 
 #. Name
 #: menuext/system/systemmenu.desktop:2
@@ -359,7 +355,7 @@ msgstr "Systeemmenu"
 #. Comment
 #: menuext/system/systemmenu.desktop:4
 msgid "Menu of important system places"
-msgstr "Menu met belangrijke systeemgebieden"
+msgstr "Een menu met belangrijke systeemlocaties"
 
 #. Name
 #: menuext/tdeprint/printmenu.desktop:2
@@ -369,12 +365,12 @@ msgstr "Afdruksysteem"
 #. Comment
 #: menuext/tdeprint/printmenu.desktop:4
 msgid "Menu for the print system"
-msgstr "Menu voor het afdruksysteem"
+msgstr "Een menu voor het afdruksysteem"
 
 #. Name
 #: menuext/tom/tom.desktop:2
 msgid "TOM"
-msgstr ""
+msgstr "TOM"
 
 #. Comment
 #: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/kicker-desktops/ru.po b/translations/desktop_files/kicker-desktops/ru.po
index 1ca530d66..906038362 100644
--- a/translations/desktop_files/kicker-desktops/ru.po
+++ b/translations/desktop_files/kicker-desktops/ru.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024, 2025.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-19 16:24+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-07-04 11:39+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kicker-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -49,7 +52,7 @@ msgstr "Добавление кнопок выхода из TDE и запираÐ
 #. Name
 #: applets/media/mediaapplet.desktop:3
 msgid "Storage Media"
-msgstr "У�трой�тва хранени� данных"
+msgstr "�о�ители данных"
 
 #. Comment
 #: applets/media/mediaapplet.desktop:5
@@ -153,7 +156,7 @@ msgstr "Ра�ширение панели дл� в�траивани� прил
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
@@ -253,7 +256,7 @@ msgstr "Ра�ширение дочерней панели"
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Модуль пои�ка дл� Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -368,7 +371,7 @@ msgstr "Бы�трый до�туп к �и�теме печати"
 #. Name
 #: menuext/tom/tom.desktop:2
 msgid "TOM"
-msgstr ""
+msgstr "TOM"
 
 #. Comment
 #: menuext/tom/tom.desktop:4
diff --git a/translations/desktop_files/klipper-desktops/af.po b/translations/desktop_files/klipper-desktops/af.po
index d70e370f5..ff8bbfd9e 100644
--- a/translations/desktop_files/klipper-desktops/af.po
+++ b/translations/desktop_files/klipper-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ar.po b/translations/desktop_files/klipper-desktops/ar.po
index 98faf7a63..02bfe225d 100644
--- a/translations/desktop_files/klipper-desktops/ar.po
+++ b/translations/desktop_files/klipper-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/az.po b/translations/desktop_files/klipper-desktops/az.po
index 57bd96fed..9338af925 100644
--- a/translations/desktop_files/klipper-desktops/az.po
+++ b/translations/desktop_files/klipper-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/be.po b/translations/desktop_files/klipper-desktops/be.po
index acafcf5ad..5b4af87f5 100644
--- a/translations/desktop_files/klipper-desktops/be.po
+++ b/translations/desktop_files/klipper-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/bg.po b/translations/desktop_files/klipper-desktops/bg.po
index 196ba654d..4ec34e487 100644
--- a/translations/desktop_files/klipper-desktops/bg.po
+++ b/translations/desktop_files/klipper-desktops/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/bn.po b/translations/desktop_files/klipper-desktops/bn.po
index a8f62934e..24b1a4fb4 100644
--- a/translations/desktop_files/klipper-desktops/bn.po
+++ b/translations/desktop_files/klipper-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "ক�লিপার"
diff --git a/translations/desktop_files/klipper-desktops/br.po b/translations/desktop_files/klipper-desktops/br.po
index bb09950a9..e3671a5cb 100644
--- a/translations/desktop_files/klipper-desktops/br.po
+++ b/translations/desktop_files/klipper-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/bs.po b/translations/desktop_files/klipper-desktops/bs.po
index e174973c3..c7ddd4337 100644
--- a/translations/desktop_files/klipper-desktops/bs.po
+++ b/translations/desktop_files/klipper-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ca.po b/translations/desktop_files/klipper-desktops/ca.po
index 597fed9cf..2cc1913b5 100644
--- a/translations/desktop_files/klipper-desktops/ca.po
+++ b/translations/desktop_files/klipper-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/cs.po b/translations/desktop_files/klipper-desktops/cs.po
index e581563a1..459f77f92 100644
--- a/translations/desktop_files/klipper-desktops/cs.po
+++ b/translations/desktop_files/klipper-desktops/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2024-09-05 17:36+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/klipper-desktop-files/cs/>\n"
@@ -15,7 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr "Kopírovat celou cestu"
 
 #. Name
 #: klipper.desktop:2
diff --git a/translations/desktop_files/klipper-desktops/csb.po b/translations/desktop_files/klipper-desktops/csb.po
index 64f6f0818..c393d5933 100644
--- a/translations/desktop_files/klipper-desktops/csb.po
+++ b/translations/desktop_files/klipper-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/cy.po b/translations/desktop_files/klipper-desktops/cy.po
index 89181d71c..f49d7027b 100644
--- a/translations/desktop_files/klipper-desktops/cy.po
+++ b/translations/desktop_files/klipper-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/da.po b/translations/desktop_files/klipper-desktops/da.po
index 465e8f842..45f60c104 100644
--- a/translations/desktop_files/klipper-desktops/da.po
+++ b/translations/desktop_files/klipper-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/de.po b/translations/desktop_files/klipper-desktops/de.po
index 18a9ebe74..3f1113701 100644
--- a/translations/desktop_files/klipper-desktops/de.po
+++ b/translations/desktop_files/klipper-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/el.po b/translations/desktop_files/klipper-desktops/el.po
index 05e21550b..4d8afb339 100644
--- a/translations/desktop_files/klipper-desktops/el.po
+++ b/translations/desktop_files/klipper-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/en_GB.po b/translations/desktop_files/klipper-desktops/en_GB.po
index 33a67894f..f84411c8f 100644
--- a/translations/desktop_files/klipper-desktops/en_GB.po
+++ b/translations/desktop_files/klipper-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/eo.po b/translations/desktop_files/klipper-desktops/eo.po
index 168587fd1..b174c6be6 100644
--- a/translations/desktop_files/klipper-desktops/eo.po
+++ b/translations/desktop_files/klipper-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "Po�ilo"
diff --git a/translations/desktop_files/klipper-desktops/es.po b/translations/desktop_files/klipper-desktops/es.po
index 0fa0f4080..8dbc0b5ff 100644
--- a/translations/desktop_files/klipper-desktops/es.po
+++ b/translations/desktop_files/klipper-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/es_AR.po b/translations/desktop_files/klipper-desktops/es_AR.po
new file mode 100644
index 000000000..3cc01d748
--- /dev/null
+++ b/translations/desktop_files/klipper-desktops/es_AR.po
@@ -0,0 +1,135 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/klipper-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
+#: klipper.desktop:2
+msgid "Klipper"
+msgstr "Klipper"
+
+#. GenericName
+#: klipper.desktop:4
+msgid "Clipboard Tool"
+msgstr "Herramienta de portapapeles"
+
+#. Comment
+#: klipper.desktop:6
+msgid "A cut & paste history utility"
+msgstr "Una utilidad de historial de cortar y pegar"
+
+#. Description
+#: klipperrc.desktop:9
+msgid "Jpeg-Image"
+msgstr "Imagen Jpeg"
+
+#. Description
+#: klipperrc.desktop:14
+msgid "Launch K&View"
+msgstr "Lanzar K&View"
+
+#. Description
+#: klipperrc.desktop:19
+msgid "Web-URL"
+msgstr "URL Web"
+
+#. Description
+#: klipperrc.desktop:24 klipperrc.desktop:116
+msgid "Open with &Konqueror"
+msgstr "Abrir con &Konqueror"
+
+#. Description
+#: klipperrc.desktop:29 klipperrc.desktop:126
+msgid "Open with &Mozilla"
+msgstr "Abrir con &Mozilla"
+
+#. Description
+#: klipperrc.desktop:35 klipperrc.desktop:86 klipperrc.desktop:101
+#: klipperrc.desktop:131
+msgid "Send &URL"
+msgstr "Enviar &URL"
+
+#. Description
+#: klipperrc.desktop:40
+msgid "Open with &Firefox"
+msgstr "Abrir con &Firefox"
+
+#. Description
+#: klipperrc.desktop:46
+msgid "Send &Page"
+msgstr "Enviar &Página"
+
+#. Description
+#: klipperrc.desktop:51
+msgid "Mail-URL"
+msgstr "URL de correo"
+
+#. Description
+#: klipperrc.desktop:56
+msgid "Launch &Kmail"
+msgstr "Lanzar &Kmail"
+
+#. Description
+#: klipperrc.desktop:61
+msgid "Launch &mutt"
+msgstr "Lanzar &mutt"
+
+#. Description
+#: klipperrc.desktop:66
+msgid "Text File"
+msgstr "Archivo de texto"
+
+#. Description
+#: klipperrc.desktop:71
+msgid "Launch K&Edit"
+msgstr "Lanzar K&Edit"
+
+#. Description
+#: klipperrc.desktop:76
+msgid "Launch K&Write"
+msgstr "Lanzar K&Write"
+
+#. Description
+#: klipperrc.desktop:81
+msgid "Local file URL"
+msgstr "URL de archivo local"
+
+#. Description
+#: klipperrc.desktop:91 klipperrc.desktop:106 klipperrc.desktop:136
+msgid "Send &File"
+msgstr "Enviar &Archivo"
+
+#. Description
+#: klipperrc.desktop:96
+msgid "Gopher URL"
+msgstr "URL de Gopher"
+
+#. Description
+#: klipperrc.desktop:111
+msgid "ftp URL"
+msgstr "URL de ftp"
+
+#. Description
+#: klipperrc.desktop:121
+msgid "Open with &Netscape"
+msgstr "Abrir con &Netscape"
diff --git a/translations/desktop_files/klipper-desktops/et.po b/translations/desktop_files/klipper-desktops/et.po
index 42f41316a..45dde01ee 100644
--- a/translations/desktop_files/klipper-desktops/et.po
+++ b/translations/desktop_files/klipper-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/eu.po b/translations/desktop_files/klipper-desktops/eu.po
index 5b5d8595b..eaed5e61b 100644
--- a/translations/desktop_files/klipper-desktops/eu.po
+++ b/translations/desktop_files/klipper-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/fa.po b/translations/desktop_files/klipper-desktops/fa.po
index 54d99d18d..0a0cb81bb 100644
--- a/translations/desktop_files/klipper-desktops/fa.po
+++ b/translations/desktop_files/klipper-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/fi.po b/translations/desktop_files/klipper-desktops/fi.po
index a38f9e058..814cfb282 100644
--- a/translations/desktop_files/klipper-desktops/fi.po
+++ b/translations/desktop_files/klipper-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/fo.po b/translations/desktop_files/klipper-desktops/fo.po
index 24898424a..87472baf4 100644
--- a/translations/desktop_files/klipper-desktops/fo.po
+++ b/translations/desktop_files/klipper-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/fr.po b/translations/desktop_files/klipper-desktops/fr.po
index 47bda7c0d..916966f13 100644
--- a/translations/desktop_files/klipper-desktops/fr.po
+++ b/translations/desktop_files/klipper-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/fy.po b/translations/desktop_files/klipper-desktops/fy.po
index 41d9b98df..5d38eb0c4 100644
--- a/translations/desktop_files/klipper-desktops/fy.po
+++ b/translations/desktop_files/klipper-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ga.po b/translations/desktop_files/klipper-desktops/ga.po
index 66b7900ec..b297c1f02 100644
--- a/translations/desktop_files/klipper-desktops/ga.po
+++ b/translations/desktop_files/klipper-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/gl.po b/translations/desktop_files/klipper-desktops/gl.po
index 7a3787d61..42f45f389 100644
--- a/translations/desktop_files/klipper-desktops/gl.po
+++ b/translations/desktop_files/klipper-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/he.po b/translations/desktop_files/klipper-desktops/he.po
index 2722e6bda..6222082ba 100644
--- a/translations/desktop_files/klipper-desktops/he.po
+++ b/translations/desktop_files/klipper-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/hi.po b/translations/desktop_files/klipper-desktops/hi.po
index 5de094a7a..a7a2043f8 100644
--- a/translations/desktop_files/klipper-desktops/hi.po
+++ b/translations/desktop_files/klipper-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "क�लिपर"
diff --git a/translations/desktop_files/klipper-desktops/hr.po b/translations/desktop_files/klipper-desktops/hr.po
index 3054dff6f..7e3590045 100644
--- a/translations/desktop_files/klipper-desktops/hr.po
+++ b/translations/desktop_files/klipper-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/hu.po b/translations/desktop_files/klipper-desktops/hu.po
index ac2ab2685..b9cea8015 100644
--- a/translations/desktop_files/klipper-desktops/hu.po
+++ b/translations/desktop_files/klipper-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/is.po b/translations/desktop_files/klipper-desktops/is.po
index f47bc2909..8c013dbaf 100644
--- a/translations/desktop_files/klipper-desktops/is.po
+++ b/translations/desktop_files/klipper-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/it.po b/translations/desktop_files/klipper-desktops/it.po
index 260f6c027..4243c8364 100644
--- a/translations/desktop_files/klipper-desktops/it.po
+++ b/translations/desktop_files/klipper-desktops/it.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2022-01-19 02:00+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2024-09-26 03:10+0000\n"
 "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
 "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/klipper-desktop-files/it/>\n"
@@ -15,7 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr "Copia il percorso completo"
 
 #. Name
 #: klipper.desktop:2
diff --git a/translations/desktop_files/klipper-desktops/ja.po b/translations/desktop_files/klipper-desktops/ja.po
index 88b98ae33..a67738793 100644
--- a/translations/desktop_files/klipper-desktops/ja.po
+++ b/translations/desktop_files/klipper-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ka.po b/translations/desktop_files/klipper-desktops/ka.po
index 88107f2ff..600813fec 100644
--- a/translations/desktop_files/klipper-desktops/ka.po
+++ b/translations/desktop_files/klipper-desktops/ka.po
@@ -1,35 +1,41 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/klipper-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr "სრული ბილიკის კ�პირებ�"
 
 #. Name
 #: klipper.desktop:2
 msgid "Klipper"
-msgstr ""
+msgstr "Klipper"
 
 #. GenericName
 #: klipper.desktop:4
 msgid "Clipboard Tool"
-msgstr "გ�ცვლის ბუფერის უტილიტ�"
+msgstr "გ�ცვლის ბუფერის პრ�გრ�მ�"
 
 #. Comment
 #: klipper.desktop:6
 msgid "A cut & paste history utility"
-msgstr ""
+msgstr "�მ�ჭრის დ� ჩ�სმის ისტ�რიის პრ�გრ�მ�"
 
 #. Description
 #: klipperrc.desktop:9
@@ -39,7 +45,7 @@ msgstr "jpeg გ�მ�ს�ხულებ�"
 #. Description
 #: klipperrc.desktop:14
 msgid "Launch K&View"
-msgstr "K&View გ�შვებ�"
+msgstr "K&View-ის გ�შვებ�"
 
 #. Description
 #: klipperrc.desktop:19
@@ -60,7 +66,7 @@ msgstr "&Mozilla-ში გ�სნ�"
 #: klipperrc.desktop:35 klipperrc.desktop:86 klipperrc.desktop:101
 #: klipperrc.desktop:131
 msgid "Send &URL"
-msgstr "&URL-ს გ�გზ�ვნ�"
+msgstr "&URL-ის გ�გზ�ვნ�"
 
 #. Description
 #: klipperrc.desktop:40
@@ -75,7 +81,7 @@ msgstr "&გვერდის გ�გზ�ვნ�"
 #. Description
 #: klipperrc.desktop:51
 msgid "Mail-URL"
-msgstr ""
+msgstr "ელფ�სტის მის�მ�რთი"
 
 #. Description
 #: klipperrc.desktop:56
@@ -115,7 +121,7 @@ msgstr "&ფ�ილის გ�გზ�ვნ�"
 #. Description
 #: klipperrc.desktop:96
 msgid "Gopher URL"
-msgstr "Gopher ბმული"
+msgstr "Gopher-ის ბმული"
 
 #. Description
 #: klipperrc.desktop:111
@@ -125,4 +131,4 @@ msgstr "FTP ბმული"
 #. Description
 #: klipperrc.desktop:121
 msgid "Open with &Netscape"
-msgstr "&Netscape-სი გ�ხსნ�"
+msgstr "&Netscape-ით გ�ხსნ�"
diff --git a/translations/desktop_files/klipper-desktops/kk.po b/translations/desktop_files/klipper-desktops/kk.po
index 53507838e..65f492aec 100644
--- a/translations/desktop_files/klipper-desktops/kk.po
+++ b/translations/desktop_files/klipper-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "�лма�у буфері"
diff --git a/translations/desktop_files/klipper-desktops/klipper-desktops.pot b/translations/desktop_files/klipper-desktops/klipper-desktops.pot
index 120288cc5..3f75a89b5 100644
--- a/translations/desktop_files/klipper-desktops/klipper-desktops.pot
+++ b/translations/desktop_files/klipper-desktops/klipper-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/km.po b/translations/desktop_files/klipper-desktops/km.po
index d68334286..f60809314 100644
--- a/translations/desktop_files/klipper-desktops/km.po
+++ b/translations/desktop_files/klipper-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ko.po b/translations/desktop_files/klipper-desktops/ko.po
index bdd08c4ea..0981509c7 100644
--- a/translations/desktop_files/klipper-desktops/ko.po
+++ b/translations/desktop_files/klipper-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/lo.po b/translations/desktop_files/klipper-desktops/lo.po
index 9b33978ab..8b5a0d1b2 100644
--- a/translations/desktop_files/klipper-desktops/lo.po
+++ b/translations/desktop_files/klipper-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "ຄິບເປີ້ - K"
diff --git a/translations/desktop_files/klipper-desktops/lt.po b/translations/desktop_files/klipper-desktops/lt.po
index 417fc1bce..5a11d169c 100644
--- a/translations/desktop_files/klipper-desktops/lt.po
+++ b/translations/desktop_files/klipper-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/lv.po b/translations/desktop_files/klipper-desktops/lv.po
index 4d1d710b6..f1c2be1c3 100644
--- a/translations/desktop_files/klipper-desktops/lv.po
+++ b/translations/desktop_files/klipper-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "Klippers"
diff --git a/translations/desktop_files/klipper-desktops/mk.po b/translations/desktop_files/klipper-desktops/mk.po
index cb7d80eaa..9bd27e683 100644
--- a/translations/desktop_files/klipper-desktops/mk.po
+++ b/translations/desktop_files/klipper-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "Клипер"
diff --git a/translations/desktop_files/klipper-desktops/mn.po b/translations/desktop_files/klipper-desktops/mn.po
index e63a21a34..1d8c13157 100644
--- a/translations/desktop_files/klipper-desktops/mn.po
+++ b/translations/desktop_files/klipper-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ms.po b/translations/desktop_files/klipper-desktops/ms.po
index d0b55c69f..c9d34a9fb 100644
--- a/translations/desktop_files/klipper-desktops/ms.po
+++ b/translations/desktop_files/klipper-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/mt.po b/translations/desktop_files/klipper-desktops/mt.po
index 1c1f4180f..fabbbd08e 100644
--- a/translations/desktop_files/klipper-desktops/mt.po
+++ b/translations/desktop_files/klipper-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/nb.po b/translations/desktop_files/klipper-desktops/nb.po
index 85e172647..9f2fba4ea 100644
--- a/translations/desktop_files/klipper-desktops/nb.po
+++ b/translations/desktop_files/klipper-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/nds.po b/translations/desktop_files/klipper-desktops/nds.po
index d2b1b1049..6343545a2 100644
--- a/translations/desktop_files/klipper-desktops/nds.po
+++ b/translations/desktop_files/klipper-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ne.po b/translations/desktop_files/klipper-desktops/ne.po
index 92b8c3c89..3ebfe2a1c 100644
--- a/translations/desktop_files/klipper-desktops/ne.po
+++ b/translations/desktop_files/klipper-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "क�लिपर"
diff --git a/translations/desktop_files/klipper-desktops/nl.po b/translations/desktop_files/klipper-desktops/nl.po
index 0c32e949e..ab2661996 100644
--- a/translations/desktop_files/klipper-desktops/nl.po
+++ b/translations/desktop_files/klipper-desktops/nl.po
@@ -1,25 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2025-01-08 21:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/klipper-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr "Volledige locatie kopiëren"
 
 #. Name
 #: klipper.desktop:2
 msgid "Klipper"
-msgstr ""
+msgstr "Klipper"
 
 #. GenericName
 #: klipper.desktop:4
@@ -44,7 +50,7 @@ msgstr "K&View opstarten"
 #. Description
 #: klipperrc.desktop:19
 msgid "Web-URL"
-msgstr "Web-URL-adres"
+msgstr "Url"
 
 #. Description
 #: klipperrc.desktop:24 klipperrc.desktop:116
@@ -60,7 +66,7 @@ msgstr "Openen met &Mozilla"
 #: klipperrc.desktop:35 klipperrc.desktop:86 klipperrc.desktop:101
 #: klipperrc.desktop:131
 msgid "Send &URL"
-msgstr "&URL-adres verzenden"
+msgstr "&Url versturen"
 
 #. Description
 #: klipperrc.desktop:40
@@ -70,22 +76,22 @@ msgstr "Openen met &Firefox"
 #. Description
 #: klipperrc.desktop:46
 msgid "Send &Page"
-msgstr "&Pagina verzenden"
+msgstr "&Pagina versturen"
 
 #. Description
 #: klipperrc.desktop:51
 msgid "Mail-URL"
-msgstr "URL-adres e-mailen"
+msgstr "Url per e-mail vesturen"
 
 #. Description
 #: klipperrc.desktop:56
 msgid "Launch &Kmail"
-msgstr "&Kmail opstarten"
+msgstr "&Kmail starten"
 
 #. Description
 #: klipperrc.desktop:61
 msgid "Launch &mutt"
-msgstr "&Mutt opstarten"
+msgstr "&Mutt starten"
 
 #. Description
 #: klipperrc.desktop:66
@@ -95,32 +101,32 @@ msgstr "Tekstbestand"
 #. Description
 #: klipperrc.desktop:71
 msgid "Launch K&Edit"
-msgstr "K&Edit opstarten"
+msgstr "K&Edit starten"
 
 #. Description
 #: klipperrc.desktop:76
 msgid "Launch K&Write"
-msgstr "K&Write opstarten"
+msgstr "K&Write starten"
 
 #. Description
 #: klipperrc.desktop:81
 msgid "Local file URL"
-msgstr "Lokaal bestands-URL-adres"
+msgstr "Lokale bestandsurl"
 
 #. Description
 #: klipperrc.desktop:91 klipperrc.desktop:106 klipperrc.desktop:136
 msgid "Send &File"
-msgstr "&Bestand verzenden"
+msgstr "&Bestand versturen"
 
 #. Description
 #: klipperrc.desktop:96
 msgid "Gopher URL"
-msgstr "Gopher URL-adres"
+msgstr "Gopher-url"
 
 #. Description
 #: klipperrc.desktop:111
 msgid "ftp URL"
-msgstr "FTP URL-adres"
+msgstr "Ftp-url"
 
 #. Description
 #: klipperrc.desktop:121
diff --git a/translations/desktop_files/klipper-desktops/nn.po b/translations/desktop_files/klipper-desktops/nn.po
index 47d97f962..13d5d565e 100644
--- a/translations/desktop_files/klipper-desktops/nn.po
+++ b/translations/desktop_files/klipper-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/nso.po b/translations/desktop_files/klipper-desktops/nso.po
index 8a254fbbe..4ab6076d1 100644
--- a/translations/desktop_files/klipper-desktops/nso.po
+++ b/translations/desktop_files/klipper-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/pa.po b/translations/desktop_files/klipper-desktops/pa.po
index 6117d520c..aadfadd9a 100644
--- a/translations/desktop_files/klipper-desktops/pa.po
+++ b/translations/desktop_files/klipper-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "ਕੇਲਿਪਰ"
diff --git a/translations/desktop_files/klipper-desktops/pl.po b/translations/desktop_files/klipper-desktops/pl.po
index ea8cbc98e..c2a0cc587 100644
--- a/translations/desktop_files/klipper-desktops/pl.po
+++ b/translations/desktop_files/klipper-desktops/pl.po
@@ -1,20 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\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"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2024-08-25 12:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/klipper-desktop-files/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr "Kopiuj pełną ścieżkę"
 
 #. Name
 #: klipper.desktop:2
diff --git a/translations/desktop_files/klipper-desktops/pt.po b/translations/desktop_files/klipper-desktops/pt.po
index 0f91e0702..8e2cc658c 100644
--- a/translations/desktop_files/klipper-desktops/pt.po
+++ b/translations/desktop_files/klipper-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/pt_BR.po b/translations/desktop_files/klipper-desktops/pt_BR.po
index 8301a3c1f..d67f7f544 100644
--- a/translations/desktop_files/klipper-desktops/pt_BR.po
+++ b/translations/desktop_files/klipper-desktops/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ro.po b/translations/desktop_files/klipper-desktops/ro.po
index c12f9147e..6409e5824 100644
--- a/translations/desktop_files/klipper-desktops/ro.po
+++ b/translations/desktop_files/klipper-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ru.po b/translations/desktop_files/klipper-desktops/ru.po
index b934bb3a6..3cc1ce91d 100644
--- a/translations/desktop_files/klipper-desktops/ru.po
+++ b/translations/desktop_files/klipper-desktops/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2023-12-09 05:14+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2024-09-29 19:45+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/klipper-desktop-files/ru/>\n"
@@ -19,6 +19,11 @@ msgstr ""
 "X-Generator: Weblate 4.17\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr "Копировать полный путь"
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "Монитор буфера обмена"
diff --git a/translations/desktop_files/klipper-desktops/rw.po b/translations/desktop_files/klipper-desktops/rw.po
index d06d9c362..d9e7f0b77 100644
--- a/translations/desktop_files/klipper-desktops/rw.po
+++ b/translations/desktop_files/klipper-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/se.po b/translations/desktop_files/klipper-desktops/se.po
index 8b44924e7..fea793240 100644
--- a/translations/desktop_files/klipper-desktops/se.po
+++ b/translations/desktop_files/klipper-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/sk.po b/translations/desktop_files/klipper-desktops/sk.po
index 9416b1549..8dc71f82e 100644
--- a/translations/desktop_files/klipper-desktops/sk.po
+++ b/translations/desktop_files/klipper-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/sl.po b/translations/desktop_files/klipper-desktops/sl.po
index 2863ea6e0..1ab58bb78 100644
--- a/translations/desktop_files/klipper-desktops/sl.po
+++ b/translations/desktop_files/klipper-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/sr.po b/translations/desktop_files/klipper-desktops/sr.po
index 90ecb323e..c897c8fbb 100644
--- a/translations/desktop_files/klipper-desktops/sr.po
+++ b/translations/desktop_files/klipper-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/sr@Latn.po b/translations/desktop_files/klipper-desktops/sr@Latn.po
index 7ba9e8ce6..c7750acec 100644
--- a/translations/desktop_files/klipper-desktops/sr@Latn.po
+++ b/translations/desktop_files/klipper-desktops/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/sv.po b/translations/desktop_files/klipper-desktops/sv.po
index f349a0fe7..d92ed03b3 100644
--- a/translations/desktop_files/klipper-desktops/sv.po
+++ b/translations/desktop_files/klipper-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ta.po b/translations/desktop_files/klipper-desktops/ta.po
index d9509d03a..866985226 100644
--- a/translations/desktop_files/klipper-desktops/ta.po
+++ b/translations/desktop_files/klipper-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "க�ளிப�பர�"
diff --git a/translations/desktop_files/klipper-desktops/te.po b/translations/desktop_files/klipper-desktops/te.po
index 3e515d4f1..aa663b7f0 100644
--- a/translations/desktop_files/klipper-desktops/te.po
+++ b/translations/desktop_files/klipper-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "క�లిప�పర�"
diff --git a/translations/desktop_files/klipper-desktops/tg.po b/translations/desktop_files/klipper-desktops/tg.po
index 88a39313c..0bbef8c43 100644
--- a/translations/desktop_files/klipper-desktops/tg.po
+++ b/translations/desktop_files/klipper-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/th.po b/translations/desktop_files/klipper-desktops/th.po
index 57ada8416..4508371d4 100644
--- a/translations/desktop_files/klipper-desktops/th.po
+++ b/translations/desktop_files/klipper-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "คลิปเปอร์"
diff --git a/translations/desktop_files/klipper-desktops/tr.po b/translations/desktop_files/klipper-desktops/tr.po
index 5ece639ee..469a3d1e5 100644
--- a/translations/desktop_files/klipper-desktops/tr.po
+++ b/translations/desktop_files/klipper-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/tt.po b/translations/desktop_files/klipper-desktops/tt.po
index 5e7849047..81c2c00b9 100644
--- a/translations/desktop_files/klipper-desktops/tt.po
+++ b/translations/desktop_files/klipper-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/uk.po b/translations/desktop_files/klipper-desktops/uk.po
index 549053cd2..e40ca8943 100644
--- a/translations/desktop_files/klipper-desktops/uk.po
+++ b/translations/desktop_files/klipper-desktops/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\n"
+"PO-Revision-Date: 2024-10-02 18:11+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/klipper-desktop-files/uk/>\n"
@@ -14,9 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr "Копіювати повний шл�х"
 
 #. Name
 #: klipper.desktop:2
diff --git a/translations/desktop_files/klipper-desktops/uz.po b/translations/desktop_files/klipper-desktops/uz.po
index 13392455f..84810b283 100644
--- a/translations/desktop_files/klipper-desktops/uz.po
+++ b/translations/desktop_files/klipper-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/uz@cyrillic.po b/translations/desktop_files/klipper-desktops/uz@cyrillic.po
index 432c05075..cfdc23bb1 100644
--- a/translations/desktop_files/klipper-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/klipper-desktops/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/ven.po b/translations/desktop_files/klipper-desktops/ven.po
index 094179c37..34c7b844e 100644
--- a/translations/desktop_files/klipper-desktops/ven.po
+++ b/translations/desktop_files/klipper-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "Kilipara"
diff --git a/translations/desktop_files/klipper-desktops/vi.po b/translations/desktop_files/klipper-desktops/vi.po
index 29897496f..6947ceaf4 100644
--- a/translations/desktop_files/klipper-desktops/vi.po
+++ b/translations/desktop_files/klipper-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "Bảng nháp"
diff --git a/translations/desktop_files/klipper-desktops/wa.po b/translations/desktop_files/klipper-desktops/wa.po
index c872ccfac..fa55dfdc1 100644
--- a/translations/desktop_files/klipper-desktops/wa.po
+++ b/translations/desktop_files/klipper-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/xh.po b/translations/desktop_files/klipper-desktops/xh.po
index 450478ac6..3a9b34533 100644
--- a/translations/desktop_files/klipper-desktops/xh.po
+++ b/translations/desktop_files/klipper-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/zh_CN.po b/translations/desktop_files/klipper-desktops/zh_CN.po
index 185f6b4b6..c248d840b 100644
--- a/translations/desktop_files/klipper-desktops/zh_CN.po
+++ b/translations/desktop_files/klipper-desktops/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/klipper-desktops/zh_TW.po b/translations/desktop_files/klipper-desktops/zh_TW.po
index 6fb27e346..1fb25646b 100644
--- a/translations/desktop_files/klipper-desktops/zh_TW.po
+++ b/translations/desktop_files/klipper-desktops/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr "剪貼薄(Klipper)"
diff --git a/translations/desktop_files/klipper-desktops/zu.po b/translations/desktop_files/klipper-desktops/zu.po
index 4c2d8d427..5a2a9ab51 100644
--- a/translations/desktop_files/klipper-desktops/zu.po
+++ b/translations/desktop_files/klipper-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-21 18:11+0000\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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
+#: copy-full-path.desktop:6
+msgid "Copy full path"
+msgstr ""
+
+#. Name
 #: klipper.desktop:2
 msgid "Klipper"
 msgstr ""
diff --git a/translations/desktop_files/kmenuedit.desktop/es_AR.po b/translations/desktop_files/kmenuedit.desktop/es_AR.po
new file mode 100644
index 000000000..40044ed77
--- /dev/null
+++ b/translations/desktop_files/kmenuedit.desktop/es_AR.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 14:56+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: kmenuedit.desktop:2
+msgid "KMenuEdit"
+msgstr ""
+
+#. GenericName
+#: kmenuedit.desktop:4
+msgid "Menu Editor"
+msgstr ""
diff --git a/translations/desktop_files/kmenuedit.desktop/ka.po b/translations/desktop_files/kmenuedit.desktop/ka.po
index e82e2ab12..4c9de108a 100644
--- a/translations/desktop_files/kmenuedit.desktop/ka.po
+++ b/translations/desktop_files/kmenuedit.desktop/ka.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 14:56+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kmenuedit-kmenueditdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kmenuedit.desktop:2
-#, fuzzy
 msgid "KMenuEdit"
-msgstr "მენიუს რედ�ქტ�რი"
+msgstr "KMenuEdit"
 
 #. GenericName
 #: kmenuedit.desktop:4
diff --git a/translations/desktop_files/kmenuedit.desktop/nl.po b/translations/desktop_files/kmenuedit.desktop/nl.po
index 14ba1edf7..7a5834d54 100644
--- a/translations/desktop_files/kmenuedit.desktop/nl.po
+++ b/translations/desktop_files/kmenuedit.desktop/nl.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 14:56+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kmenuedit-kmenueditdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kmenuedit.desktop:2
-#, fuzzy
 msgid "KMenuEdit"
-msgstr "Menubewerker"
+msgstr "KMenuEdit"
 
 #. GenericName
 #: kmenuedit.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/es_AR.po b/translations/desktop_files/knetattach.desktop/es_AR.po
new file mode 100644
index 000000000..11c3fa4fa
--- /dev/null
+++ b/translations/desktop_files/knetattach.desktop/es_AR.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 14:58+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: knetattach.desktop:2
+msgid "KNetAttach"
+msgstr ""
+
+#. GenericName
+#: knetattach.desktop:4
+msgid "Network Folder Wizard"
+msgstr ""
diff --git a/translations/desktop_files/knetattach.desktop/ka.po b/translations/desktop_files/knetattach.desktop/ka.po
index e319259de..d3fda177e 100644
--- a/translations/desktop_files/knetattach.desktop/ka.po
+++ b/translations/desktop_files/knetattach.desktop/ka.po
@@ -1,27 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 14:58+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
 msgid "Network Folder Wizard"
-msgstr "ქსელურ ს�ქ�რ�ლდეთ� �სტ�ტი"
+msgstr "ქსელური ს�ქ�ღ�ლდეების �სტ�ტი"
diff --git a/translations/desktop_files/knetattach.desktop/nl.po b/translations/desktop_files/knetattach.desktop/nl.po
index 643740128..5b6429466 100644
--- a/translations/desktop_files/knetattach.desktop/nl.po
+++ b/translations/desktop_files/knetattach.desktop/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 14:58+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/knetattach-knetattachdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/konqueror-desktops/es_AR.po b/translations/desktop_files/konqueror-desktops/es_AR.po
new file mode 100644
index 000000000..b50d67639
--- /dev/null
+++ b/translations/desktop_files/konqueror-desktops/es_AR.po
@@ -0,0 +1,405 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2024-11-24 13:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konqueror-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: Home.desktop:7
+msgid "Home"
+msgstr "Principal"
+
+#. GenericName
+#: Home.desktop:9
+#, fuzzy
+msgid "Personal Files"
+msgstr "Archivos personales"
+
+#. Name
+#: about/konq_aboutpage.desktop:3
+#, fuzzy
+msgid "About-Page for Konqueror"
+msgstr "Página 'Acerca de' para Konqueror"
+
+#. Name
+#: iconview/konq_iconview.desktop:3
+#, fuzzy
+msgid "Icon View"
+msgstr "Vista de iconos"
+
+#. Name
+#: iconview/konq_multicolumnview.desktop:3
+#, fuzzy
+msgid "MultiColumn View"
+msgstr "Vista multicolumna"
+
+#. Name
+#: kfmclient.desktop:9 kfmclient_dir.desktop:9 kfmclient_html.desktop:9
+#: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
+#: konquerorsu.desktop:8
+#, fuzzy
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#. GenericName
+#: konqbrowser.desktop:9
+#, fuzzy
+msgid "Web Browser"
+msgstr "Navegador web"
+
+#. Name
+#: konqfilemgr.desktop:7
+#, fuzzy
+msgid "File Manager"
+msgstr "Gestor de archivos"
+
+#. Comment
+#: konqueror.desktop:8
+#, fuzzy
+msgid "TDE File Manager & Web Browser"
+msgstr "Gestor de archivos y navegador web de TDE"
+
+#. GenericName
+#: konquerorsu.desktop:10
+#, fuzzy
+msgid "File Manager - Super User Mode"
+msgstr "Gestor de archivos - modo superusuario"
+
+#. Name
+#: kttsplugin/tdehtmlkttsd.desktop:12
+#, fuzzy
+msgid "Text-to-Speech"
+msgstr "Complemento de Texto-a-Voz"
+
+#. Comment
+#: kttsplugin/tdehtmlkttsd.desktop:14
+msgid "A plugin which enables texts to be read aloud on the web with KTTS"
+msgstr "Un complemento que permite leer textos en voz alta en la web con KTTS"
+
+#. Name
+#: listview/konq_detailedlistview.desktop:3
+#, fuzzy
+msgid "Detailed List View"
+msgstr "Vista de lista detallada"
+
+#. Name
+#: listview/konq_infolistview.desktop:3
+#, fuzzy
+msgid "Info List View"
+msgstr "Vista de lista de información"
+
+#. Name
+#: listview/konq_textview.desktop:3
+#, fuzzy
+msgid "Text View"
+msgstr "Vista de texto"
+
+#. Name
+#: listview/konq_treeview.desktop:3
+#, fuzzy
+msgid "Tree View"
+msgstr "Vista en árbol"
+
+#. Name
+#: preloader/konqy_preload.desktop:4
+#, fuzzy
+msgid "Konqueror Preloading During TDE startup"
+msgstr "Precargado de Konqueror durante el arranque de TDE"
+
+#. Name
+#: preloader/konqy_preloader.desktop:4
+#, fuzzy
+msgid "KDED Konqueror Preloader Module"
+msgstr "Módulo de precarga de Konqueror KDED"
+
+#. Comment
+#: preloader/konqy_preloader.desktop:6
+#, fuzzy
+msgid "Reduces Konqueror startup time"
+msgstr "Reduce el tiempo de inicio de Konqueror"
+
+#. Name
+#: profile_filemanagement.desktop:5
+#, fuzzy
+msgid "File Management"
+msgstr "Administración de archivos"
+
+#. Name
+#: profile_filepreview.desktop:9
+#, fuzzy
+msgid "File Preview"
+msgstr "Vista previa de archivo"
+
+#. Name
+#: profile_kde_devel.desktop:3
+#, fuzzy
+msgid "TDE Development"
+msgstr "Desarrollo de TDE"
+
+#. Name
+#: profile_midnightcommander.desktop:9
+#, fuzzy
+msgid "Midnight Commander"
+msgstr "Midnight Commander"
+
+#. Name
+#: profile_simplebrowser.desktop:2
+#, fuzzy
+msgid "Simple Browser"
+msgstr "Navegador sencillo"
+
+#. Name
+#: profile_tabbedbrowsing.desktop:3
+#, fuzzy
+msgid "Tabbed Browsing"
+msgstr "Navegación con solapas"
+
+#. Name
+#: profile_webbrowsing.desktop:2
+#, fuzzy
+msgid "Web Browsing"
+msgstr "Navegación en Web"
+
+#. Name
+#: quickprint/text-ada-print.desktop:6 quickprint/text-c++-print.desktop:6
+#: quickprint/text-c++h-print.desktop:6 quickprint/text-c-print.desktop:6
+#: quickprint/text-ch-print.desktop:6 quickprint/text-css-print.desktop:6
+#: quickprint/text-diff-print.desktop:6 quickprint/text-html-print.desktop:6
+#: quickprint/text-java-print.desktop:6 quickprint/text-log-print.desktop:6
+#: quickprint/text-makefile-print.desktop:6 quickprint/text-pas-print.desktop:6
+#: quickprint/text-perl-print.desktop:6 quickprint/text-print.desktop:6
+#: quickprint/text-python-print.desktop:6 quickprint/text-tcl-print.desktop:6
+#: quickprint/text-tex-print.desktop:6 quickprint/text-xml-print.desktop:6
+#: quickprint/text-xslt-print.desktop:6
+#, fuzzy
+msgid "Print..."
+msgstr "Imprimir..."
+
+#. Name
+#: remoteencodingplugin/kremoteencodingplugin.desktop:13
+#, fuzzy
+msgid "Remote Encoding"
+msgstr "Complemento de codificación remota"
+
+#. Comment
+#: remoteencodingplugin/kremoteencodingplugin.desktop:15
+msgid "A Plugin for setting the encoding of remote hosts (FTP, SSH, etc.)"
+msgstr ""
+"Un complemento para configurar la codificación de hosts remotos (FTP, SSH, "
+"etc.)"
+
+#. Name
+#: shellcmdplugin/kshellcmdplugin.desktop:15
+msgid "Run Command"
+msgstr "Ejecutar comando"
+
+#. Comment
+#: shellcmdplugin/kshellcmdplugin.desktop:17
+#, fuzzy
+msgid "A plugin which enables commands to be executed within folders"
+msgstr "Complemento para ejecutar órdenes desde Konqueror"
+
+#. Name
+#: sidebar/konq_sidebartng.desktop:4
+#, fuzzy
+msgid "Navigation Panel"
+msgstr "Panel de navegación"
+
+#. Name
+#: sidebar/test/test.desktop:5
+#, fuzzy
+msgid "Test"
+msgstr "Prueba"
+
+#. Name
+#: sidebar/trees/history_module/kcmhistory.desktop:10
+#, fuzzy
+msgid "History Sidebar"
+msgstr "Barra de historial"
+
+#. Comment
+#: sidebar/trees/history_module/kcmhistory.desktop:12
+#, fuzzy
+msgid "Configure the history sidebar"
+msgstr "Configuración de la barra del historial"
+
+#. Keywords
+#: sidebar/trees/history_module/kcmhistory.desktop:14
+msgid "history;expire;"
+msgstr "historial;expiración;"
+
+#. Name
+#: sidebar/trees/init/bookmarks.desktop:6
+#: sidebar/trees/init/bookmarks_module.desktop:6
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#. Comment
+#: sidebar/trees/init/bookmarks.desktop:8
+#: sidebar/trees/init/bookmarks_module.desktop:8
+msgid "This is the list of your bookmarks, for a faster access"
+msgstr "Ésta es la lista de tus marcadores, para un acceso más rápido"
+
+#. Name
+#: sidebar/trees/init/dirtree_module.desktop:5
+#: sidebar/trees/init/virtualfolderadd.desktop:6
+#, fuzzy
+msgid "Folder"
+msgstr "Carpeta"
+
+#. Name
+#: sidebar/trees/init/history.desktop:6
+#: sidebar/trees/init/history_module.desktop:6
+#, fuzzy
+msgid "History"
+msgstr "Historial"
+
+#. Comment
+#: sidebar/trees/init/history.desktop:8
+#: sidebar/trees/init/history_module.desktop:8
+msgid ""
+"This is the history of the URLs you have recently visited. You can sort them "
+"in many ways."
+msgstr ""
+"Éste es el historial con las URLs que has visitado recientemente. Podés "
+"ordenarlas de diversos modos."
+
+#. Name
+#: sidebar/trees/init/home.desktop:6
+#, fuzzy
+msgid "Home Folder"
+msgstr "Carpeta personal"
+
+#. Comment
+#: sidebar/trees/init/home.desktop:8
+msgid "This folder contains your personal files"
+msgstr "Ésta carpeta contiene tus archivos personales"
+
+#. Name
+#: sidebar/trees/init/remote.desktop:2 sidebar/trees/init/remote/.directory:2
+#, fuzzy
+msgid "Network"
+msgstr "Red"
+
+#. Name
+#: sidebar/trees/init/remote/ftp/tde_ftp.desktop:5
+#, fuzzy
+msgid "TDE Official FTP"
+msgstr "FTP oficial de TDE"
+
+#. Name
+#: sidebar/trees/init/remote/web/apps_web.desktop:4
+msgid "TDE Applications"
+msgstr "Programas de TDE"
+
+#. Name
+#: sidebar/trees/init/remote/web/dot_web.desktop:4
+#, fuzzy
+msgid "TDE News"
+msgstr "Noticias de TDE"
+
+#. Name
+#: sidebar/trees/init/remote/web/tde_web.desktop:4
+msgid "TDE Home Page"
+msgstr "Página HOME de TDE"
+
+#. Name
+#: sidebar/trees/init/root.desktop:6
+#, fuzzy
+msgid "Root Folder"
+msgstr "Directorio raiz"
+
+#. Comment
+#: sidebar/trees/init/root.desktop:8
+msgid "This is the root of the filesystem"
+msgstr "Ésta es la raíz del sistema de archivos"
+
+#. Name
+#: sidebar/trees/init/services.desktop:4
+#: sidebar/trees/init/services/.directory:3
+#, fuzzy
+msgid "Services"
+msgstr "Servicios"
+
+#. Name
+#: sidebar/trees/init/services/applications.desktop:5
+msgid "Applications"
+msgstr "Programas"
+
+#. Name
+#: sidebar/trees/init/services/audiocd.desktop:6
+#, fuzzy
+msgid "Audio CD Browser"
+msgstr "Navegador de CD-Audio"
+
+#. Name
+#: sidebar/trees/init/services/media.desktop:5
+#, fuzzy
+msgid "Storage Media"
+msgstr "Dispositivos de almacenamiento"
+
+#. Name
+#: sidebar/trees/init/services/printsystem.desktop:6
+#, fuzzy
+msgid "Print System Browser"
+msgstr "Navegador del sistema de impresión"
+
+#. Name
+#: sidebar/trees/init/services/settings.desktop:5
+#, fuzzy
+msgid "Settings"
+msgstr "Preferencias"
+
+#. Name
+#: sidebar/trees/init/system.desktop:6
+#, fuzzy
+msgid "System"
+msgstr "Sistema"
+
+#. Comment
+#: sidebar/trees/init/system.desktop:8
+msgid "This folder allows you to access common places on your computer"
+msgstr "Ésta carpeta te permite acceder a lugares usuales en tu equipo"
+
+#. Name
+#: sidebar/trees/init/trash.desktop:9
+msgid "Trash Folder"
+msgstr "Carpeta de la Papelera"
+
+#. Comment
+#: sidebar/trees/init/trash.desktop:11
+msgid "This folder displays the contents of your Trash Bin"
+msgstr "Ésta carpeta muestra el contenido de tu papelera de reciclaje"
+
+#. Name
+#: sidebar/web_module/webmodule_add.desktop:5
+#: sidebar/web_module/websidebar.desktop:5
+#, fuzzy
+msgid "Web SideBar Module"
+msgstr "Módulo de la barra lateral de web"
+
+#. Name
+#: sidebar/trees/init/remote/ftp/.directory:2
+#, fuzzy
+msgid "FTP Archives"
+msgstr "Archivos FTP"
+
+#. Name
+#: sidebar/trees/init/remote/web/.directory:2
+msgid "Web Sites"
+msgstr "Sitios y páginas web"
diff --git a/translations/desktop_files/konqueror-desktops/ka.po b/translations/desktop_files/konqueror-desktops/ka.po
index b73600d06..8b7232411 100644
--- a/translations/desktop_files/konqueror-desktops/ka.po
+++ b/translations/desktop_files/konqueror-desktops/ka.po
@@ -1,83 +1,83 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konqueror-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:7
 msgid "Home"
-msgstr "ს�ხლში"
+msgstr "ს�წყისი"
 
 #. GenericName
 #: Home.desktop:9
 msgid "Personal Files"
-msgstr "პირ�დი ს�ქ�ღ�ლდეები"
+msgstr "პირ�დი ფ�ილები"
 
 #. Name
 #: about/konq_aboutpage.desktop:3
 msgid "About-Page for Konqueror"
-msgstr "Konqueror-ის ცნ�ბ�თ� ფურცელი"
+msgstr "Konqueror-ის შეს�ხებ"
 
 #. Name
 #: iconview/konq_iconview.desktop:3
 msgid "Icon View"
-msgstr "ხ�ტულებით ჩვენებ�"
+msgstr "ხ�ტულების ხედი"
 
 #. Name
 #: iconview/konq_multicolumnview.desktop:3
 msgid "MultiColumn View"
-msgstr "რ�მდენიმე სვეტ�დ"
+msgstr "მრ�ვ�ლსვეტი�ნი ხედი"
 
 #. Name
 #: kfmclient.desktop:9 kfmclient_dir.desktop:9 kfmclient_html.desktop:9
 #: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
 #: konquerorsu.desktop:8
 msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
 
 #. GenericName
 #: konqbrowser.desktop:9
 msgid "Web Browser"
-msgstr "ვებ–ბრ�უზერი"
+msgstr "ვებ ბრ�უზერი"
 
 #. Name
 #: konqfilemgr.desktop:7
 msgid "File Manager"
-msgstr "ფ�ილთ� მენჯერი"
+msgstr "ფ�ილების მმ�რთველი"
 
 #. Comment
 #: konqueror.desktop:8
 msgid "TDE File Manager & Web Browser"
-msgstr "ფ�ილური მენეჯერი დ� ვებ ბრ�უზერი"
+msgstr "TDE-ის ფ�ილების მმ�რთველი დ� ბრ�უზერი"
 
 #. GenericName
 #: konquerorsu.desktop:10
 msgid "File Manager - Super User Mode"
-msgstr "ფ�ილური მენეჯერი (root-ის პრივილეგიებით)"
+msgstr "ფ�ილების მმ�რთველი root-ის პრივილეგიებით"
 
 #. Name
 #: kttsplugin/tdehtmlkttsd.desktop:12
 msgid "Text-to-Speech"
-msgstr "ტექსტის გ�ხმ�ვ�ნების მ�დული"
+msgstr "ტექსტის წ�რმ�თქმ�"
 
 #. Comment
 #: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
 msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "გ�რსისს ბრძ�ნების მ�დული Konqueror-ისთვის"
+msgstr "დ�მ�ტებ�, რ�მელიც ვებგვერდების KTTS-ით წ�რმ�თქმის ს�შუ�ლებ�ს გ�ძლევთ"
 
 #. Name
 #: listview/konq_detailedlistview.desktop:3
@@ -92,12 +92,12 @@ msgstr "სი� �ღწერით"
 #. Name
 #: listview/konq_textview.desktop:3
 msgid "Text View"
-msgstr "ტექსტის ს�ხით"
+msgstr "ტექსტის ხედი"
 
 #. Name
 #: listview/konq_treeview.desktop:3
 msgid "Tree View"
-msgstr "ხის ს�ხით"
+msgstr "ხის ხედი"
 
 #. Name
 #: preloader/konqy_preload.desktop:4
@@ -117,12 +117,12 @@ msgstr "áƒ�მცირებს Konqueror-ის გáƒ�შვების დáƒ
 #. Name
 #: profile_filemanagement.desktop:5
 msgid "File Management"
-msgstr "ფ�ილთ� მ�რთვ�"
+msgstr "ფ�ილების მ�რთვ�"
 
 #. Name
 #: profile_filepreview.desktop:9
 msgid "File Preview"
-msgstr "ფ�ილთ� წინ�სწ�რ შეთვ�ლიერებ�"
+msgstr "ფ�ილის მინი�ტურ�"
 
 #. Name
 #: profile_kde_devel.desktop:3
@@ -131,9 +131,8 @@ msgstr "TDE-ში პრ�გრ�მირებ�"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "გ�რსისს ბრძ�ნების მ�დული"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
@@ -143,12 +142,12 @@ msgstr "მ�რტივი ბრ�უზერი"
 #. Name
 #: profile_tabbedbrowsing.desktop:3
 msgid "Tabbed Browsing"
-msgstr "დ�ფებზე ჩვენებ�"
+msgstr "ბრ�უზერი ჩ�ნ�რთებით"
 
 #. Name
 #: profile_webbrowsing.desktop:2
 msgid "Web Browsing"
-msgstr "ვების ჩვენებ�"
+msgstr "ინტერნეტში მუშ��ბ�"
 
 #. Name
 #: quickprint/text-ada-print.desktop:6 quickprint/text-c++-print.desktop:6
@@ -167,27 +166,28 @@ msgstr "ბეჭდვ�..."
 #. Name
 #: remoteencodingplugin/kremoteencodingplugin.desktop:13
 msgid "Remote Encoding"
-msgstr "კ�დირების დ�შ�რებული მ�დული"
+msgstr "დ�შ�რებული კ�დირებ�"
 
 #. Comment
 #: remoteencodingplugin/kremoteencodingplugin.desktop:15
 msgid "A Plugin for setting the encoding of remote hosts (FTP, SSH, etc.)"
-msgstr "კ�დირების დ�შ�რებული მ�დული Konqueror-ისთვის"
+msgstr ""
+"დ�მ�ტებ� დ�შ�რებული ჰ�სტებისთვის კ�დირების დ�ს�ყენებლ�დ (FTP, SSH დ� �.შ.)"
 
 #. Name
 #: shellcmdplugin/kshellcmdplugin.desktop:15
 msgid "Run Command"
-msgstr "გ�რსისს ბრძ�ნების მ�დული"
+msgstr "ბრძ�ნების გ�შვებ�"
 
 #. Comment
 #: shellcmdplugin/kshellcmdplugin.desktop:17
 msgid "A plugin which enables commands to be executed within folders"
-msgstr "გ�რსისს ბრძ�ნების მ�დული Konqueror-ისთვის"
+msgstr "დ�მ�ტებ�, რ�მელიც ს�შუ�ლებ�ს გ�ძლევთ, ს�ქ�ღ�ლდეში ბრძ�ნებები გ�უშვ�თ"
 
 #. Name
 #: sidebar/konq_sidebartng.desktop:4
 msgid "Navigation Panel"
-msgstr "ს�ნ�ვიგ�ცი� პ�ნელი"
+msgstr "ნ�ვიგ�ციის პ�ნელი"
 
 #. Name
 #: sidebar/test/test.desktop:5
@@ -202,12 +202,12 @@ msgstr "ისტ�რიის გვერდითი პ�ნელი"
 #. Comment
 #: sidebar/trees/history_module/kcmhistory.desktop:12
 msgid "Configure the history sidebar"
-msgstr "ისტ�რიის გვერდითი პ�ნელის კ�ნფიგურირებ�"
+msgstr "ისტ�რიის გვერდითი პ�ნელის მ�რგებ�"
 
 #. Keywords
 #: sidebar/trees/history_module/kcmhistory.desktop:14
 msgid "history;expire;"
-msgstr ""
+msgstr "ისტ�რი�;ვ�დ�;"
 
 #. Name
 #: sidebar/trees/init/bookmarks.desktop:6
@@ -219,7 +219,7 @@ msgstr "ს�ნიშნეები"
 #: sidebar/trees/init/bookmarks.desktop:8
 #: sidebar/trees/init/bookmarks_module.desktop:8
 msgid "This is the list of your bookmarks, for a faster access"
-msgstr "ეს �რის თვენი ს�ნიშნეების სი�, რ�მელიც გჭირდებ�თ სწრ�ფ�დ წვდ�მისთვის"
+msgstr "ეს �რის თქვენი ს�ნიშნეების სი�, სწრ�ფი წვდ�მისთვის"
 
 #. Name
 #: sidebar/trees/init/dirtree_module.desktop:5
@@ -240,8 +240,8 @@ msgid ""
 "This is the history of the URLs you have recently visited. You can sort them "
 "in many ways."
 msgstr ""
-"ეს �რის იმ URL-თ� სი� რ�მელიც ბ�ლ� დრ�ს მ�ინ�ხულეთ. თქვენ შეგიძლი�თ მ�თი "
-"დ�ლ�გებ� თქვენი ნების�მებრ"
+"ეს უ�ხლესი ბმულების ისტ�რი��, რ�მლებს�ც ეწვიეთ. მ�თი დ�ლ�გებ� ბევრნ�ირ�დ "
+"შეგიძლი�თ."
 
 #. Name
 #: sidebar/trees/init/home.desktop:6
@@ -251,7 +251,7 @@ msgstr "ს�წყისი ს�ქ�ღ�ლდე"
 #. Comment
 #: sidebar/trees/init/home.desktop:8
 msgid "This folder contains your personal files"
-msgstr "თქვენი პერს�ნ�ლური ფ�ილების შეს�ნ�ხი ს�ქ�ღ�ლდე"
+msgstr "ეს ს�ქ�ღ�ლდე თქვენს პირ�დ ფ�ილებს შეიც�ვს"
 
 #. Name
 #: sidebar/trees/init/remote.desktop:2 sidebar/trees/init/remote/.directory:2
@@ -261,32 +261,32 @@ msgstr "ქსელი"
 #. Name
 #: sidebar/trees/init/remote/ftp/tde_ftp.desktop:5
 msgid "TDE Official FTP"
-msgstr "TDE-ს ძირით�დი FTP სერვერი"
+msgstr "TDE-ის �ფიცი�ლური FTP სერვერი"
 
 #. Name
 #: sidebar/trees/init/remote/web/apps_web.desktop:4
 msgid "TDE Applications"
-msgstr "TDE-ს პრ�გრ�მები"
+msgstr "TDE-ის �პლიკ�ციები"
 
 #. Name
 #: sidebar/trees/init/remote/web/dot_web.desktop:4
 msgid "TDE News"
-msgstr "TDE-ს სი�ხლეები"
+msgstr "TDE-ის სი�ხლეები"
 
 #. Name
 #: sidebar/trees/init/remote/web/tde_web.desktop:4
 msgid "TDE Home Page"
-msgstr "TDE-ს ვებ გვერდი"
+msgstr "TDE-ის ს�წყისი გვერდი"
 
 #. Name
 #: sidebar/trees/init/root.desktop:6
 msgid "Root Folder"
-msgstr "ძირეული ს�ქ�ღ�ლდე"
+msgstr "ძირით�დი ს�ქ�ღ�ლდე"
 
 #. Comment
 #: sidebar/trees/init/root.desktop:8
 msgid "This is the root of the filesystem"
-msgstr "ფ�ილური სისტემუს ძირეული ს�ქ�ღ�ლდე"
+msgstr "ფ�ილური სისტემის ძირით�დი ს�ქ�ღ�ლდე"
 
 #. Name
 #: sidebar/trees/init/services.desktop:4
@@ -297,27 +297,27 @@ msgstr "სერვისები"
 #. Name
 #: sidebar/trees/init/services/applications.desktop:5
 msgid "Applications"
-msgstr "პრ�გრ�მები"
+msgstr "�პლიკ�ციები"
 
 #. Name
 #: sidebar/trees/init/services/audiocd.desktop:6
 msgid "Audio CD Browser"
-msgstr "Audio CD-ს დ�თვ�ლიერებ�"
+msgstr "Audio CD-ის დ�თვ�ლიერებ�"
 
 #. Name
 #: sidebar/trees/init/services/media.desktop:5
 msgid "Storage Media"
-msgstr "მ�ნ�ცემთ� შენ�ხვის მ�წყ�ბილ�ბები"
+msgstr "ს�ც�ვის მედი�"
 
 #. Name
 #: sidebar/trees/init/services/printsystem.desktop:6
 msgid "Print System Browser"
-msgstr "ბეჭდვის სისტემის დ�თვ�ლიერებ�"
+msgstr "ბეჭდვის სისტემის ბრ�უზერი"
 
 #. Name
 #: sidebar/trees/init/services/settings.desktop:5
 msgid "Settings"
-msgstr "პ�რ�მეტრები"
+msgstr "მ�რგებ�"
 
 #. Name
 #: sidebar/trees/init/system.desktop:6
@@ -328,31 +328,31 @@ msgstr "სისტემ�"
 #: sidebar/trees/init/system.desktop:8
 msgid "This folder allows you to access common places on your computer"
 msgstr ""
+"ეს ს�ქ�ღ�ლდე ს�შუ�ლებ�ს გ�ძლევთ, გქ�ნდეთ წვდ�მ� თქვენი კ�მპიუტერის ჩვეულ "
+"�დგილებთ�ნ"
 
 #. Name
 #: sidebar/trees/init/trash.desktop:9
-#, fuzzy
 msgid "Trash Folder"
-msgstr "ს�ქ�ღ�ლდე"
+msgstr "ნ�გვის ს�ქ�ღ�ლდე"
 
 #. Comment
 #: sidebar/trees/init/trash.desktop:11
-#, fuzzy
 msgid "This folder displays the contents of your Trash Bin"
-msgstr "თქვენი პერს�ნ�ლური ფ�ილების შეს�ნ�ხი ს�ქ�ღ�ლდე"
+msgstr "ეს ს�ქ�ღ�ლდე თქვენი ნ�გვის ყუთის შემცველ�ბ�ს �ჩვენებს"
 
 #. Name
 #: sidebar/web_module/webmodule_add.desktop:5
 #: sidebar/web_module/websidebar.desktop:5
 msgid "Web SideBar Module"
-msgstr "გვერდით Web დ�ფის მ�დული"
+msgstr "ვების გვერდითი პ�ნელის მ�დული"
 
 #. Name
 #: sidebar/trees/init/remote/ftp/.directory:2
 msgid "FTP Archives"
-msgstr ""
+msgstr "FTP �რქივები"
 
 #. Name
 #: sidebar/trees/init/remote/web/.directory:2
 msgid "Web Sites"
-msgstr ""
+msgstr "ვებგვერდები"
diff --git a/translations/desktop_files/konqueror-desktops/nl.po b/translations/desktop_files/konqueror-desktops/nl.po
index 666a401be..98c0c6cbe 100644
--- a/translations/desktop_files/konqueror-desktops/nl.po
+++ b/translations/desktop_files/konqueror-desktops/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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-01-08 21:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konqueror-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:7
 msgid "Home"
-msgstr ""
+msgstr "Startpagina"
 
 #. GenericName
 #: Home.desktop:9
@@ -29,7 +30,7 @@ msgstr "Persoonlijke map"
 #. Name
 #: about/konq_aboutpage.desktop:3
 msgid "About-Page for Konqueror"
-msgstr "Informatiepagina voor Konqueror"
+msgstr "Konqueror-informatiepagina"
 
 #. Name
 #: iconview/konq_iconview.desktop:3
@@ -46,7 +47,7 @@ msgstr "Multikolomweergave"
 #: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
 #: konquerorsu.desktop:8
 msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
 
 #. GenericName
 #: konqbrowser.desktop:9
@@ -66,18 +67,17 @@ msgstr "TDE's bestandsbeheerder en webbrowser"
 #. GenericName
 #: konquerorsu.desktop:10
 msgid "File Manager - Super User Mode"
-msgstr "Bestandsbeheerder (in systeembeheermodus)"
+msgstr "Bestandsbeheerder (systeembeheermodus)"
 
 #. Name
 #: kttsplugin/tdehtmlkttsd.desktop:12
 msgid "Text-to-Speech"
-msgstr "Tekst-tot-spraak-plugin"
+msgstr "Tekst-naar-spraak-plug-in"
 
 #. Comment
 #: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
 msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Een shellcommando-plugin voor Konqueror"
+msgstr "Een plug-in die teksten op websites kan voorlezen met behulp van KTTS"
 
 #. Name
 #: listview/konq_detailedlistview.desktop:3
@@ -97,12 +97,12 @@ msgstr "Tekstweergave"
 #. Name
 #: listview/konq_treeview.desktop:3
 msgid "Tree View"
-msgstr "Boomstructuurweergave"
+msgstr "Boomweergave"
 
 #. Name
 #: preloader/konqy_preload.desktop:4
 msgid "Konqueror Preloading During TDE startup"
-msgstr "Konqueror voorladen tijdens TDE-start"
+msgstr "Konqueror-venster in geheugen laden tijdens opstarten van TDE"
 
 #. Name
 #: preloader/konqy_preloader.desktop:4
@@ -112,7 +112,7 @@ msgstr "KDED Konqueror Preloader-module"
 #. Comment
 #: preloader/konqy_preloader.desktop:6
 msgid "Reduces Konqueror startup time"
-msgstr "Reduceert de opstarttijd van Konqueror"
+msgstr "Vermindert de opstarttijd van Konqueror"
 
 #. Name
 #: profile_filemanagement.desktop:5
@@ -122,7 +122,7 @@ msgstr "Bestandsbeheer"
 #. Name
 #: profile_filepreview.desktop:9
 msgid "File Preview"
-msgstr "Bestandsvoorbeeld"
+msgstr "Voorvertoning"
 
 #. Name
 #: profile_kde_devel.desktop:3
@@ -131,19 +131,18 @@ msgstr "TDE-ontwikkeling"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Schellcommando-plugin"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
 msgid "Simple Browser"
-msgstr "Eenvoudige browser"
+msgstr "Eenvoudige webbrowser"
 
 #. Name
 #: profile_tabbedbrowsing.desktop:3
 msgid "Tabbed Browsing"
-msgstr "Browser met tabbladen"
+msgstr "Webbrowser met tabbladen"
 
 #. Name
 #: profile_webbrowsing.desktop:2
@@ -162,27 +161,29 @@ msgstr "Webbrowsen"
 #: quickprint/text-tex-print.desktop:6 quickprint/text-xml-print.desktop:6
 #: quickprint/text-xslt-print.desktop:6
 msgid "Print..."
-msgstr "Afdrukken..."
+msgstr "Afdrukken…"
 
 #. Name
 #: remoteencodingplugin/kremoteencodingplugin.desktop:13
 msgid "Remote Encoding"
-msgstr "Externe-coderingsplugin"
+msgstr "Externe-coderingsplug-in"
 
 #. Comment
 #: remoteencodingplugin/kremoteencodingplugin.desktop:15
 msgid "A Plugin for setting the encoding of remote hosts (FTP, SSH, etc.)"
-msgstr "Externe-coderingsplugin voor Konqueror"
+msgstr "Een externe-coderingsplugin voor Konqueror (ftp, ssh, etc.)"
 
 #. Name
 #: shellcmdplugin/kshellcmdplugin.desktop:15
 msgid "Run Command"
-msgstr "Schellcommando-plugin"
+msgstr "Shellopdrachtplug-in"
 
 #. Comment
 #: shellcmdplugin/kshellcmdplugin.desktop:17
 msgid "A plugin which enables commands to be executed within folders"
-msgstr "Een shellcommando-plugin voor Konqueror"
+msgstr ""
+"Een plug-in voor Konqueror waarmee opdrachten in mappen kunnen worden "
+"uitgevoerd"
 
 #. Name
 #: sidebar/konq_sidebartng.desktop:4
@@ -192,22 +193,22 @@ msgstr "Navigatiepaneel"
 #. Name
 #: sidebar/test/test.desktop:5
 msgid "Test"
-msgstr ""
+msgstr "Uitproberen"
 
 #. Name
 #: sidebar/trees/history_module/kcmhistory.desktop:10
 msgid "History Sidebar"
-msgstr "Geschiedenis"
+msgstr "Geschiedeniszijbalk"
 
 #. Comment
 #: sidebar/trees/history_module/kcmhistory.desktop:12
 msgid "Configure the history sidebar"
-msgstr "Hier kunt u de geschiedenis instellen"
+msgstr "Stel de geschiedeniszijbalk in"
 
 #. Keywords
 #: sidebar/trees/history_module/kcmhistory.desktop:14
 msgid "history;expire;"
-msgstr "geschiedenis;verloop;"
+msgstr "geschiedenis;verlopen;"
 
 #. Name
 #: sidebar/trees/init/bookmarks.desktop:6
@@ -219,7 +220,7 @@ msgstr "Bladwijzers"
 #: sidebar/trees/init/bookmarks.desktop:8
 #: sidebar/trees/init/bookmarks_module.desktop:8
 msgid "This is the list of your bookmarks, for a faster access"
-msgstr "Dit is de lijst met uw bladwijzers, voor snellere toegang"
+msgstr "Dit is de lijst met bladwijzers, voor snellere toegang"
 
 #. Name
 #: sidebar/trees/init/dirtree_module.desktop:5
@@ -240,8 +241,8 @@ msgid ""
 "This is the history of the URLs you have recently visited. You can sort them "
 "in many ways."
 msgstr ""
-"Dit is de geschiedenis van de URL-adressen waar u recentelijk bent geweest. "
-"U kunt ze op meerdere manieren sorteren."
+"Dit is de geschiedenis met websites die u onlangs hebt bezocht. U kunt de "
+"sites op meerdere manieren sorteren."
 
 #. Name
 #: sidebar/trees/init/home.desktop:6
@@ -261,38 +262,38 @@ msgstr "Netwerk"
 #. Name
 #: sidebar/trees/init/remote/ftp/tde_ftp.desktop:5
 msgid "TDE Official FTP"
-msgstr "TDE's Officiële FTP"
+msgstr "TDE's officiële ftp"
 
 #. Name
 #: sidebar/trees/init/remote/web/apps_web.desktop:4
 msgid "TDE Applications"
-msgstr "TDE Programma's"
+msgstr "TDE-programma's"
 
 #. Name
 #: sidebar/trees/init/remote/web/dot_web.desktop:4
 msgid "TDE News"
-msgstr "TDE Nieuws"
+msgstr "TDE-nieuws"
 
 #. Name
 #: sidebar/trees/init/remote/web/tde_web.desktop:4
 msgid "TDE Home Page"
-msgstr "TDE's startpagina"
+msgstr "TDE-startpagina"
 
 #. Name
 #: sidebar/trees/init/root.desktop:6
 msgid "Root Folder"
-msgstr "Hoofdmap"
+msgstr "Systeemmap"
 
 #. Comment
 #: sidebar/trees/init/root.desktop:8
 msgid "This is the root of the filesystem"
-msgstr "Dit is de root van het bestandssysteem"
+msgstr "Deze map bevat de systeembestanden"
 
 #. Name
 #: sidebar/trees/init/services.desktop:4
 #: sidebar/trees/init/services/.directory:3
 msgid "Services"
-msgstr ""
+msgstr "Diensten"
 
 #. Name
 #: sidebar/trees/init/services/applications.desktop:5
@@ -302,7 +303,7 @@ msgstr "Programma's"
 #. Name
 #: sidebar/trees/init/services/audiocd.desktop:6
 msgid "Audio CD Browser"
-msgstr "Audio-cd Browser"
+msgstr "Audio-cd-verkenner"
 
 #. Name
 #: sidebar/trees/init/services/media.desktop:5
@@ -312,7 +313,7 @@ msgstr "Opslagapparaten"
 #. Name
 #: sidebar/trees/init/services/printsystem.desktop:6
 msgid "Print System Browser"
-msgstr "Afdruksysteembrowser"
+msgstr "Afdruksysteemverkenner"
 
 #. Name
 #: sidebar/trees/init/services/settings.desktop:5
@@ -327,19 +328,17 @@ msgstr "Systeem"
 #. Comment
 #: sidebar/trees/init/system.desktop:8
 msgid "This folder allows you to access common places on your computer"
-msgstr "Deze map geeft toegang tot algemene plekken van uw desktop"
+msgstr "Deze map geeft toegang tot veelgebruikte locaties op uw computer"
 
 #. Name
 #: sidebar/trees/init/trash.desktop:9
-#, fuzzy
 msgid "Trash Folder"
-msgstr "Map"
+msgstr "Prullenbak"
 
 #. Comment
 #: sidebar/trees/init/trash.desktop:11
-#, fuzzy
 msgid "This folder displays the contents of your Trash Bin"
-msgstr "Deze map bevat al uw persoonlijke bestanden"
+msgstr "Deze map bevat al uw verwijderde bestanden"
 
 #. Name
 #: sidebar/web_module/webmodule_add.desktop:5
@@ -350,7 +349,7 @@ msgstr "Webzijbalkmodule"
 #. Name
 #: sidebar/trees/init/remote/ftp/.directory:2
 msgid "FTP Archives"
-msgstr "FTP-archieven"
+msgstr "Ftp-archieven"
 
 #. Name
 #: sidebar/trees/init/remote/web/.directory:2
diff --git a/translations/desktop_files/konqueror-desktops/ru.po b/translations/desktop_files/konqueror-desktops/ru.po
index d25400f3d..9eae7b0f9 100644
--- a/translations/desktop_files/konqueror-desktops/ru.po
+++ b/translations/desktop_files/konqueror-desktops/ru.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-05-11 01:02+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konqueror-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: Home.desktop:7
@@ -46,7 +49,7 @@ msgstr "В не�колько колонок"
 #: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
 #: konquerorsu.desktop:8
 msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
 
 #. GenericName
 #: konqbrowser.desktop:9
@@ -75,9 +78,10 @@ msgstr "Зачитывание тек�та"
 
 #. Comment
 #: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
 msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Выполнить команду из Konqueror"
+msgstr ""
+"Ра�ширение, которое позвол�ет во�производить в�лух тек�т на web-�траницах � "
+"помощью KTTS"
 
 #. Name
 #: listview/konq_detailedlistview.desktop:3
@@ -131,9 +135,8 @@ msgstr "Разработка в TDE"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Выполнить команду"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
@@ -225,7 +228,7 @@ msgstr "Спи�ок закладок дл� бы�трого до�тупа"
 #: sidebar/trees/init/dirtree_module.desktop:5
 #: sidebar/trees/init/virtualfolderadd.desktop:6
 msgid "Folder"
-msgstr "Папка"
+msgstr "Каталог"
 
 #. Name
 #: sidebar/trees/init/history.desktop:6
@@ -246,12 +249,12 @@ msgstr ""
 #. Name
 #: sidebar/trees/init/home.desktop:6
 msgid "Home Folder"
-msgstr "Домашн�� папка"
+msgstr "Домашний каталог"
 
 #. Comment
 #: sidebar/trees/init/home.desktop:8
 msgid "This folder contains your personal files"
-msgstr "Папка ваших личных файлов"
+msgstr "Каталог ваших личных файлов"
 
 #. Name
 #: sidebar/trees/init/remote.desktop:2 sidebar/trees/init/remote/.directory:2
@@ -281,18 +284,18 @@ msgstr "О�новной �айт TDE"
 #. Name
 #: sidebar/trees/init/root.desktop:6
 msgid "Root Folder"
-msgstr "Корнева� папка"
+msgstr "Корневой каталог"
 
 #. Comment
 #: sidebar/trees/init/root.desktop:8
 msgid "This is the root of the filesystem"
-msgstr "Корнева� папка файловой �и�темы"
+msgstr "Это корневой каталог файловой �и�темы"
 
 #. Name
 #: sidebar/trees/init/services.desktop:4
 #: sidebar/trees/init/services/.directory:3
 msgid "Services"
-msgstr "Серви�ы"
+msgstr "Службы"
 
 #. Name
 #: sidebar/trees/init/services/applications.desktop:5
@@ -307,7 +310,7 @@ msgstr "Про�мотр аудио CD"
 #. Name
 #: sidebar/trees/init/services/media.desktop:5
 msgid "Storage Media"
-msgstr "У�трой�тва хранени� данных"
+msgstr "�о�ители данных"
 
 #. Name
 #: sidebar/trees/init/services/printsystem.desktop:6
diff --git a/translations/desktop_files/konsole-desktops/es_AR.po b/translations/desktop_files/konsole-desktops/es_AR.po
new file mode 100644
index 000000000..c2120118c
--- /dev/null
+++ b/translations/desktop_files/konsole-desktops/es_AR.po
@@ -0,0 +1,205 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2024-11-24 13:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kcmkonsole.desktop:9
+#, fuzzy
+msgid "Console"
+msgstr "Consola"
+
+#. GenericName
+#: kcmkonsole.desktop:11
+#, fuzzy
+msgid "All Konsole Settings"
+msgstr "Preferencias de Konsole"
+
+#. Keywords
+#: kcmkonsole.desktop:13
+#, fuzzy
+msgid "konsole;console;terminal;"
+msgstr "konsole;consola;terminal;"
+
+#. Name
+#: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
+#, fuzzy
+msgid "Konsole"
+msgstr "Konsole"
+
+#. GenericName
+#: konsole-script.desktop:11 konsole.desktop:11
+#, fuzzy
+msgid "Terminal Program"
+msgstr "Programa de terminal"
+
+#. Comment
+#: konsole/x-konsole.desktop:7
+#, fuzzy
+msgid "File to Open a Shell"
+msgstr "Archivo para abrir un intérprete de órdenes"
+
+#. Name
+#: konsolepart.desktop:14 terminalemulator.desktop:5
+#, fuzzy
+msgid "Terminal Emulator"
+msgstr "Emulador de terminal"
+
+#. GenericName
+#: konsolesu.desktop:12
+#, fuzzy
+msgid "Terminal Program - Super User Mode"
+msgstr "Programa de terminal - Modo de superusuario"
+
+#. Name
+#: kwrited.desktop:2
+#, fuzzy
+msgid "TDE Write Daemon"
+msgstr "Demonio de escritura de TDE"
+
+#. Comment
+#: kwrited.desktop:4
+#, fuzzy
+msgid "Watch for messages from local users sent with write(1) or wall(1)"
+msgstr "Ver los mensajes de usuarios locales enviados con write(1) o wall(1)"
+
+#. Name
+#: other/linux.desktop:3
+#, fuzzy
+msgid "Linux Console"
+msgstr "Consola de Linux"
+
+#. Comment
+#: other/linux.desktop:4
+#, fuzzy
+msgid "New Linux Console"
+msgstr "Nueva consola de Linux"
+
+#. Name
+#: other/mc.desktop:3
+#, fuzzy
+msgid "Midnight Commander"
+msgstr "Midnight Commander"
+
+#. Comment
+#: other/mc.desktop:4
+#, fuzzy
+msgid "New Midnight Commander"
+msgstr "Nuevo Midnight Commander"
+
+#. Name
+#: other/screen.desktop:3
+#, fuzzy
+msgid "Screen Session"
+msgstr "Sesión de Screen"
+
+#. Comment
+#: other/screen.desktop:4
+#, fuzzy
+msgid "New Screen Session"
+msgstr "Nueva sesión de Screen"
+
+#. Name
+#. Title0
+#: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
+#: other/5shells:6
+msgid "Shell"
+msgstr "Shell"
+
+#. Comment
+#: other/shell.desktop:4
+msgid "New Shell"
+msgstr "Nuevo Shell"
+
+#. Name
+#: other/su.desktop.cmake:3
+msgid "Root Shell"
+msgstr "Root de Shell"
+
+#. Comment
+#: other/su.desktop.cmake:4
+msgid "New Root Shell"
+msgstr "Nuevo Root de Shell"
+
+#. Name
+#: other/sumc.desktop.cmake:3
+#, fuzzy
+msgid "Root Midnight Commander"
+msgstr "Midnight Commander para root"
+
+#. Comment
+#: other/sumc.desktop.cmake:4
+#, fuzzy
+msgid "New Root Midnight Commander"
+msgstr "Nuevo Midnight Commander de root"
+
+#. Name
+#: terminalhere.desktop:6
+#, fuzzy
+msgid "Terminal"
+msgstr "Terminal"
+
+#. Name
+#: terminalhere.desktop:11
+#, fuzzy
+msgid "Open Terminal Here"
+msgstr "Abrir terminal aquí"
+
+#. Name
+#: other/2shells:2
+msgid "Two consoles"
+msgstr "Dos consolas"
+
+#. Title1
+#: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
+#, fuzzy
+msgid "Shell No. 2"
+msgstr "Shell No. 2"
+
+#. Name
+#: other/3shells:2
+msgid "Three consoles"
+msgstr "Tres consolas"
+
+#. Title2
+#: other/3shells:8 other/4shells:8 other/5shells:8
+#, fuzzy
+msgid "Shell No. 3"
+msgstr "Shell No. 3"
+
+#. Name
+#: other/4shells:2
+msgid "Four consoles"
+msgstr "Cuatro consolas"
+
+#. Title3
+#: other/4shells:9 other/5shells:9
+#, fuzzy
+msgid "Shell No. 4"
+msgstr "Shell No. 4"
+
+#. Name
+#: other/5shells:2
+msgid "Five consoles"
+msgstr "Cinco consolas"
+
+#. Title4
+#: other/5shells:10
+#, fuzzy
+msgid "Shell No. 5"
+msgstr "Shell No. 5"
diff --git a/translations/desktop_files/konsole-desktops/ka.po b/translations/desktop_files/konsole-desktops/ka.po
index b53d30e7f..a6fe281dd 100644
--- a/translations/desktop_files/konsole-desktops/ka.po
+++ b/translations/desktop_files/konsole-desktops/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmkonsole.desktop:9
@@ -24,22 +25,22 @@ msgstr "კ�ნს�ლი"
 #. GenericName
 #: kcmkonsole.desktop:11
 msgid "All Konsole Settings"
-msgstr "კ�ნს�ლის პ�რ�მეტრები"
+msgstr "Konsole-ის ყველ� პ�რ�მეტრი"
 
 #. Keywords
 #: kcmkonsole.desktop:13
 msgid "konsole;console;terminal;"
-msgstr ""
+msgstr "konsole;console;terminal;კ�ნს�ლი;ტერმინ�ლი;"
 
 #. Name
 #: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
 msgid "Konsole"
-msgstr "კ�ნს�ლი"
+msgstr "Konsole"
 
 #. GenericName
 #: konsole-script.desktop:11 konsole.desktop:11
 msgid "Terminal Program"
-msgstr "პრ�გრ�მ� ტერმინ�ლისთვის"
+msgstr "ტერმინ�ლის პრ�გრ�მ�"
 
 #. Comment
 #: konsole/x-konsole.desktop:7
@@ -59,7 +60,7 @@ msgstr "ტერმინ�ლი - ზემ�მხმ�რებლის
 #. Name
 #: kwrited.desktop:2
 msgid "TDE Write Daemon"
-msgstr "TDE Writed გუშ�გი"
+msgstr "TDE-ის ჩ�წერის დემ�ნი"
 
 #. Comment
 #: kwrited.desktop:4
@@ -76,18 +77,17 @@ msgstr "Linux-ის კ�ნს�ლი"
 #. Comment
 #: other/linux.desktop:4
 msgid "New Linux Console"
-msgstr "�ხ�ლი კ�ნს�ლი"
+msgstr "�ხ�ლი Linux-ის კ�ნს�ლი"
 
 #. Name
 #: other/mc.desktop:3
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Midnight Commander-ის �ხ�ლი ფ�ნჯ�რ�"
+msgstr "Midnight Commander"
 
 #. Comment
 #: other/mc.desktop:4
 msgid "New Midnight Commander"
-msgstr "Midnight Commander-ის �ხ�ლი ფ�ნჯ�რ�"
+msgstr "�ხ�ლი Midnight Commander"
 
 #. Name
 #: other/screen.desktop:3
@@ -96,50 +96,45 @@ msgstr "ეკრ�ნის სე�ნსი"
 
 #. Comment
 #: other/screen.desktop:4
-#, fuzzy
 msgid "New Screen Session"
-msgstr "ეკრ�ნის სე�ნსი"
+msgstr "�ხ�ლი ეკრ�ნის სესი�"
 
 #. Name
 #. Title0
 #: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
 #: other/5shells:6
-#, fuzzy
 msgid "Shell"
-msgstr "Shell - �ხ�ლი ფ�ნჯ�რ�"
+msgstr "გ�რსი"
 
 #. Comment
 #: other/shell.desktop:4
 msgid "New Shell"
-msgstr "Shell - �ხ�ლი ფ�ნჯ�რ�"
+msgstr "�ხ�ლი გ�რსი"
 
 #. Name
 #: other/su.desktop.cmake:3
-#, fuzzy
 msgid "Root Shell"
-msgstr "�ხ�ლი გ�რსი ზემ�მხმ�რებლის პრივილეგიებით"
+msgstr "ზემ�მხმ�რებლის გ�რსი"
 
 #. Comment
 #: other/su.desktop.cmake:4
 msgid "New Root Shell"
-msgstr "�ხ�ლი გ�რსი ზემ�მხმ�რებლის პრივილეგიებით"
+msgstr "�ხ�ლი ზემ�მხმ�რებლის გ�რსი"
 
 #. Name
 #: other/sumc.desktop.cmake:3
-#, fuzzy
 msgid "Root Midnight Commander"
-msgstr "�ხ�ლი Root Midnight Commander"
+msgstr "Midnight Commander ზემ�მხმ�რებლით"
 
 #. Comment
 #: other/sumc.desktop.cmake:4
 msgid "New Root Midnight Commander"
-msgstr "�ხ�ლი Root Midnight Commander"
+msgstr "�ხ�ლი Midnight Commander ზემ�მხმ�რებლით"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
-msgstr "პრ�გრ�მ� ტერმინ�ლისთვის"
+msgstr "ტერმინ�ლი"
 
 #. Name
 #: terminalhere.desktop:11
@@ -148,47 +143,40 @@ msgstr "ტერმინ�ლის �ქ გ�ხსნ�"
 
 #. Name
 #: other/2shells:2
-#, fuzzy
 msgid "Two consoles"
-msgstr "კ�ნს�ლი"
+msgstr "�რი კ�ნს�ლი"
 
 #. Title1
 #: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
 msgid "Shell No. 2"
-msgstr "Shell - �ხ�ლი ფ�ნჯ�რ�"
+msgstr "გ�რსი #2"
 
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "ს�მი კ�ნს�ლი"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
 msgid "Shell No. 3"
-msgstr "Shell - �ხ�ლი ფ�ნჯ�რ�"
+msgstr "გ�რსი #3"
 
 #. Name
 #: other/4shells:2
-#, fuzzy
 msgid "Four consoles"
-msgstr "Linux-ის კ�ნს�ლი"
+msgstr "�თხი კ�ნს�ლი"
 
 #. Title3
 #: other/4shells:9 other/5shells:9
-#, fuzzy
 msgid "Shell No. 4"
-msgstr "Shell - �ხ�ლი ფ�ნჯ�რ�"
+msgstr "გ�რსი #4"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Linux-ის კ�ნს�ლი"
+msgstr "ხუთი კ�ნს�ლი"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "Shell - �ხ�ლი ფ�ნჯ�რ�"
+msgstr "გ�რსი #5"
diff --git a/translations/desktop_files/konsole-desktops/nl.po b/translations/desktop_files/konsole-desktops/nl.po
index 725cba957..143b789c4 100644
--- a/translations/desktop_files/konsole-desktops/nl.po
+++ b/translations/desktop_files/konsole-desktops/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-11-18 13:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konsole-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmkonsole.desktop:9
 msgid "Console"
-msgstr ""
+msgstr "Console"
 
 #. GenericName
 #: kcmkonsole.desktop:11
@@ -29,12 +30,12 @@ msgstr "Alle Konsole-instellingen"
 #. Keywords
 #: kcmkonsole.desktop:13
 msgid "konsole;console;terminal;"
-msgstr ""
+msgstr "konsole;console;terminal;"
 
 #. Name
 #: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. GenericName
 #: konsole-script.desktop:11 konsole.desktop:11
@@ -49,29 +50,28 @@ msgstr "Bestand om een shell te openen"
 #. Name
 #: konsolepart.desktop:14 terminalemulator.desktop:5
 msgid "Terminal Emulator"
-msgstr "Terminal"
+msgstr "Terminalemulator"
 
 #. GenericName
 #: konsolesu.desktop:12
 msgid "Terminal Program - Super User Mode"
-msgstr "Terminalprogramma (in systeembeheermodus)"
+msgstr "Terminalprogramma (beheerdersmodus)"
 
 #. Name
 #: kwrited.desktop:2
 msgid "TDE Write Daemon"
-msgstr "TDE Schrijfdaemon"
+msgstr "TDE-schrijfdienst"
 
 #. Comment
 #: kwrited.desktop:4
 msgid "Watch for messages from local users sent with write(1) or wall(1)"
 msgstr ""
-"Observeer berichten van lokale gebruikers verzonden met write(1) of wall(1)"
+"Monitor berichten van lokale gebruikers verzonden met write(1) of wall(1)"
 
 #. Name
 #: other/linux.desktop:3
-#, fuzzy
 msgid "Linux Console"
-msgstr "Nieuwe linuxconsole"
+msgstr "Linuxconsole"
 
 #. Comment
 #: other/linux.desktop:4
@@ -80,14 +80,13 @@ msgstr "Nieuwe linuxconsole"
 
 #. Name
 #: other/mc.desktop:3
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "nieuwe Midnight Commander"
+msgstr "Midnight Commander"
 
 #. Comment
 #: other/mc.desktop:4
 msgid "New Midnight Commander"
-msgstr "nieuwe Midnight Commander"
+msgstr "Nieuwe Midnight Commander"
 
 #. Name
 #: other/screen.desktop:3
@@ -97,15 +96,14 @@ msgstr "Screen-sessie"
 #. Comment
 #: other/screen.desktop:4
 msgid "New Screen Session"
-msgstr "nieuwe Screen-sessie"
+msgstr "Nieuwe Screen-sessie"
 
 #. Name
 #. Title0
 #: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
 #: other/5shells:6
-#, fuzzy
 msgid "Shell"
-msgstr "Nieuwe shell"
+msgstr "Shell"
 
 #. Comment
 #: other/shell.desktop:4
@@ -124,68 +122,60 @@ msgstr "Nieuwe root-shell"
 
 #. Name
 #: other/sumc.desktop.cmake:3
-#, fuzzy
 msgid "Root Midnight Commander"
-msgstr "Nieuwe root Midnight Commander"
+msgstr "Midnight Commander (beheerdersmodus)"
 
 #. Comment
 #: other/sumc.desktop.cmake:4
 msgid "New Root Midnight Commander"
-msgstr "Nieuwe root Midnight Commander"
+msgstr "Nieuwe Midnight Commander (beheerdersmodus)"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
-msgstr "Terminalprogramma"
+msgstr "Terminal"
 
 #. Name
 #: terminalhere.desktop:11
 msgid "Open Terminal Here"
-msgstr "Terminal openen"
+msgstr "Terminal hier openen"
 
 #. Name
 #: other/2shells:2
 msgid "Two consoles"
-msgstr ""
+msgstr "Twee consoles"
 
 #. Title1
 #: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
 msgid "Shell No. 2"
-msgstr "Nieuwe shell"
+msgstr "Shell nr. 2"
 
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "Drie consoles"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
 msgid "Shell No. 3"
-msgstr "Nieuwe shell"
+msgstr "Shell nr. 3"
 
 #. Name
 #: other/4shells:2
-#, fuzzy
 msgid "Four consoles"
-msgstr "Nieuwe linuxconsole"
+msgstr "Vier consoles"
 
 #. Title3
 #: other/4shells:9 other/5shells:9
-#, fuzzy
 msgid "Shell No. 4"
-msgstr "Nieuwe shell"
+msgstr "Shell nr. 4"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Nieuwe linuxconsole"
+msgstr "Vijf consoles"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "Nieuwe shell"
+msgstr "Shell nr. 5"
diff --git a/translations/desktop_files/konsole-desktops/ru.po b/translations/desktop_files/konsole-desktops/ru.po
index 94a071046..8fb857b5d 100644
--- a/translations/desktop_files/konsole-desktops/ru.po
+++ b/translations/desktop_files/konsole-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-05-13 16:01+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmkonsole.desktop:9
@@ -33,7 +35,6 @@ msgstr "konsole;console;terminal;терминал;"
 
 #. Name
 #: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
-#, fuzzy
 msgid "Konsole"
 msgstr "Кон�оль"
 
@@ -55,7 +56,7 @@ msgstr "Эмул�тор терминала"
 #. GenericName
 #: konsolesu.desktop:12
 msgid "Terminal Program - Super User Mode"
-msgstr "Терминал - режим �уперпользовател�"
+msgstr "Терминал — режим �уперпользовател�"
 
 #. Name
 #: kwrited.desktop:2
@@ -81,9 +82,8 @@ msgstr "�ова� кон�оль Linux"
 
 #. Name
 #: other/mc.desktop:3
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "�овое окно Midnight Commander"
+msgstr "Midnight Commander"
 
 #. Comment
 #: other/mc.desktop:4
@@ -134,7 +134,6 @@ msgstr "�овое окно Midnight Commander � правами root"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
 msgstr "Терминал"
 
@@ -145,47 +144,40 @@ msgstr "Открыть терминал в �той папке"
 
 #. Name
 #: other/2shells:2
-#, fuzzy
 msgid "Two consoles"
-msgstr "Кон�оль"
+msgstr "Две кон�оли"
 
 #. Title1
 #: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
 msgid "Shell No. 2"
-msgstr "Кон�оль"
+msgstr "Оболочка № 2"
 
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "Три кон�оли"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
 msgid "Shell No. 3"
-msgstr "Кон�оль"
+msgstr "Оболочка № 3"
 
 #. Name
 #: other/4shells:2
-#, fuzzy
 msgid "Four consoles"
-msgstr "Кон�оль Linux"
+msgstr "Четыре кон�оли"
 
 #. Title3
 #: other/4shells:9 other/5shells:9
-#, fuzzy
 msgid "Shell No. 4"
-msgstr "Кон�оль"
+msgstr "Оболочка № 4"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Кон�оль Linux"
+msgstr "П�ть кон�олей"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "Кон�оль"
+msgstr "Оболочка № 5"
diff --git a/translations/desktop_files/konsole-eventsrc/es_AR.po b/translations/desktop_files/konsole-eventsrc/es_AR.po
new file mode 100644
index 000000000..53db749ab
--- /dev/null
+++ b/translations/desktop_files/konsole-eventsrc/es_AR.po
@@ -0,0 +1,85 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 15:54+0200\n"
+"PO-Revision-Date: 2025-03-07 16:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-events/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+#, fuzzy
+msgid "Konsole"
+msgstr "Konsole"
+
+#. Name
+#: eventsrc:6
+#, fuzzy
+msgid "Bell in visible session"
+msgstr "Timbre en sesión visible"
+
+#. Comment
+#: eventsrc:7
+#, fuzzy
+msgid "Bell emitted within a visible session"
+msgstr "Suena el timbre incluso en un sesión visible"
+
+#. Name
+#: eventsrc:12
+#, fuzzy
+msgid "Bell in non-visible session"
+msgstr "Timbre en sesión invisible"
+
+#. Comment
+#: eventsrc:13
+#, fuzzy
+msgid "Bell emitted within a non-visible session"
+msgstr "Suena el timbre incluso en un sesión visible"
+
+#. Name
+#: eventsrc:18
+#, fuzzy
+msgid "Activity in monitored session"
+msgstr "Actividad en sesión monitorizada"
+
+#. Comment
+#: eventsrc:19
+#, fuzzy
+msgid "Activity detected in a monitored session"
+msgstr "Detectada actividad en una sesión monitorizada"
+
+#. Name
+#: eventsrc:23
+#, fuzzy
+msgid "Silence in monitored session"
+msgstr "Silencio en sesión monitorizada"
+
+#. Comment
+#: eventsrc:24
+#, fuzzy
+msgid "Silence detected in a monitored session"
+msgstr "Silencio detectado en una sesión monitorizada"
+
+#. Name
+#: eventsrc:28
+#, fuzzy
+msgid "Session finished with non-zero status"
+msgstr "Sesión terminada con estado no cero"
+
+#. Comment
+#: eventsrc:29
+#, fuzzy
+msgid "A session has exited with non-zero status"
+msgstr "Ha terminado una sesión con estado no cero"
diff --git a/translations/desktop_files/konsole-eventsrc/ka.po b/translations/desktop_files/konsole-eventsrc/ka.po
index 5bce2788a..99a7ad1ca 100644
--- a/translations/desktop_files/konsole-eventsrc/ka.po
+++ b/translations/desktop_files/konsole-eventsrc/ka.po
@@ -1,74 +1,73 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 15:54+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-events/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr "კ�ნს�ლი"
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
 msgid "Bell in visible session"
-msgstr "ხილული სესიის�ს ხმ�ვ�ნი სიგნ�ლი"
+msgstr "ზ�რი ხილულ სესი�ში"
 
 #. Comment
 #: eventsrc:7
 msgid "Bell emitted within a visible session"
-msgstr "ხილულმ� სესიის�მ ხმ�ვ�ნი სიგნ�ლი გ�მ�სც�"
+msgstr "ზ�რი მიმდინ�რე სესი�ში"
 
 #. Name
 #: eventsrc:12
 msgid "Bell in non-visible session"
-msgstr "უხილ�ვი სესიის�ს ხმ�ვ�ნი სიგნ�ლი"
+msgstr "ზ�რი �რ�ხილულ სესი�ში"
 
 #. Comment
 #: eventsrc:13
 msgid "Bell emitted within a non-visible session"
-msgstr "უხილ�ვმ� სესიის�მ ხმ�ვ�ნი სიგნ�ლი გ�მ�სც�"
+msgstr "ზ�რი, რ�მელს�ც �რ�ხილული სესი� გ�მ�სცემს"
 
 #. Name
 #: eventsrc:18
 msgid "Activity in monitored session"
-msgstr ""
+msgstr "�ქტივ�ბ� მიდევნებულ სესი�ში"
 
 #. Comment
 #: eventsrc:19
 msgid "Activity detected in a monitored session"
-msgstr ""
+msgstr "�ღმ�ჩენილი� �ქტივ�ბ� მიდევნებულ სესი�ში"
 
 #. Name
 #: eventsrc:23
-#, fuzzy
 msgid "Silence in monitored session"
-msgstr "უხილ�ვი სესიის�ს ხმ�ვ�ნი სიგნ�ლი"
+msgstr "სიჩუმე მიდევნებულ სესი�ში"
 
 #. Comment
 #: eventsrc:24
-#, fuzzy
 msgid "Silence detected in a monitored session"
-msgstr "უხილ�ვმ� სესიის�მ ხმ�ვ�ნი სიგნ�ლი გ�მ�სც�"
+msgstr "�ღმ�ჩენილი� სიჩუმე მიდევნებულ სესი�ში"
 
 #. Name
 #: eventsrc:28
 msgid "Session finished with non-zero status"
-msgstr "სე�ნსი დ�სრულდ� ნულ�ვ�ნი რეზულტ�ტით"
+msgstr "სესი� �რ�ნულ�ვ�ნი შედეგით დ�სრულდ�"
 
 #. Comment
 #: eventsrc:29
 msgid "A session has exited with non-zero status"
-msgstr "სე�ნსი დ�სრულდ� �რ�ნულ�ვ�ნი რეზულტ�ტით"
+msgstr "სესი� �რ�ნულ�ვ�ნი სტ�ტუსით დ�სრულდ�"
diff --git a/translations/desktop_files/konsole-eventsrc/nl.po b/translations/desktop_files/konsole-eventsrc/nl.po
index c2e6ea2a7..596afee0b 100644
--- a/translations/desktop_files/konsole-eventsrc/nl.po
+++ b/translations/desktop_files/konsole-eventsrc/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 15:54+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-01-08 21:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konsole-events/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
diff --git a/translations/desktop_files/konsole-eventsrc/pt_BR.po b/translations/desktop_files/konsole-eventsrc/pt_BR.po
index 5c695758a..1fe78b49f 100644
--- a/translations/desktop_files/konsole-eventsrc/pt_BR.po
+++ b/translations/desktop_files/konsole-eventsrc/pt_BR.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Diogo Leal <diogo@diogoleal.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 15:54+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: 2024-04-07 15:44+0000\n"
+"Last-Translator: Diogo Leal <diogo@diogoleal.com>\n"
+"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-events/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
diff --git a/translations/desktop_files/kpager.desktop/es_AR.po b/translations/desktop_files/kpager.desktop/es_AR.po
new file mode 100644
index 000000000..0db7548d7
--- /dev/null
+++ b/translations/desktop_files/kpager.desktop/es_AR.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 16:16+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: kpager.desktop:2
+msgid "KPager"
+msgstr ""
+
+#. GenericName
+#: kpager.desktop:4
+msgid "Desktop Pager"
+msgstr ""
diff --git a/translations/desktop_files/kpager.desktop/ka.po b/translations/desktop_files/kpager.desktop/ka.po
index 98669a3e8..18a81b477 100644
--- a/translations/desktop_files/kpager.desktop/ka.po
+++ b/translations/desktop_files/kpager.desktop/ka.po
@@ -1,27 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 16:16+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpager-kpagerdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kpager.desktop:2
 msgid "KPager"
-msgstr ""
+msgstr "KPager"
 
 #. GenericName
 #: kpager.desktop:4
 msgid "Desktop Pager"
-msgstr "ს�მუშ�� დ�ფ�თ� გ�დ�მრთველი"
+msgstr "ს�მუშ�� მ�გიდების გ�დ�მრთველი"
diff --git a/translations/desktop_files/kpager.desktop/nl.po b/translations/desktop_files/kpager.desktop/nl.po
index a4977683c..0ed2623fc 100644
--- a/translations/desktop_files/kpager.desktop/nl.po
+++ b/translations/desktop_files/kpager.desktop/nl.po
@@ -1,27 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 16:16+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpager-kpagerdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kpager.desktop:2
 msgid "KPager"
-msgstr ""
+msgstr "KPager"
 
 #. GenericName
 #: kpager.desktop:4
 msgid "Desktop Pager"
-msgstr "Bureaubladpager"
+msgstr "Werkbladoverzicht"
diff --git a/translations/desktop_files/kpersonalizer.desktop/es_AR.po b/translations/desktop_files/kpersonalizer.desktop/es_AR.po
new file mode 100644
index 000000000..a79c52353
--- /dev/null
+++ b/translations/desktop_files/kpersonalizer.desktop/es_AR.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 16:17+0200\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kpersonalizer-kpersonalizerdesktop/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kpersonalizer.desktop:7
+msgid "KPersonalizer"
+msgstr "KPersonalizer"
+
+#. GenericName
+#: kpersonalizer.desktop:9
+msgid "Desktop Settings Wizard"
+msgstr "Asistente para las preferencias del escritorio"
diff --git a/translations/desktop_files/kpersonalizer.desktop/ka.po b/translations/desktop_files/kpersonalizer.desktop/ka.po
index 74d7e53fe..98dc8841b 100644
--- a/translations/desktop_files/kpersonalizer.desktop/ka.po
+++ b/translations/desktop_files/kpersonalizer.desktop/ka.po
@@ -1,27 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 16:17+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpersonalizer-kpersonalizerdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kpersonalizer.desktop:7
 msgid "KPersonalizer"
-msgstr ""
+msgstr "KPersonalizer"
 
 #. GenericName
 #: kpersonalizer.desktop:9
 msgid "Desktop Settings Wizard"
-msgstr "ს�მუშ�� დ�ფის კ�ნფიგურირების �სტ�ტი"
+msgstr "ს�მუშ�� მ�გიდის მ�რგების �სტ�ტი"
diff --git a/translations/desktop_files/kpersonalizer.desktop/nl.po b/translations/desktop_files/kpersonalizer.desktop/nl.po
index c60ac22fe..32d30bb35 100644
--- a/translations/desktop_files/kpersonalizer.desktop/nl.po
+++ b/translations/desktop_files/kpersonalizer.desktop/nl.po
@@ -1,27 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 16:17+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpersonalizer-kpersonalizerdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kpersonalizer.desktop:7
 msgid "KPersonalizer"
-msgstr ""
+msgstr "KPersonalizer"
 
 #. GenericName
 #: kpersonalizer.desktop:9
 msgid "Desktop Settings Wizard"
-msgstr "TDE's Configuratie Assistent"
+msgstr "TDE-instelhulp"
diff --git a/translations/desktop_files/ksplash-desktops/es_AR.po b/translations/desktop_files/ksplash-desktops/es_AR.po
new file mode 100644
index 000000000..cbd8ff5d8
--- /dev/null
+++ b/translations/desktop_files/ksplash-desktops/es_AR.po
@@ -0,0 +1,67 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 19:16+0200\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/ksplash-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kcmksplash/ksplashthememgr.desktop:12
+msgid "Splash Screen"
+msgstr "Placa anunciadora"
+
+#. Comment
+#: kcmksplash/ksplashthememgr.desktop:14
+msgid "Manager for Splash Screen Themes"
+msgstr "Gestor de los temas de la placa anunciadora"
+
+#. Keywords
+#: kcmksplash/ksplashthememgr.desktop:16
+msgid "splash screen;splash theme;startup;"
+msgstr "placa de inicio;tema de inicio;inicio;"
+
+#. Name
+#: ksplash.desktop:2
+msgid "KSplash"
+msgstr "KSplash"
+
+#. Name
+#: themeengine/default/ksplashdefault.desktop:3
+msgid "KSplashLegacy"
+msgstr "KSplashLegacy"
+
+#. Comment
+#: themeengine/default/ksplashdefault.desktop:4
+#: themeengine/redmond/ksplashredmond.desktop:4
+#: themeengine/standard/ksplashstandard.desktop:4
+#: themeengine/unified/ksplashunified.desktop:4
+msgid "KSplash Plugin"
+msgstr "Complemento KSplash"
+
+#. Name
+#: themeengine/redmond/ksplashredmond.desktop:3
+msgid "KSplashRedmond"
+msgstr "KSplashRedmond"
+
+#. Name
+#: themeengine/standard/ksplashstandard.desktop:3
+msgid "KSplashStandard"
+msgstr "KSplashStandard"
+
+#. Name
+#: themeengine/unified/ksplashunified.desktop:3
+msgid "KSplashUnified"
+msgstr "KSplashUnified"
diff --git a/translations/desktop_files/ksplash-desktops/ka.po b/translations/desktop_files/ksplash-desktops/ka.po
index 139412948..d8e3e1b6e 100644
--- a/translations/desktop_files/ksplash-desktops/ka.po
+++ b/translations/desktop_files/ksplash-desktops/ka.po
@@ -1,46 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 19:16+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmksplash/ksplashthememgr.desktop:12
 msgid "Splash Screen"
-msgstr ""
+msgstr "გ�შვების სურ�თი"
 
 #. Comment
 #: kcmksplash/ksplashthememgr.desktop:14
 msgid "Manager for Splash Screen Themes"
-msgstr ""
+msgstr "მმ�რთველი გ�შვების ეკრ�ნის თემებისთვის"
 
 #. Keywords
 #: kcmksplash/ksplashthememgr.desktop:16
 msgid "splash screen;splash theme;startup;"
-msgstr ""
+msgstr "splash screen;splash theme;startup;გ�შვების ეკრ�ნი;თემ�;"
 
 #. Name
 #: ksplash.desktop:2
-#, fuzzy
 msgid "KSplash"
-msgstr "KSplash პლ�გინი"
+msgstr "KSplash"
 
 #. Name
 #: themeengine/default/ksplashdefault.desktop:3
 msgid "KSplashLegacy"
-msgstr ""
+msgstr "KSplashLegacy"
 
 #. Comment
 #: themeengine/default/ksplashdefault.desktop:4
@@ -48,19 +48,19 @@ msgstr ""
 #: themeengine/standard/ksplashstandard.desktop:4
 #: themeengine/unified/ksplashunified.desktop:4
 msgid "KSplash Plugin"
-msgstr "KSplash პლ�გინი"
+msgstr "KSplash-ის დ�მ�ტებ�"
 
 #. Name
 #: themeengine/redmond/ksplashredmond.desktop:3
 msgid "KSplashRedmond"
-msgstr ""
+msgstr "KSplashRedmond"
 
 #. Name
 #: themeengine/standard/ksplashstandard.desktop:3
 msgid "KSplashStandard"
-msgstr ""
+msgstr "KSplashStandard"
 
 #. Name
 #: themeengine/unified/ksplashunified.desktop:3
 msgid "KSplashUnified"
-msgstr ""
+msgstr "KSplashUnified"
diff --git a/translations/desktop_files/ksplash-desktops/nl.po b/translations/desktop_files/ksplash-desktops/nl.po
index 0baeb9ced..c8868d894 100644
--- a/translations/desktop_files/ksplash-desktops/nl.po
+++ b/translations/desktop_files/ksplash-desktops/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 19:16+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: 2024-11-18 13:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmksplash/ksplashthememgr.desktop:12
@@ -29,18 +30,17 @@ msgstr "Themabeheer voor opstartschermen"
 #. Keywords
 #: kcmksplash/ksplashthememgr.desktop:16
 msgid "splash screen;splash theme;startup;"
-msgstr "opstartscherm;splash screen;"
+msgstr "opstartscherm;thema;opstarten;beheer;"
 
 #. Name
 #: ksplash.desktop:2
-#, fuzzy
 msgid "KSplash"
-msgstr "KSplash-plugin"
+msgstr "KSplash"
 
 #. Name
 #: themeengine/default/ksplashdefault.desktop:3
 msgid "KSplashLegacy"
-msgstr ""
+msgstr "KSplashLegacy"
 
 #. Comment
 #: themeengine/default/ksplashdefault.desktop:4
@@ -48,19 +48,19 @@ msgstr ""
 #: themeengine/standard/ksplashstandard.desktop:4
 #: themeengine/unified/ksplashunified.desktop:4
 msgid "KSplash Plugin"
-msgstr "KSplash-plugin"
+msgstr "KSplash-plug-in"
 
 #. Name
 #: themeengine/redmond/ksplashredmond.desktop:3
 msgid "KSplashRedmond"
-msgstr ""
+msgstr "KSplashRedmond"
 
 #. Name
 #: themeengine/standard/ksplashstandard.desktop:3
 msgid "KSplashStandard"
-msgstr ""
+msgstr "KSplashStandard"
 
 #. Name
 #: themeengine/unified/ksplashunified.desktop:3
 msgid "KSplashUnified"
-msgstr ""
+msgstr "KSplashUnified"
diff --git a/translations/desktop_files/ksplash-themes/es_AR.po b/translations/desktop_files/ksplash-themes/es_AR.po
new file mode 100644
index 000000000..1227e73dc
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/es_AR.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/ksplash-themes/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "Placa Anunciadora de TDE 3.5"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "Olas del cambio"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "Tema de Anunciador KDE Azul-curvado"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "Carga el Tema KDE Azul-curvado."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr "Tema de Anunciador TDE Refrescado"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "Carga el tema KSplash TDE Refrescado."
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr "Sin Placa Anunciadora"
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr "Placa Anunciadora Apagada"
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr "Placa Anunciadora Simple"
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr "Placa Anunciadora Optimizada y Simple"
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr "Placa Anunciadora Unificada de Trinity"
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr "Placa unificada de inicio del sistema"
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr "Placa Anunciadora de Redmond"
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr "Tema KSplash inspirado por la placa de inicio de Microsoft Windows."
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr "Placa Anunciadora Estandar"
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr "Tema KSplash Estandar de TDE."
diff --git a/translations/desktop_files/ksplash-themes/ka.po b/translations/desktop_files/ksplash-themes/ka.po
new file mode 100644
index 000000000..c41cafea1
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/ka.po
@@ -0,0 +1,100 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2024-12-07 03:11+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-themes/ka/>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "TDE 3.5-ის გ�შვების სურ�თი"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "ცვლილების ტ�ლღები"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "მ�ლურჯ� TDE-ის გ�შვების თემ�"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "TDE-ის მ�ლურჯ� გ�შვების თემის ჩ�ტვირთვ�."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr "TDE-ის გ�შვების სურ�თის თემის გ�ნ�ხლებ�"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "KSplash-ის თემ� Load Refresh TDE."
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr "გ�შვების ეკრ�ნის გ�რეშე"
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr "გ�შვების სურ�თი გ�მ�რთული�"
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr "მ�რტივი გ�შვების სურ�თი"
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr "ძ�ლი�ნ მ�რტივი �პტიმიზებული გ�შვების სურ�თი"
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr "Trinity-ის გ�შვების სურ�თი"
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr "გ�ერთი�ნებული სისტემის გ�შვების ეკრ�ნი"
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr "რედმ�ნდული გ�შვების ეკრ�ნი"
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr "KSplash-ის თემ�, რ�მელიც Microsoft Windows-ის გ�შვების ეკრ�ნს წ��გ�ვს."
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr "სტ�ნდ�რტული გ�შვების ეკრ�ნი"
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr "სტ�ნდ�რტული TDE KSplash-ის თემ�."
diff --git a/translations/desktop_files/ksplash-themes/nl.po b/translations/desktop_files/ksplash-themes/nl.po
new file mode 100644
index 000000000..a5ae51591
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/nl.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Heimen Stoffels <vistausss@outlook.com>, 2024.
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2024-11-18 13:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-themes/nl/>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "TDE 3.5-opstartscherm"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "Van de stroming af"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "Blauwe band - KDE-opstartscherm"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "Laad het Blauwe Band-opstartscherm."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr "Vernieuwing - TDE-opstartscherm"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "Laad het Vernieuwing-opstartscherm."
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr "Geen opstartscherm"
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr "Het opstartscherm is uitgeschakeld"
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr "Eenvoudig opstartscherm"
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr "Zeer eenvoudig doch geoptimaliseerd opstartscherm"
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr "Trinity-eenheid - TDE-opstartscherm"
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr "Eenduidig opstartscherm"
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr "Redmond-opstartscherm"
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr "Een opstartscherm geïnspireerd op dat van oude Windows-versies."
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr "Standaard opstartscherm"
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr "Het standaard TDE-opstartscherm."
diff --git a/translations/desktop_files/ksplash-themes/ru.po b/translations/desktop_files/ksplash-themes/ru.po
index 4cf36220a..146be4e9a 100644
--- a/translations/desktop_files/ksplash-themes/ru.po
+++ b/translations/desktop_files/ksplash-themes/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2021.
+# Alexander Golubev <fatzer2@gmail.com>, 2021, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-24 18:26+0100\n"
-"PO-Revision-Date: 2021-02-14 18:48+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/ksplash-themes/ru/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4.2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: pics/themes/TDE-Classic/Theme.rc:4
@@ -43,12 +43,12 @@ msgstr "Тема KSplash «Синий изгиб KDE»."
 #. Name
 #: pics/themes/default/Theme.rc:6
 msgid "Refresh TDE Splash Theme"
-msgstr ""
+msgstr "Обновлённа� тема за�тавки TDE"
 
 #. Description
 #: pics/themes/default/Theme.rc:7
 msgid "Load Refresh TDE KSplash theme."
-msgstr ""
+msgstr "Тема за�тавки TDE Load Refresh."
 
 #. Name
 #: pics/themes/none/Theme.rc:4
@@ -63,39 +63,39 @@ msgstr "За�тавка отключена"
 #. Name
 #: pics/themes/simple/Theme.rc:4
 msgid "Simple Splash Screen"
-msgstr ""
+msgstr "Про�та� за�тавка"
 
 #. Description
 #: pics/themes/simple/Theme.rc:5
 msgid "Very Simple Optimized Splash Screen"
-msgstr ""
+msgstr "Очень про�та�, но оптимизированна� тема за�тавки"
 
 #. Name
 #: pics/themes/unified/Theme.rc:4
 msgid "Trinity Unified Splash Screen"
-msgstr ""
+msgstr "Объединённа� тема за�тавки Trinity"
 
 #. Description
 #: pics/themes/unified/Theme.rc:5
 msgid "Unified system startup screen"
-msgstr ""
+msgstr "Объединённый �и�темный �кран за�тавки"
 
 #. Name
 #: themeengine/redmond/Theme.rc:2
 msgid "Redmond Splash Screen"
-msgstr ""
+msgstr "За�тавка Редмонд"
 
 #. Description
 #: themeengine/redmond/Theme.rc:3
 msgid "KSplash theme inspired by the Microsoft Windows startup screen."
-msgstr ""
+msgstr "Тема за�тавки KSplash вдохновлённа� �краном загрузки Microsoft Windows."
 
 #. Name
 #: themeengine/standard/Theme.rc:2
 msgid "Standard Splash Screen"
-msgstr ""
+msgstr "Стандартна� за�тавка"
 
 #. Description
 #: themeengine/standard/Theme.rc:3
 msgid "Standard TDE KSplash theme."
-msgstr ""
+msgstr "Стандартна� тема за�тавки TDE."
diff --git a/translations/desktop_files/ksplash-themes/zh_Hans.po b/translations/desktop_files/ksplash-themes/zh_Hans.po
new file mode 100644
index 000000000..a36f90c4e
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/zh_Hans.po
@@ -0,0 +1,100 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Toad114514 <xiaolan2332021@163.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2025-01-28 12:12+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/ksplash-themes/zh_Hans/>\n"
+"Language: zh_Hans\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.17\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "TDE 3.5 �动画�"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "�化的波浪"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "Blue-Bend KDE �动画�"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "加载 Blue-Bend KDE KSplash 主题。"
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr "Refresh TDE �动画�主题"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "加载 Refresh TDE KSplash 主题。"
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr "没有�动画�"
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr "关闭�动画�"
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr "Simple �动画�"
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr "�常简�的�动画�"
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr "Trinity Unified �动画�"
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr "Unified 系统的�动画�"
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr "Redmond �动画�"
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr "该主题�微软 Windows �动画�的��。"
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr "Standard �动画�"
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr "普通的 TDE KSplash 主题。"
diff --git a/translations/desktop_files/ksysguard-desktops/es_AR.po b/translations/desktop_files/ksysguard-desktops/es_AR.po
new file mode 100644
index 000000000..424c95637
--- /dev/null
+++ b/translations/desktop_files/ksysguard-desktops/es_AR.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 20:10+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: gui/ksysguard.desktop:2
+msgid "KSysGuard"
+msgstr ""
+
+#. GenericName
+#: gui/ksysguard.desktop:4
+msgid "Performance Monitor"
+msgstr ""
+
+#. Name
+#: gui/ksysguardapplet.desktop:4
+msgid "System Guard"
+msgstr ""
+
+#. Comment
+#: gui/ksysguardapplet.desktop:6
+msgid "An advanced system monitor which allows TDE system guard displays"
+msgstr ""
+
+#. Comment
+#: gui/x-ksysguard.desktop:5
+msgid "TDE System Guard"
+msgstr ""
diff --git a/translations/desktop_files/ksysguard-desktops/ka.po b/translations/desktop_files/ksysguard-desktops/ka.po
index 45b492f3d..f85da98f6 100644
--- a/translations/desktop_files/ksysguard-desktops/ka.po
+++ b/translations/desktop_files/ksysguard-desktops/ka.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:10+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksysguard-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: gui/ksysguard.desktop:2
-#, fuzzy
 msgid "KSysGuard"
-msgstr "სისტემის მცველი"
+msgstr "KSysGuard"
 
 #. GenericName
 #: gui/ksysguard.desktop:4
@@ -36,6 +36,8 @@ msgstr "სისტემის მცველი"
 #: gui/ksysguardapplet.desktop:6
 msgid "An advanced system monitor which allows TDE system guard displays"
 msgstr ""
+"სისტემური მ�ნიტ�რი, რ�მელიც TDE-ის სისტემური დ�ცვის ჩვენების ს�შუ�ლებ�ს "
+"გ�ძლევთ"
 
 #. Comment
 #: gui/x-ksysguard.desktop:5
diff --git a/translations/desktop_files/ksysguard-desktops/nl.po b/translations/desktop_files/ksysguard-desktops/nl.po
index e767e421c..07766ca97 100644
--- a/translations/desktop_files/ksysguard-desktops/nl.po
+++ b/translations/desktop_files/ksysguard-desktops/nl.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:10+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-01-08 21:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksysguard-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: gui/ksysguard.desktop:2
-#, fuzzy
 msgid "KSysGuard"
-msgstr "Systeembewaking"
+msgstr "Systeemmonitor"
 
 #. GenericName
 #: gui/ksysguard.desktop:4
@@ -35,9 +35,9 @@ msgstr "Systeembewaking"
 #. Comment
 #: gui/ksysguardapplet.desktop:6
 msgid "An advanced system monitor which allows TDE system guard displays"
-msgstr "Een geavanceerde systeemmonitor met systeembewakingsdisplays"
+msgstr "Een geavanceerde systeemmonitor met systeembewakingsoverzichten"
 
 #. Comment
 #: gui/x-ksysguard.desktop:5
 msgid "TDE System Guard"
-msgstr "TDE systeembewaking"
+msgstr "TDE-systeemmonitor"
diff --git a/translations/desktop_files/ksysguard-eventsrc/es_AR.po b/translations/desktop_files/ksysguard-eventsrc/es_AR.po
new file mode 100644
index 000000000..aab86b3ec
--- /dev/null
+++ b/translations/desktop_files/ksysguard-eventsrc/es_AR.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 20:10+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Comment
+#: eventsrc:3
+msgid "System Guard"
+msgstr ""
+
+#. Name
+#: eventsrc:6
+msgid "pattern_match"
+msgstr ""
+
+#. Comment
+#: eventsrc:7
+msgid "Search pattern matched"
+msgstr ""
+
+#. Name
+#: eventsrc:10
+msgid "sensor_alarm"
+msgstr ""
+
+#. Comment
+#: eventsrc:11
+msgid "Sensor exceeded critical limit"
+msgstr ""
diff --git a/translations/desktop_files/ksysguard-eventsrc/ka.po b/translations/desktop_files/ksysguard-eventsrc/ka.po
index c3a264b70..5934b13cb 100644
--- a/translations/desktop_files/ksysguard-eventsrc/ka.po
+++ b/translations/desktop_files/ksysguard-eventsrc/ka.po
@@ -1,41 +1,41 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:10+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksysguard-events/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "System Guard"
-msgstr "სისტემური მ�ნიტ�რი"
+msgstr "სისტემის მცველი"
 
 #. Name
 #: eventsrc:6
-#, fuzzy
 msgid "pattern_match"
-msgstr "ძიების ნიმუშთ�ნ შეს�ბ�მის�ბ�"
+msgstr "ნიმუშის დ�მთხვევ�"
 
 #. Comment
 #: eventsrc:7
 msgid "Search pattern matched"
-msgstr "ძიების ნიმუშთ�ნ შეს�ბ�მის�ბ�"
+msgstr "ძებნის ნიმუშის დ�მთხვევ�"
 
 #. Name
 #: eventsrc:10
 msgid "sensor_alarm"
-msgstr ""
+msgstr "სენს�რის გ�ნგ�ში"
 
 #. Comment
 #: eventsrc:11
diff --git a/translations/desktop_files/ksysguard-eventsrc/nl.po b/translations/desktop_files/ksysguard-eventsrc/nl.po
index 4f23c519b..bc5847a3f 100644
--- a/translations/desktop_files/ksysguard-eventsrc/nl.po
+++ b/translations/desktop_files/ksysguard-eventsrc/nl.po
@@ -1,43 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:10+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-01-08 21:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksysguard-events/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "System Guard"
-msgstr "systeembewaking"
+msgstr "Systeemmonitor"
 
 #. Name
 #: eventsrc:6
-#, fuzzy
 msgid "pattern_match"
-msgstr "Zoekpatroon komt overeen"
+msgstr "pattern_match"
 
 #. Comment
 #: eventsrc:7
 msgid "Search pattern matched"
-msgstr "Zoekpatroon komt overeen"
+msgstr "Het zoekpatroon komt overeen"
 
 #. Name
 #: eventsrc:10
 msgid "sensor_alarm"
-msgstr "sensormelding"
+msgstr "sensor_alarm"
 
 #. Comment
 #: eventsrc:11
 msgid "Sensor exceeded critical limit"
-msgstr "Sensor overschreed kritieke limiet"
+msgstr "De sensor overschreed de kritieke limiet"
diff --git a/translations/desktop_files/ktip.desktop/es_AR.po b/translations/desktop_files/ktip.desktop/es_AR.po
new file mode 100644
index 000000000..f51024c89
--- /dev/null
+++ b/translations/desktop_files/ktip.desktop/es_AR.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 20:16+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: ktip.desktop:2
+msgid "KTip"
+msgstr ""
+
+#. GenericName
+#: ktip.desktop:4
+msgid "Useful Tips"
+msgstr ""
diff --git a/translations/desktop_files/ktip.desktop/ka.po b/translations/desktop_files/ktip.desktop/ka.po
index 9acf57fe2..d2ce1fb1d 100644
--- a/translations/desktop_files/ktip.desktop/ka.po
+++ b/translations/desktop_files/ktip.desktop/ka.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:16+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/ktip.desktop/nl.po b/translations/desktop_files/ktip.desktop/nl.po
index 5662267df..76381362b 100644
--- a/translations/desktop_files/ktip.desktop/nl.po
+++ b/translations/desktop_files/ktip.desktop/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:16+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: 2024-11-19 14:10+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ktip-ktipdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/kxkb-desktops/es_AR.po b/translations/desktop_files/kxkb-desktops/es_AR.po
new file mode 100644
index 000000000..c9ec0b47e
--- /dev/null
+++ b/translations/desktop_files/kxkb-desktops/es_AR.po
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 20:20+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: keyboard.desktop:12
+msgid "Keyboard"
+msgstr ""
+
+#. Comment
+#: keyboard.desktop:14
+msgid "Keyboard settings"
+msgstr ""
+
+#. Keywords
+#: keyboard.desktop:16
+msgid "Keyboard;Keyboard repeat;Click volume;Input Devices;repeat;volume;"
+msgstr ""
+
+#. Name
+#. Comment
+#: keyboard_layout.desktop:12 keyboard_layout.desktop:14
+msgid "Keyboard Layout"
+msgstr ""
+
+#. Keywords
+#: keyboard_layout.desktop:16
+msgid "Keyboard;Layout;International;"
+msgstr ""
+
+#. Name
+#: kxkb.desktop:4
+msgid "Keyboard Map Tool"
+msgstr ""
diff --git a/translations/desktop_files/kxkb-desktops/ka.po b/translations/desktop_files/kxkb-desktops/ka.po
index 6dcd31f81..a874f8588 100644
--- a/translations/desktop_files/kxkb-desktops/ka.po
+++ b/translations/desktop_files/kxkb-desktops/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:20+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: keyboard.desktop:12
@@ -24,12 +25,13 @@ msgstr "კლ�ვი�ტურ�"
 #. Comment
 #: keyboard.desktop:14
 msgid "Keyboard settings"
-msgstr "კლ�ვი�ტურის კ�ნფიგურ�ცი�"
+msgstr "კლ�ვი�ტურის მ�რგებ�"
 
 #. Keywords
 #: keyboard.desktop:16
 msgid "Keyboard;Keyboard repeat;Click volume;Input Devices;repeat;volume;"
 msgstr ""
+"კლ�ვი�ტურ�;კლ�ვი�ტურის გ�მე�რებ�;წკ�პის ხმ�;შეყვ�ნის მ�წყ�ბილ�ბები;ხმის დ�ნე;"
 
 #. Name
 #. Comment
@@ -39,9 +41,8 @@ msgstr "კლ�ვი�ტურის გ�ნლ�გებ�"
 
 #. Keywords
 #: keyboard_layout.desktop:16
-#, fuzzy
 msgid "Keyboard;Layout;International;"
-msgstr "კლ�ვი�ტურის გ�ნლ�გებ�"
+msgstr "კლ�ვი�ტურ�;გ�ნლ�გებ�;ს�ერთ�შ�რის�;"
 
 #. Name
 #: kxkb.desktop:4
diff --git a/translations/desktop_files/kxkb-desktops/ru.po b/translations/desktop_files/kxkb-desktops/ru.po
index 0c3a55332..b927f8bae 100644
--- a/translations/desktop_files/kxkb-desktops/ru.po
+++ b/translations/desktop_files/kxkb-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 20:20+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: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: keyboard.desktop:12
@@ -30,6 +32,8 @@ msgstr "�а�тройка клавиатуры"
 #: keyboard.desktop:16
 msgid "Keyboard;Keyboard repeat;Click volume;Input Devices;repeat;volume;"
 msgstr ""
+"Клавиатура;�втоповтор;Звук нажати� клавишь;Звук;У�трой�тва "
+"ввода;повтор;громко�ть;"
 
 #. Name
 #. Comment
@@ -39,9 +43,8 @@ msgstr "Ра�кладка клавиатуры"
 
 #. Keywords
 #: keyboard_layout.desktop:16
-#, fuzzy
 msgid "Keyboard;Layout;International;"
-msgstr "Ра�кладка клавиатуры"
+msgstr "Клавиатура;Ра�кладка;Международный;"
 
 #. Name
 #: kxkb.desktop:4
diff --git a/translations/desktop_files/kxkb-eventsrc/cs.po b/translations/desktop_files/kxkb-eventsrc/cs.po
new file mode 100644
index 000000000..965882721
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/cs.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: 2025-04-15 20:44+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kxkb-events/cs/>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "Nástroj TDE pro klávesnici"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Přepnutí rozložení klávesnice"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "Rozložení klávesnice bylo přepnuto"
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr "Chyba při přepnutí rozložení klávesnice"
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr "Došlo k chybě při pokusu o přepnutí rozložení klávesnice"
diff --git a/translations/desktop_files/kxkb-eventsrc/el.po b/translations/desktop_files/kxkb-eventsrc/el.po
new file mode 100644
index 000000000..5c242bc7c
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/el.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# "blu.256" <mavridisf@gmail.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: 2025-04-24 12:44+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kxkb-events/el/>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "Ε�γαλείο πληκτ�ολογίου TDE"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Αλλαγή διάταξης πληκτ�ολογίου"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "Η διάταξη του πληκτ�ολογίου άλλαξε"
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr "Σφάλμα αλλαγής διάταξης πληκτ�ολογίου"
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr "Ένα σφάλμα π�οέκυψε κατά την π�οσπάθεια αλλαγής διάταξης πληκτ�ολογίου"
diff --git a/translations/desktop_files/kxkb-eventsrc/es_AR.po b/translations/desktop_files/kxkb-eventsrc/es_AR.po
new file mode 100644
index 000000000..dd51a6db9
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/es_AR.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr ""
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr ""
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr ""
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr ""
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr ""
diff --git a/translations/desktop_files/kxkb-eventsrc/it.po b/translations/desktop_files/kxkb-eventsrc/it.po
new file mode 100644
index 000000000..0515ab757
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/it.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: 2025-04-12 01:44+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-events/it/>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "Strumento TDE per la tastiera"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Cambia layout della tastiera"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "Il layout della tastiera è stato cambiato"
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr "Errore nel cambio del layout della tastiera"
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr "Errore durante il tentativo di cambiare il layout della tastiera"
diff --git a/translations/desktop_files/kxkb-eventsrc/ka.po b/translations/desktop_files/kxkb-eventsrc/ka.po
new file mode 100644
index 000000000..3e319aea9
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/ka.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: 2025-06-25 07:59+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-events/ka/>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "TDE-ის კლ�ვი�ტურის პრ�გრ�მ�"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "კლ�ვი�ტურის გ�ნლ�გების გ�დ�რთვ�"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "კლ�ვი�ტურის გ�ნლ�გებ� გ�დ�ირთ�"
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr "კლ�ვი�ტურის გ�ნლ�გების გ�დ�რთვის შეცდ�მ�"
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr ""
diff --git a/translations/desktop_files/kxkb-eventsrc/kxkb-eventsrc.pot b/translations/desktop_files/kxkb-eventsrc/kxkb-eventsrc.pot
new file mode 100644
index 000000000..53813f9fe
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/kxkb-eventsrc.pot
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr ""
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr ""
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr ""
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr ""
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr ""
diff --git a/translations/desktop_files/kxkb-eventsrc/nl.po b/translations/desktop_files/kxkb-eventsrc/nl.po
new file mode 100644
index 000000000..5bd132ca5
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/nl.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Heimen Stoffels <vistausss@outlook.com>, 2024.
+# Heimen Stoffels <vistausss@fastmail.com>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: 2025-04-05 14:18+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kxkb-events/nl/>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "TDE-toetsenbordhulpmiddel"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Andere toetsenbordindeling"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "De toetsenbordindeling is gewijzigd"
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr "Andere toetsenbordindeling mislukt"
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr "Er kan geen andere toetsenbordindeling worden gekozen"
diff --git a/translations/desktop_files/kxkb-eventsrc/pl.po b/translations/desktop_files/kxkb-eventsrc/pl.po
new file mode 100644
index 000000000..559d0531c
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/pl.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Marek W <coronzon88@gmail.com>, 2024, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: 2025-04-05 14:18+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-events/pl/>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "Narzędzie klawiatury TDE"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Przełączenie układu klawiatury"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "Przełączono układ klawiatury"
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr "Błąd przełączania układu klawiatury"
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr "Błąd podczas próby zmiany układu klawiatury"
diff --git a/translations/desktop_files/kxkb-eventsrc/ru.po b/translations/desktop_files/kxkb-eventsrc/ru.po
new file mode 100644
index 000000000..8de9c2690
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/ru.po
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
+# "blu.256" <mavridisf@gmail.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-04-03 18:15+0000\n"
+"PO-Revision-Date: 2025-04-24 12:44+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kxkb-events/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "TDE Keyboard Tool"
+msgstr "Сред�тво дл� клавиатуры TDE"
+
+#. Name
+#: eventsrc:6
+msgid "Keyboard layout switch"
+msgstr "Переключение ра�кладки клавиатуры"
+
+#. Comment
+#: eventsrc:7
+msgid "The keyboard layout was switched"
+msgstr "Ра�кладка клавиатуры была переключена"
+
+#. Name
+#: eventsrc:11
+msgid "Keyboard layout switching error"
+msgstr "Ошибка переключени� ра�кладки клавиатуры"
+
+#. Comment
+#: eventsrc:12
+msgid "Error while attempting to switch the keyboard layout"
+msgstr "При попытке переключени� ра�кладки клавиатуры произошла ошибка"
diff --git a/translations/desktop_files/l10n-desktops/el.po b/translations/desktop_files/l10n-desktops/el.po
index 04c6fbca9..cbe2c8797 100644
--- a/translations/desktop_files/l10n-desktops/el.po
+++ b/translations/desktop_files/l10n-desktops/el.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# "blu.256" <mavridisf@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-16 18:21+0000\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-04-24 12:44+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/l10n-desktop-files/el/>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -264,7 +265,7 @@ msgstr "Β�αζιλία"
 #. Name
 #: braille/entry.desktop:2
 msgid "Braille"
-msgstr ""
+msgstr "Γ�αματοσει�ά Braille"
 
 #. Name
 #: bs/entry.desktop:2
@@ -434,7 +435,7 @@ msgstr "Δυτική Σαχά�α"
 #. Name
 #: eo/entry.desktop:2
 msgid "Esperanto"
-msgstr ""
+msgstr "Εσπε�άντο"
 
 #. Name
 #: er/entry.desktop:2
@@ -643,10 +644,8 @@ msgstr "Ιαπωνία"
 
 #. Name
 #: jv/entry.desktop:2
-#, fuzzy
-#| msgid "Indonesia"
 msgid "Indonesia (Java)"
-msgstr "Ινδονησία"
+msgstr "Ινδονησία (Ιάβα)"
 
 #. Name
 #: ke/entry.desktop:2
diff --git a/translations/desktop_files/l10n-desktops/es_AR.po b/translations/desktop_files/l10n-desktops/es_AR.po
new file mode 100644
index 000000000..5aea69e3d
--- /dev/null
+++ b/translations/desktop_files/l10n-desktops/es_AR.po
@@ -0,0 +1,1274 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-05-16 18:21+0000\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/l10n-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: caribbean.desktop:2
+msgid "Caribbean"
+msgstr "Caribe"
+
+#. Name
+#: centralafrica.desktop:2
+msgid "Africa, Central"
+msgstr "Africa, Central"
+
+#. Name
+#: centralamerica.desktop:2
+msgid "America, Central"
+msgstr "América, Central"
+
+#. Name
+#: centralasia.desktop:2
+msgid "Asia, Central"
+msgstr "Asia, Central"
+
+#. Name
+#: centraleurope.desktop:2
+msgid "Europe, Central"
+msgstr "Europa, Central"
+
+#. Name
+#: eastasia.desktop:2
+msgid "Asia, East"
+msgstr "Asia, Este"
+
+#. Name
+#: easteurope.desktop:2
+msgid "Europe, Eastern"
+msgstr "Europa, oriental"
+
+#. Name
+#: middleeast.desktop:2
+msgid "Middle-East"
+msgstr "Oriente medio"
+
+#. Name
+#: northafrica.desktop:2
+msgid "Africa, Northern"
+msgstr "�frica del Norte"
+
+#. Name
+#: northamerica.desktop:2
+msgid "America, North"
+msgstr "América del Norte"
+
+#. Name
+#: northeurope.desktop:2
+msgid "Europe, Northern"
+msgstr "Europa, Norte"
+
+#. Name
+#: oceania.desktop:2
+msgid "Oceania"
+msgstr "Oceanía"
+
+#. Name
+#: southafrica.desktop:2
+msgid "Africa, Southern"
+msgstr "�frica Septentrional"
+
+#. Name
+#: southamerica.desktop:2
+msgid "America, South"
+msgstr "América del Sur"
+
+#. Name
+#: southasia.desktop:2
+msgid "Asia, South"
+msgstr "Asia, Sur"
+
+#. Name
+#: southeastasia.desktop:2
+msgid "Asia, South-East"
+msgstr "Asia, Sureste"
+
+#. Name
+#: southeurope.desktop:2
+msgid "Europe, Southern"
+msgstr "Europa, Sur"
+
+#. Name
+#: westafrica.desktop:2
+msgid "Africa, Western"
+msgstr "Africa Occidental"
+
+#. Name
+#: westeurope.desktop:2
+msgid "Europe, Western"
+msgstr "Europa, Occidente"
+
+#. Name
+#: C/entry.desktop:2
+msgid "Default"
+msgstr "Predeterminado"
+
+#. Name
+#: ad/entry.desktop:2
+msgid "Andorra"
+msgstr "Andorra"
+
+#. Name
+#: ae/entry.desktop:2
+msgid "United Arab Emirates"
+msgstr "Emiratos árabes unidos"
+
+#. Name
+#: af/entry.desktop:2
+msgid "Afghanistan"
+msgstr "Afghanistán"
+
+#. Name
+#: ag/entry.desktop:2
+msgid "Antigua and Barbuda"
+msgstr "Antigua y Barbuda"
+
+#. Name
+#: ai/entry.desktop:2
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#. Name
+#: al/entry.desktop:2
+msgid "Albania"
+msgstr "Albania"
+
+#. Name
+#: am/entry.desktop:2
+msgid "Armenia"
+msgstr "Armenia"
+
+#. Name
+#: an/entry.desktop:2
+msgid "Netherlands Antilles"
+msgstr "Antillas Neerlandesas"
+
+#. Name
+#: ao/entry.desktop:2
+msgid "Angola"
+msgstr "Angola"
+
+#. Name
+#: ar/entry.desktop:2
+msgid "Argentina"
+msgstr "Argentina"
+
+#. Name
+#: as/entry.desktop:2
+msgid "American Samoa"
+msgstr "Samoa americana"
+
+#. Name
+#: at/entry.desktop:2
+msgid "Austria"
+msgstr "Austria"
+
+#. Name
+#: au/entry.desktop:2
+msgid "Australia"
+msgstr "Australia"
+
+#. Name
+#: aw/entry.desktop:2
+msgid "Aruba"
+msgstr "Aruba"
+
+#. Name
+#: ax/entry.desktop:2
+msgid "Ã…land Islands"
+msgstr "Islas Ã…land"
+
+#. Name
+#: az/entry.desktop:2
+msgid "Azerbaijan"
+msgstr "Azerbaiján"
+
+#. Name
+#: ba/entry.desktop:2
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia y Herzegovina"
+
+#. Name
+#: bb/entry.desktop:2
+msgid "Barbados"
+msgstr "Barbados"
+
+#. Name
+#: bd/entry.desktop:2
+msgid "Bangladesh"
+msgstr "Bangladés"
+
+#. Name
+#: be/entry.desktop:2
+msgid "Belgium"
+msgstr "Bélgica"
+
+#. Name
+#: bf/entry.desktop:2
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#. Name
+#: bg/entry.desktop:2
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#. Name
+#: bh/entry.desktop:2
+msgid "Bahrain"
+msgstr "Baréin"
+
+#. Name
+#: bi/entry.desktop:2
+msgid "Burundi"
+msgstr "Burundi"
+
+#. Name
+#: bj/entry.desktop:2
+msgid "Benin"
+msgstr "Benín"
+
+#. Name
+#: bm/entry.desktop:2
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#. Name
+#: bn/entry.desktop:3
+msgid "Brunei Darussalam"
+msgstr "Brunéi"
+
+#. Name
+#: bo/entry.desktop:2
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#. Name
+#: br/entry.desktop:2
+msgid "Brazil"
+msgstr "Brasil"
+
+#. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr "Braile"
+
+#. Name
+#: bs/entry.desktop:2
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#. Name
+#: bt/entry.desktop:3
+msgid "Bhutan"
+msgstr "Bután"
+
+#. Name
+#: bw/entry.desktop:2
+msgid "Botswana"
+msgstr "Botsuana"
+
+#. Name
+#: by/entry.desktop:3
+msgid "Belarus"
+msgstr "Bielorusia"
+
+#. Name
+#: bz/entry.desktop:2
+msgid "Belize"
+msgstr "Belize"
+
+#. Name
+#: ca/entry.desktop:5
+msgid "Canada"
+msgstr "Canadá"
+
+#. Name
+#: cc/entry.desktop:2
+msgid "Cocos (Keeling) Islands"
+msgstr "Islas Cocos (Keeling)"
+
+#. Name
+#: cd/entry.desktop:2
+msgid "Congo, The Democratic Republic of the"
+msgstr "Congo, República democrática del"
+
+#. Name
+#: cf/entry.desktop:2
+msgid "Central African Republic"
+msgstr "República Centroafricana"
+
+#. Name
+#: cg/entry.desktop:2
+msgid "Congo"
+msgstr "Congo"
+
+#. Name
+#: ch/entry.desktop:2
+msgid "Switzerland"
+msgstr "Suiza"
+
+#. Name
+#: ci/entry.desktop:2
+msgid "Cote d'ivoire"
+msgstr "Costa de Marfil"
+
+#. Name
+#: ck/entry.desktop:2
+msgid "Cook islands"
+msgstr "Islas Cook"
+
+#. Name
+#: cl/entry.desktop:2
+msgid "Chile"
+msgstr "Chile"
+
+#. Name
+#: cm/entry.desktop:2
+msgid "Cameroon"
+msgstr "Camerún"
+
+#. Name
+#: cn/entry.desktop:3
+msgid "China"
+msgstr "China"
+
+#. Name
+#: co/entry.desktop:2
+msgid "Colombia"
+msgstr "Colombia"
+
+#. Name
+#: cr/entry.desktop:2
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#. Name
+#: cu/entry.desktop:2
+msgid "Cuba"
+msgstr "Cuba"
+
+#. Name
+#: cv/entry.desktop:2
+msgid "Cape Verde"
+msgstr "Cabo Verde"
+
+#. Name
+#: cx/entry.desktop:2
+msgid "Christmas Island"
+msgstr "Islas Christmas"
+
+#. Name
+#: cy/entry.desktop:2
+msgid "Cyprus"
+msgstr "Chipre"
+
+#. Name
+#: cz/entry.desktop:2
+msgid "Czechia"
+msgstr "República Checa"
+
+#. Name
+#: de/entry.desktop:2
+msgid "Germany"
+msgstr "Alemania"
+
+#. Name
+#: dj/entry.desktop:2
+msgid "Djibouti"
+msgstr "Yibuti"
+
+#. Name
+#: dk/entry.desktop:3
+msgid "Denmark"
+msgstr "Dinamarca"
+
+#. Name
+#: dm/entry.desktop:2
+msgid "Dominica"
+msgstr "Dominica"
+
+#. Name
+#: do/entry.desktop:2
+msgid "Dominican Republic"
+msgstr "República Dominicana"
+
+#. Name
+#: dz/entry.desktop:2
+msgid "Algeria"
+msgstr "Argelia"
+
+#. Name
+#: ec/entry.desktop:2
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#. Name
+#: ee/entry.desktop:2
+msgid "Estonia"
+msgstr "Estonia"
+
+#. Name
+#: eg/entry.desktop:2
+msgid "Egypt"
+msgstr "Egipto"
+
+#. Name
+#: eh/entry.desktop:2
+msgid "Western Sahara"
+msgstr "Sahara occidental"
+
+#. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#. Name
+#: er/entry.desktop:2
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#. Name
+#: es/entry.desktop:2
+msgid "Spain"
+msgstr "España"
+
+#. Name
+#: et/entry.desktop:2
+msgid "Ethiopia"
+msgstr "Etiopía"
+
+#. Name
+#: fi/entry.desktop:3
+msgid "Finland"
+msgstr "Finlandia"
+
+#. Name
+#: fj/entry.desktop:2
+msgid "Fiji"
+msgstr "Fiji"
+
+#. Name
+#: fk/entry.desktop:2
+msgid "Falkland Islands (Malvinas)"
+msgstr "Islas Malvinas"
+
+#. Name
+#: fm/entry.desktop:2
+msgid "Micronesia, Federated States of"
+msgstr "Micronesia, Estados federados de"
+
+#. Name
+#: fo/entry.desktop:2
+msgid "Faroe Islands"
+msgstr "islas Faroe"
+
+#. Name
+#: fr/entry.desktop:3
+msgid "France"
+msgstr "Francia"
+
+#. Name
+#: ga/entry.desktop:2
+msgid "Gabon"
+msgstr "Gabón"
+
+#. Name
+#: gb/entry.desktop:2
+msgid "United Kingdom"
+msgstr "Reino Unido"
+
+#. Name
+#: gd/entry.desktop:2
+msgid "Grenada"
+msgstr "Granada"
+
+#. Name
+#: ge/entry.desktop:2
+msgid "Georgia"
+msgstr "Georgia"
+
+#. Name
+#: gh/entry.desktop:2
+msgid "Ghana"
+msgstr "Ghana"
+
+#. Name
+#: gi/entry.desktop:2
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#. Name
+#: gl/entry.desktop:2
+msgid "Greenland"
+msgstr "Groenlandia"
+
+#. Name
+#: gm/entry.desktop:2
+msgid "Gambia"
+msgstr "Gambia"
+
+#. Name
+#: gn/entry.desktop:2
+msgid "Guinea"
+msgstr "Guinea"
+
+#. Name
+#: gp/entry.desktop:2
+msgid "Guadeloupe"
+msgstr ""
+
+#. Name
+#: gq/entry.desktop:2
+msgid "Equatorial Guinea"
+msgstr "Guinea Ecuatorial"
+
+#. Name
+#: gr/entry.desktop:2
+msgid "Greece"
+msgstr "Grecia"
+
+#. Name
+#: gt/entry.desktop:2
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#. Name
+#: gu/entry.desktop:2
+msgid "Guam"
+msgstr "Guam"
+
+#. Name
+#: gw/entry.desktop:2
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
+
+#. Name
+#: gy/entry.desktop:2
+msgid "Guyana"
+msgstr "Guyana"
+
+#. Name
+#: hk/entry.desktop:2
+msgid "Hong Kong SAR(China)"
+msgstr "Hong Kong RAE (China)"
+
+#. Name
+#: hn/entry.desktop:2
+msgid "Honduras"
+msgstr "Honduras"
+
+#. Name
+#: hr/entry.desktop:2
+msgid "Croatia"
+msgstr "Croacia"
+
+#. Name
+#: ht/entry.desktop:2
+msgid "Haiti"
+msgstr "Haití"
+
+#. Name
+#: hu/entry.desktop:2
+msgid "Hungary"
+msgstr "Hungría"
+
+#. Name
+#: id/entry.desktop:2
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#. Name
+#: ie/entry.desktop:2
+msgid "Ireland"
+msgstr "Irlanda"
+
+#. Name
+#: il/entry.desktop:3
+msgid "Israel"
+msgstr "Israel"
+
+#. Name
+#: in/entry.desktop:2
+msgid "India"
+msgstr "India"
+
+#. Name
+#: iq/entry.desktop:2
+msgid "Iraq"
+msgstr "Irak"
+
+#. Name
+#: ir/entry.desktop:2
+msgid "Iran"
+msgstr "Irán"
+
+#. Name
+#: is/entry.desktop:2
+msgid "Iceland"
+msgstr "Islandia"
+
+#. Name
+#: it/entry.desktop:2
+msgid "Italy"
+msgstr "Italia"
+
+#. Name
+#: jm/entry.desktop:2
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#. Name
+#: jo/entry.desktop:2
+msgid "Jordan"
+msgstr "Jordania"
+
+#. Name
+#: jp/entry.desktop:2
+msgid "Japan"
+msgstr "Japón"
+
+#. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr "Indonesia (Java)"
+
+#. Name
+#: ke/entry.desktop:2
+msgid "Kenya"
+msgstr "Kenia"
+
+#. Name
+#: kg/entry.desktop:2
+msgid "Kyrgyzstan"
+msgstr "Kirguistán"
+
+#. Name
+#: kh/entry.desktop:2
+msgid "Cambodia"
+msgstr "Camboya"
+
+#. Name
+#: ki/entry.desktop:2
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#. Name
+#: km/entry.desktop:2
+msgid "Comoros"
+msgstr "Comoras"
+
+#. Name
+#: kn/entry.desktop:2
+msgid "St. Kitts and Nevis"
+msgstr "San Cristobal y Nieves"
+
+#. Name
+#: kp/entry.desktop:2
+msgid "North Korea"
+msgstr "Corea del Norte"
+
+#. Name
+#: kr/entry.desktop:2
+msgid "South Korea"
+msgstr "Corea del Sur"
+
+#. Name
+#: kw/entry.desktop:2
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#. Name
+#: ky/entry.desktop:2
+msgid "Cayman Islands"
+msgstr "Islas Caimán"
+
+#. Name
+#: kz/entry.desktop:2
+msgid "Kazakhstan"
+msgstr "Kazajistán"
+
+#. Name
+#: la/entry.desktop:2
+msgid "Laos"
+msgstr "Laos"
+
+#. Name
+#: lb/entry.desktop:2
+msgid "Lebanon"
+msgstr "Líbano"
+
+#. Name
+#: lc/entry.desktop:2
+msgid "St. Lucia"
+msgstr "Santa Lucía"
+
+#. Name
+#: li/entry.desktop:2
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#. Name
+#: lk/entry.desktop:2
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#. Name
+#: lr/entry.desktop:2
+msgid "Liberia"
+msgstr "Liberia"
+
+#. Name
+#: ls/entry.desktop:2
+msgid "Lesotho"
+msgstr "Lesoto"
+
+#. Name
+#: lt/entry.desktop:2
+msgid "Lithuania"
+msgstr "Lituania"
+
+#. Name
+#: lu/entry.desktop:2
+msgid "Luxembourg"
+msgstr "Luxemburgo"
+
+#. Name
+#: lv/entry.desktop:2
+msgid "Latvia"
+msgstr "Letonia"
+
+#. Name
+#: ly/entry.desktop:2
+msgid "Libya"
+msgstr "Libia"
+
+#. Name
+#: ma/entry.desktop:2
+msgid "Morocco"
+msgstr "Marruecos"
+
+#. Name
+#: mc/entry.desktop:2
+msgid "Monaco"
+msgstr "Mónaco"
+
+#. Name
+#: md/entry.desktop:2
+msgid "Moldova"
+msgstr "Moldavia"
+
+#. Name
+#: me/entry.desktop:3
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#. Name
+#: mg/entry.desktop:2
+msgid "Madagascar"
+msgstr "Madagascar"
+
+#. Name
+#: mh/entry.desktop:2
+msgid "Marshall Islands"
+msgstr "Islas Marshall"
+
+#. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nueva Zelanda"
+
+#. Name
+#: mk/entry.desktop:3
+msgid "Macedonia"
+msgstr "Macedonia"
+
+#. Name
+#: ml/entry.desktop:2
+msgid "Mali"
+msgstr "Mali"
+
+#. Name
+#: mm/entry.desktop:2
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#. Name
+#: mn/entry.desktop:2
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#. Name
+#: mo/entry.desktop:2
+msgid "Macau SAR(China)"
+msgstr "Macao RAE (China)"
+
+#. Name
+#: mq/entry.desktop:2
+msgid "Martinique"
+msgstr "Martinica"
+
+#. Name
+#: mr/entry.desktop:2
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#. Name
+#: ms/entry.desktop:2
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#. Name
+#: mt/entry.desktop:3
+msgid "Malta"
+msgstr "Malta"
+
+#. Name
+#: mu/entry.desktop:2
+msgid "Mauritius"
+msgstr "Mauricio"
+
+#. Name
+#: mv/entry.desktop:2
+msgid "Maldives"
+msgstr "Maldivas"
+
+#. Name
+#: mw/entry.desktop:2
+msgid "Malawi"
+msgstr "Malawi"
+
+#. Name
+#: mx/entry.desktop:2
+msgid "Mexico"
+msgstr "México"
+
+#. Name
+#: my/entry.desktop:2
+msgid "Malaysia"
+msgstr "Malasia"
+
+#. Name
+#: mz/entry.desktop:2
+msgid "Mozambique"
+msgstr "Mozambique"
+
+#. Name
+#: na/entry.desktop:2
+msgid "Namibia"
+msgstr "Namibia"
+
+#. Name
+#: nc/entry.desktop:2
+msgid "New Caledonia"
+msgstr "Nueva Caledonia"
+
+#. Name
+#: ne/entry.desktop:2
+msgid "Niger"
+msgstr "Niger"
+
+#. Name
+#: nf/entry.desktop:2
+msgid "Norfolk Island"
+msgstr "Isla Norfolk"
+
+#. Name
+#: ng/entry.desktop:2
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#. Name
+#: ni/entry.desktop:2
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#. Name
+#: nl/entry.desktop:3
+msgid "Netherlands"
+msgstr "Países Bajos"
+
+#. Name
+#: no/entry.desktop:3
+msgid "Norway"
+msgstr "Noruega"
+
+#. Name
+#: np/entry.desktop:2
+msgid "Nepal"
+msgstr "Nepal"
+
+#. Name
+#: nr/entry.desktop:2
+msgid "Nauru"
+msgstr "Nauru"
+
+#. Name
+#: nu/entry.desktop:2
+msgid "Niue"
+msgstr "Niue"
+
+#. Name
+#: om/entry.desktop:2
+msgid "Oman"
+msgstr "Omán"
+
+#. Name
+#: pa/entry.desktop:2
+msgid "Panama"
+msgstr "Panamá"
+
+#. Name
+#: pe/entry.desktop:2
+msgid "Peru"
+msgstr "Perú"
+
+#. Name
+#: pf/entry.desktop:2
+msgid "French Polynesia"
+msgstr "Polinesia Francesa"
+
+#. Name
+#: pg/entry.desktop:2
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
+
+#. Name
+#: ph/entry.desktop:2
+msgid "Philippines"
+msgstr "Filipinas"
+
+#. Name
+#: pk/entry.desktop:2
+msgid "Pakistan"
+msgstr "Pakistán"
+
+#. Name
+#: pl/entry.desktop:2
+msgid "Poland"
+msgstr "Polonia"
+
+#. Name
+#: pm/entry.desktop:2
+msgid "Saint Pierre and Miquelon"
+msgstr "San Pedro y Miquelón"
+
+#. Name
+#: pn/entry.desktop:2
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#. Name
+#: pr/entry.desktop:2
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#. Name
+#: ps/entry.desktop:2
+msgid "Palestinian Territory"
+msgstr "Territorios Palestinos"
+
+#. Name
+#: pt/entry.desktop:3
+msgid "Portugal"
+msgstr "Portugal"
+
+#. Name
+#: pw/entry.desktop:2
+msgid "Palau"
+msgstr "Palaos"
+
+#. Name
+#: py/entry.desktop:2
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#. Name
+#: qa/entry.desktop:2
+msgid "Qatar"
+msgstr "Qatar"
+
+#. Name
+#: ro/entry.desktop:2
+msgid "Romania"
+msgstr "Rumanía"
+
+#. Name
+#: rs/entry.desktop:3
+msgid "Serbia"
+msgstr "Serbia"
+
+#. Name
+#: ru/entry.desktop:3
+msgid "Russia"
+msgstr "Rusia"
+
+#. Name
+#: rw/entry.desktop:2
+msgid "Rwanda"
+msgstr "Ruanda"
+
+#. Name
+#: sa/entry.desktop:2
+msgid "Saudi Arabia"
+msgstr "Arabia Saudita"
+
+#. Name
+#: sb/entry.desktop:2
+msgid "Solomon Islands"
+msgstr "Islas Salomón"
+
+#. Name
+#: sc/entry.desktop:2
+msgid "Seychelles"
+msgstr "Seychelles"
+
+#. Name
+#: sd/entry.desktop:2
+msgid "Sudan"
+msgstr "Sudán"
+
+#. Name
+#: se/entry.desktop:2
+msgid "Sweden"
+msgstr "Suecia"
+
+#. Name
+#: sg/entry.desktop:2
+msgid "Singapore"
+msgstr "Singapur"
+
+#. Name
+#: sh/entry.desktop:2
+msgid "Saint Helena"
+msgstr "Santa Helena"
+
+#. Name
+#: si/entry.desktop:2
+msgid "Slovenia"
+msgstr "Eslovenia"
+
+#. Name
+#: sk/entry.desktop:2
+msgid "Slovakia"
+msgstr "Eslovaquia"
+
+#. Name
+#: sm/entry.desktop:2
+msgid "San Marino"
+msgstr "San Marino"
+
+#. Name
+#: sn/entry.desktop:2
+msgid "Senegal"
+msgstr "Senegal"
+
+#. Name
+#: so/entry.desktop:2
+msgid "Somalia"
+msgstr "Somalia"
+
+#. Name
+#: sr/entry.desktop:2
+msgid "Suriname"
+msgstr "Surinam"
+
+#. Name
+#: st/entry.desktop:2
+msgid "Sao Tome and Principe"
+msgstr "Santo Tomé y Príncipe"
+
+#. Name
+#: sv/entry.desktop:2
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#. Name
+#: sy/entry.desktop:2
+msgid "Syria"
+msgstr "Siria"
+
+#. Name
+#: sz/entry.desktop:2
+msgid "Swaziland"
+msgstr "Eswatini"
+
+#. Name
+#: tc/entry.desktop:2
+msgid "Turks and Caicos Islands"
+msgstr "Islas Turcas y Caicos"
+
+#. Name
+#: td/entry.desktop:2
+msgid "Chad"
+msgstr "Chad"
+
+#. Name
+#: tg/entry.desktop:2
+msgid "Togo"
+msgstr "Togo"
+
+#. Name
+#: th/entry.desktop:2
+msgid "Thailand"
+msgstr "Tailandia"
+
+#. Name
+#: tj/entry.desktop:2
+msgid "Tajikistan"
+msgstr "Tayikistán"
+
+#. Name
+#: tk/entry.desktop:2
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#. Name
+#: tm/entry.desktop:2
+msgid "Turkmenistan"
+msgstr "Turkmenistán"
+
+#. Name
+#: tn/entry.desktop:2
+msgid "Tunisia"
+msgstr "Túnez"
+
+#. Name
+#: to/entry.desktop:2
+msgid "Tonga"
+msgstr "Tonga"
+
+#. Name
+#: tp/entry.desktop:2
+msgid "East Timor"
+msgstr "Timor Oriental"
+
+#. Name
+#: tr/entry.desktop:2
+msgid "Turkey"
+msgstr "Turquía"
+
+#. Name
+#: tt/entry.desktop:2
+msgid "Trinidad and Tobago"
+msgstr "Trinidad y Tobago"
+
+#. Name
+#: tv/entry.desktop:2
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#. Name
+#: tw/entry.desktop:3
+msgid "Taiwan"
+msgstr "Taiwán"
+
+#. Name
+#: tz/entry.desktop:2
+msgid "Tanzania, United Republic of"
+msgstr "Tanzania, República de"
+
+#. Name
+#: ua/entry.desktop:3
+msgid "Ukraine"
+msgstr "Ucrania"
+
+#. Name
+#: ug/entry.desktop:2
+msgid "Uganda"
+msgstr "Uganda"
+
+#. Name
+#: us/entry.desktop:2
+msgid "United States of America"
+msgstr "Estados Unidos de América"
+
+#. Name
+#: uy/entry.desktop:2
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#. Name
+#: uz/entry.desktop:2
+msgid "Uzbekistan"
+msgstr "Uzbekistán"
+
+#. Name
+#: va/entry.desktop:2
+msgid "Vatican City"
+msgstr "Ciudad del Vaticano"
+
+#. Name
+#: vc/entry.desktop:2
+msgid "St. Vincent and the Grenadines"
+msgstr "San Vicente y las Granadinas"
+
+#. Name
+#: ve/entry.desktop:2
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#. Name
+#: vg/entry.desktop:2
+msgid "Virgin Islands, British"
+msgstr "Islas Vírgenes Británicas"
+
+#. Name
+#: vi/entry.desktop:2
+msgid "Virgin Islands, U.S."
+msgstr "Islas Vírgenes Americanas."
+
+#. Name
+#: vn/entry.desktop:2
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#. Name
+#: vu/entry.desktop:2
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#. Name
+#: wf/entry.desktop:2
+msgid "Wallis and Futuna"
+msgstr "Wallis y Futuna"
+
+#. Name
+#: ws/entry.desktop:3
+msgid "Samoa"
+msgstr "Samoa"
+
+#. Name
+#: ye/entry.desktop:2
+msgid "Yemen"
+msgstr "Yemen"
+
+#. Name
+#: za/entry.desktop:3
+msgid "South Africa"
+msgstr "Sudáfrica"
+
+#. Name
+#: zm/entry.desktop:2
+msgid "Zambia"
+msgstr "Zambia"
+
+#. Name
+#: zw/entry.desktop:2
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
diff --git a/translations/desktop_files/l10n-desktops/ka.po b/translations/desktop_files/l10n-desktops/ka.po
index 1925aff45..dc181bd95 100644
--- a/translations/desktop_files/l10n-desktops/ka.po
+++ b/translations/desktop_files/l10n-desktops/ka.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-16 18:21+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/l10n-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: caribbean.desktop:2
 msgid "Caribbean"
-msgstr "კ�რიბები"
+msgstr "კ�რიბული"
 
 #. Name
 #: centralafrica.desktop:2
@@ -54,7 +55,7 @@ msgstr "ევრ�პ�, �ღმ�ს�ვლეთი"
 #. Name
 #: middleeast.desktop:2
 msgid "Middle-East"
-msgstr "შუ� �ღმ�ს�ვლეთი"
+msgstr "�ხლ� �ღმ�ს�ვლეთი"
 
 #. Name
 #: northafrica.desktop:2
@@ -124,7 +125,7 @@ msgstr "�ნდ�რ�"
 #. Name
 #: ae/entry.desktop:2
 msgid "United Arab Emirates"
-msgstr "�რ�ბეთის გ�ერთი�ნებული მირ�ტები"
+msgstr "�რ�ბეთის გ�ერთი�ნებული ემირ�ტები"
 
 #. Name
 #: af/entry.desktop:2
@@ -134,7 +135,7 @@ msgstr "�ვღ�ნეთი"
 #. Name
 #: ag/entry.desktop:2
 msgid "Antigua and Barbuda"
-msgstr "�ნტიგუ� დ� ბ�რბ�დ�სი"
+msgstr "�ნტიგუ� დ� ბ�რბუდ�"
 
 #. Name
 #: ai/entry.desktop:2
@@ -149,12 +150,12 @@ msgstr "�ლბ�ნეთი"
 #. Name
 #: am/entry.desktop:2
 msgid "Armenia"
-msgstr "ს�ს�მხეთი"
+msgstr "ს�მხეთი"
 
 #. Name
 #: an/entry.desktop:2
 msgid "Netherlands Antilles"
-msgstr "ნინდერლ�ნდების �ნტილები"
+msgstr "ნიდერლ�ნდების �ნტილის კუნძულები (NL)"
 
 #. Name
 #: ao/entry.desktop:2
@@ -249,7 +250,7 @@ msgstr "ბერმუდ�"
 #. Name
 #: bn/entry.desktop:3
 msgid "Brunei Darussalam"
-msgstr "ბრუნეი დ�რეს�ლ�მი"
+msgstr "ბრუნეი"
 
 #. Name
 #: bo/entry.desktop:2
@@ -264,12 +265,12 @@ msgstr "ბრ�ზილი�"
 #. Name
 #: braille/entry.desktop:2
 msgid "Braille"
-msgstr ""
+msgstr "ბრ�ილური"
 
 #. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
-msgstr "ბ�ჰ�მ�"
+msgstr "ბ�ჰ�მის კუნძულები"
 
 #. Name
 #: bt/entry.desktop:3
@@ -279,7 +280,7 @@ msgstr "ბუტ�ნი"
 #. Name
 #: bw/entry.desktop:2
 msgid "Botswana"
-msgstr "ბ�ტსვ�ნ�"
+msgstr "ბ�ცვ�ნ�"
 
 #. Name
 #: by/entry.desktop:3
@@ -299,7 +300,7 @@ msgstr "კ�ნ�დ�"
 #. Name
 #: cc/entry.desktop:2
 msgid "Cocos (Keeling) Islands"
-msgstr "ქ�ქ�სის (ქილინგ) კუნძულები"
+msgstr "ქ�ქ�ს (კეელინგ) კუნძულები"
 
 #. Name
 #: cd/entry.desktop:2
@@ -324,7 +325,7 @@ msgstr "შვეიც�რი�"
 #. Name
 #: ci/entry.desktop:2
 msgid "Cote d'ivoire"
-msgstr "კ�ტ დიუვ�რი"
+msgstr "კ�ტ-დ’ივუ�რი"
 
 #. Name
 #: ck/entry.desktop:2
@@ -364,7 +365,7 @@ msgstr "კუბ�"
 #. Name
 #: cv/entry.desktop:2
 msgid "Cape Verde"
-msgstr "კ�პე ვერდე"
+msgstr "კ�ბ� ვერდე"
 
 #. Name
 #: cx/entry.desktop:2
@@ -404,7 +405,7 @@ msgstr "დ�მინიკ�"
 #. Name
 #: do/entry.desktop:2
 msgid "Dominican Republic"
-msgstr "დ�მინიკის რესპუბლიკ�"
+msgstr "დ�მენიკის რესპუბლიკ�"
 
 #. Name
 #: dz/entry.desktop:2
@@ -434,7 +435,7 @@ msgstr "დ�ს�ვლეთ ს�ჰ�რ�"
 #. Name
 #: eo/entry.desktop:2
 msgid "Esperanto"
-msgstr ""
+msgstr "ესპერ�ნტ�"
 
 #. Name
 #: er/entry.desktop:2
@@ -464,12 +465,12 @@ msgstr "ფიჯი"
 #. Name
 #: fk/entry.desktop:2
 msgid "Falkland Islands (Malvinas)"
-msgstr "ფ�ლკლენდის კუნძულები (მ�ლვინის)"
+msgstr "ფ�ლკლენდის კუნძულები"
 
 #. Name
 #: fm/entry.desktop:2
 msgid "Micronesia, Federated States of"
-msgstr "მიკრ�ნეზი�, ფედერ�ციული შტ�ტები"
+msgstr "მიკრ�ნეზიის ფედერ�ლური შტ�ტები"
 
 #. Name
 #: fo/entry.desktop:2
@@ -489,7 +490,7 @@ msgstr "გ�ბ�ნი"
 #. Name
 #: gb/entry.desktop:2
 msgid "United Kingdom"
-msgstr "გ�ერთი�ნებული ს�მეფ�"
+msgstr "დიდი ბრიტ�ნეთი"
 
 #. Name
 #: gd/entry.desktop:2
@@ -499,7 +500,7 @@ msgstr "გრენ�დ�"
 #. Name
 #: ge/entry.desktop:2
 msgid "Georgia"
-msgstr "ს�ქ�რთველ�"
+msgstr "ჯ�რჯი�"
 
 #. Name
 #: gh/entry.desktop:2
@@ -529,7 +530,7 @@ msgstr "გვინე�"
 #. Name
 #: gp/entry.desktop:2
 msgid "Guadeloupe"
-msgstr "გვ�დელუპე"
+msgstr "გვ�დ�ლუპე"
 
 #. Name
 #: gq/entry.desktop:2
@@ -554,17 +555,17 @@ msgstr "გუ�მი"
 #. Name
 #: gw/entry.desktop:2
 msgid "Guinea-Bissau"
-msgstr "გვინე� ბის�უ"
+msgstr "გვინე�-ბის�უ"
 
 #. Name
 #: gy/entry.desktop:2
 msgid "Guyana"
-msgstr "გვი�ნ�"
+msgstr "გ�ი�ნ�"
 
 #. Name
 #: hk/entry.desktop:2
 msgid "Hong Kong SAR(China)"
-msgstr "ჰ�ნკ�ნგი (ჩინეთი)"
+msgstr "ჰ�ნგ კ�ნგი SAR (ჩინეთი)"
 
 #. Name
 #: hn/entry.desktop:2
@@ -643,10 +644,8 @@ msgstr "ი�პ�ნი�"
 
 #. Name
 #: jv/entry.desktop:2
-#, fuzzy
-#| msgid "Indonesia"
 msgid "Indonesia (Java)"
-msgstr "ინდ�ნეზი�"
+msgstr "ინდ�ნეზი� (ი�ვ�)"
 
 #. Name
 #: ke/entry.desktop:2
@@ -661,7 +660,7 @@ msgstr "ყირგიზეთი"
 #. Name
 #: kh/entry.desktop:2
 msgid "Cambodia"
-msgstr "კ�მპუჩი�"
+msgstr "კ�მბ�ჯ�"
 
 #. Name
 #: ki/entry.desktop:2
@@ -671,7 +670,7 @@ msgstr "კირიბ�ტი"
 #. Name
 #: km/entry.desktop:2
 msgid "Comoros"
-msgstr "კ�მ�რები"
+msgstr "კ�მ�რი"
 
 #. Name
 #: kn/entry.desktop:2
@@ -691,7 +690,7 @@ msgstr "ს�მხრეთ კ�რე�"
 #. Name
 #: kw/entry.desktop:2
 msgid "Kuwait"
-msgstr "ქუვეითი"
+msgstr "ქუვეიტი"
 
 #. Name
 #: ky/entry.desktop:2
@@ -716,12 +715,12 @@ msgstr "ლიბ�ნი"
 #. Name
 #: lc/entry.desktop:2
 msgid "St. Lucia"
-msgstr "წმ. ლუცი�"
+msgstr "სტ. ლუცი�"
 
 #. Name
 #: li/entry.desktop:2
 msgid "Liechtenstein"
-msgstr "ლიჰტენშტეინი"
+msgstr "ლიჰტენშტ�ინი"
 
 #. Name
 #: lk/entry.desktop:2
@@ -741,7 +740,7 @@ msgstr "ლეს�ტ�"
 #. Name
 #: lt/entry.desktop:2
 msgid "Lithuania"
-msgstr "ლიტვ�"
+msgstr "ლიეტუვ�"
 
 #. Name
 #: lu/entry.desktop:2
@@ -775,9 +774,8 @@ msgstr "მ�ლდ�ვ�"
 
 #. Name
 #: me/entry.desktop:3
-#, fuzzy
 msgid "Montenegro"
-msgstr "მ�ნსერ�"
+msgstr "მ�ნტენეგრ�"
 
 #. Name
 #: mg/entry.desktop:2
@@ -807,7 +805,7 @@ msgstr "მ�ლი"
 #. Name
 #: mm/entry.desktop:2
 msgid "Myanmar"
-msgstr "მი�ნმ�"
+msgstr "მი�ნმ�რი"
 
 #. Name
 #: mn/entry.desktop:2
@@ -817,12 +815,12 @@ msgstr "მ�ნღ�ლეთი"
 #. Name
 #: mo/entry.desktop:2
 msgid "Macau SAR(China)"
-msgstr "მ�კ�� (ჩინეთი)"
+msgstr "მ�კ�� SAR (ჩინეთი)"
 
 #. Name
 #: mq/entry.desktop:2
 msgid "Martinique"
-msgstr "მ�რტინიკე"
+msgstr "მ�რტინიკ�"
 
 #. Name
 #: mr/entry.desktop:2
@@ -832,7 +830,7 @@ msgstr "მ�ვრიტ�ნი�"
 #. Name
 #: ms/entry.desktop:2
 msgid "Montserrat"
-msgstr "მ�ნსერ�"
+msgstr "მ�ნტსერ�ტი"
 
 #. Name
 #: mt/entry.desktop:3
@@ -842,7 +840,7 @@ msgstr "მ�ლტ�"
 #. Name
 #: mu/entry.desktop:2
 msgid "Mauritius"
-msgstr "მ�ურიციუსი"
+msgstr "მ�ვრიკი"
 
 #. Name
 #: mv/entry.desktop:2
@@ -882,7 +880,7 @@ msgstr "�ხ�ლი კ�ლედ�ნი�"
 #. Name
 #: ne/entry.desktop:2
 msgid "Niger"
-msgstr "ნიგერი�"
+msgstr "ნიგერი"
 
 #. Name
 #: nf/entry.desktop:2
@@ -942,7 +940,7 @@ msgstr "პერუ"
 #. Name
 #: pf/entry.desktop:2
 msgid "French Polynesia"
-msgstr "ს�ფრ�ნგეთის პ�ლინეზი�"
+msgstr "ფრ�ნგული პ�ლინეზი�"
 
 #. Name
 #: pg/entry.desktop:2
@@ -967,12 +965,12 @@ msgstr "პ�ლ�ნეთი"
 #. Name
 #: pm/entry.desktop:2
 msgid "Saint Pierre and Miquelon"
-msgstr "სენ პიერი დ� მიქელ�ნი"
+msgstr "წმინდ� პიერი დ� მიქელ�ნი"
 
 #. Name
 #: pn/entry.desktop:2
 msgid "Pitcairn"
-msgstr "პიტიკ�ირნი"
+msgstr "პიტკერნი"
 
 #. Name
 #: pr/entry.desktop:2
@@ -982,7 +980,7 @@ msgstr "პუერტ� რიკ�"
 #. Name
 #: ps/entry.desktop:2
 msgid "Palestinian Territory"
-msgstr "პ�ლესტინ�"
+msgstr "პ�ლესტინის ტერიტ�რი�"
 
 #. Name
 #: pt/entry.desktop:3
@@ -1002,7 +1000,7 @@ msgstr "პ�რ�გვ�ი"
 #. Name
 #: qa/entry.desktop:2
 msgid "Qatar"
-msgstr "კ�ტ�რი"
+msgstr "ყ�ტ�რი"
 
 #. Name
 #: ro/entry.desktop:2
@@ -1012,7 +1010,7 @@ msgstr "რუმინეთი"
 #. Name
 #: rs/entry.desktop:3
 msgid "Serbia"
-msgstr ""
+msgstr "სერბი�"
 
 #. Name
 #: ru/entry.desktop:3
@@ -1067,7 +1065,7 @@ msgstr "სლ�ვენი�"
 #. Name
 #: sk/entry.desktop:2
 msgid "Slovakia"
-msgstr "სლ�ვ�კი�"
+msgstr "სლ�ვ�კეთი"
 
 #. Name
 #: sm/entry.desktop:2
@@ -1107,12 +1105,12 @@ msgstr "სირი�"
 #. Name
 #: sz/entry.desktop:2
 msgid "Swaziland"
-msgstr "სვ�ზილენდი"
+msgstr "ესვ�ტინი"
 
 #. Name
 #: tc/entry.desktop:2
 msgid "Turks and Caicos Islands"
-msgstr "თ�რქსის დ� ქ�ქ�სის კუნძულები"
+msgstr "ტერქსის� დ� კ�იკ�სის კუნძულები"
 
 #. Name
 #: td/entry.desktop:2
@@ -1217,7 +1215,7 @@ msgstr "ვ�ტიკ�ნი"
 #. Name
 #: vc/entry.desktop:2
 msgid "St. Vincent and the Grenadines"
-msgstr "სენ ვინცენტი დ� გრენ�დინები"
+msgstr "წმინდ� ვინსენტი დ� გრენ�დინები"
 
 #. Name
 #: ve/entry.desktop:2
@@ -1227,12 +1225,12 @@ msgstr "ვენესუელ�"
 #. Name
 #: vg/entry.desktop:2
 msgid "Virgin Islands, British"
-msgstr "ქ�ლწულის კუნძულები, ბრიტ�ნეთი"
+msgstr "ვირჯინიის კუნძულები, ბრიტ�ნელები"
 
 #. Name
 #: vi/entry.desktop:2
 msgid "Virgin Islands, U.S."
-msgstr "ქ�ლწულის კუნძულები, �.შ.შ"
+msgstr "ვირჯინიის კუნძულები, �შშ."
 
 #. Name
 #: vn/entry.desktop:2
@@ -1242,7 +1240,7 @@ msgstr "ვიეტნ�მი"
 #. Name
 #: vu/entry.desktop:2
 msgid "Vanuatu"
-msgstr "ვ�ნ�უტუ"
+msgstr "ვ�ნუ�ტუ"
 
 #. Name
 #: wf/entry.desktop:2
diff --git a/translations/desktop_files/l10n-desktops/nl.po b/translations/desktop_files/l10n-desktops/nl.po
index 83b9670d0..28e47e274 100644
--- a/translations/desktop_files/l10n-desktops/nl.po
+++ b/translations/desktop_files/l10n-desktops/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-16 18:21+0000\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-02-03 11:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/l10n-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -119,7 +120,7 @@ msgstr "Standaard"
 #. Name
 #: ad/entry.desktop:2
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #. Name
 #: ae/entry.desktop:2
@@ -129,7 +130,7 @@ msgstr "Verenigde Arabische Emiraten"
 #. Name
 #: af/entry.desktop:2
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afghanistan"
 
 #. Name
 #: ag/entry.desktop:2
@@ -139,7 +140,7 @@ msgstr "Antigua en Barbuda"
 #. Name
 #: ai/entry.desktop:2
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #. Name
 #: al/entry.desktop:2
@@ -158,9 +159,8 @@ msgstr "Nederlandse Antillen"
 
 #. Name
 #: ao/entry.desktop:2
-#, fuzzy
 msgid "Angola"
-msgstr "Mongolië"
+msgstr "Angola"
 
 #. Name
 #: ar/entry.desktop:2
@@ -185,7 +185,7 @@ msgstr "Australië"
 #. Name
 #: aw/entry.desktop:2
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #. Name
 #: ax/entry.desktop:2
@@ -205,12 +205,12 @@ msgstr "Bosnië en Herzegovina"
 #. Name
 #: bb/entry.desktop:2
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #. Name
 #: bd/entry.desktop:2
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #. Name
 #: be/entry.desktop:2
@@ -220,7 +220,7 @@ msgstr "België"
 #. Name
 #: bf/entry.desktop:2
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. Name
 #: bg/entry.desktop:2
@@ -235,27 +235,27 @@ msgstr "Baghrein"
 #. Name
 #: bi/entry.desktop:2
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #. Name
 #: bj/entry.desktop:2
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #. Name
 #: bm/entry.desktop:2
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #. Name
 #: bn/entry.desktop:3
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei"
 
 #. Name
 #: bo/entry.desktop:2
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #. Name
 #: br/entry.desktop:2
@@ -265,48 +265,47 @@ msgstr "Brazilië"
 #. Name
 #: braille/entry.desktop:2
 msgid "Braille"
-msgstr ""
+msgstr "Braille"
 
 #. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahama's"
 
 #. Name
 #: bt/entry.desktop:3
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #. Name
 #: bw/entry.desktop:2
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #. Name
 #: by/entry.desktop:3
 msgid "Belarus"
-msgstr "Wit-Rusland"
+msgstr "Belarus (Wit-Rusland)"
 
 #. Name
 #: bz/entry.desktop:2
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #. Name
 #: ca/entry.desktop:5
 msgid "Canada"
-msgstr ""
+msgstr "Canada"
 
 #. Name
 #: cc/entry.desktop:2
-#, fuzzy
 msgid "Cocos (Keeling) Islands"
-msgstr "Cook Eilanden"
+msgstr "Cocos-eilanden"
 
 #. Name
 #: cd/entry.desktop:2
 msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, Democratische republiek"
+msgstr "Congo, Democratische Republiek"
 
 #. Name
 #: cf/entry.desktop:2
@@ -315,9 +314,8 @@ msgstr "Centraal Afrikaanse Republiek"
 
 #. Name
 #: cg/entry.desktop:2
-#, fuzzy
 msgid "Congo"
-msgstr "Mongolië"
+msgstr "Congo"
 
 #. Name
 #: ch/entry.desktop:2
@@ -332,7 +330,7 @@ msgstr "Ivoorkust"
 #. Name
 #: ck/entry.desktop:2
 msgid "Cook islands"
-msgstr "Cook Eilanden"
+msgstr "Cookeilanden"
 
 #. Name
 #: cl/entry.desktop:2
@@ -342,12 +340,12 @@ msgstr "Chili"
 #. Name
 #: cm/entry.desktop:2
 msgid "Cameroon"
-msgstr "Cameroen"
+msgstr "Kameroen"
 
 #. Name
 #: cn/entry.desktop:3
 msgid "China"
-msgstr ""
+msgstr "China"
 
 #. Name
 #: co/entry.desktop:2
@@ -357,28 +355,27 @@ msgstr "Columbia"
 #. Name
 #: cr/entry.desktop:2
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #. Name
 #: cu/entry.desktop:2
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #. Name
 #: cv/entry.desktop:2
 msgid "Cape Verde"
-msgstr "Kaap Verdië"
+msgstr "Kaapverdië"
 
 #. Name
 #: cx/entry.desktop:2
-#, fuzzy
 msgid "Christmas Island"
-msgstr "Kaaiman Eilanden"
+msgstr "Christmaseiland"
 
 #. Name
 #: cy/entry.desktop:2
 msgid "Cyprus"
-msgstr ""
+msgstr "Cyprus"
 
 #. Name
 #: cz/entry.desktop:2
@@ -393,7 +390,7 @@ msgstr "Duitsland"
 #. Name
 #: dj/entry.desktop:2
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #. Name
 #: dk/entry.desktop:3
@@ -402,9 +399,8 @@ msgstr "Denemarken"
 
 #. Name
 #: dm/entry.desktop:2
-#, fuzzy
 msgid "Dominica"
-msgstr "Dominicaanse Republiek"
+msgstr "Dominica"
 
 #. Name
 #: do/entry.desktop:2
@@ -419,7 +415,7 @@ msgstr "Algerije"
 #. Name
 #: ec/entry.desktop:2
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #. Name
 #: ee/entry.desktop:2
@@ -439,12 +435,12 @@ msgstr "West Sahara"
 #. Name
 #: eo/entry.desktop:2
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
 #. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #. Name
 #: es/entry.desktop:2
@@ -458,14 +454,13 @@ msgstr "Ethiopië"
 
 #. Name
 #: fi/entry.desktop:3
-#, fuzzy
 msgid "Finland"
-msgstr "Groenland"
+msgstr "Finland"
 
 #. Name
 #: fj/entry.desktop:2
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #. Name
 #: fk/entry.desktop:2
@@ -490,7 +485,7 @@ msgstr "Frankrijk"
 #. Name
 #: ga/entry.desktop:2
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #. Name
 #: gb/entry.desktop:2
@@ -500,7 +495,7 @@ msgstr "Verenigd Koninkrijk"
 #. Name
 #: gd/entry.desktop:2
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #. Name
 #: ge/entry.desktop:2
@@ -510,12 +505,12 @@ msgstr "Georgië"
 #. Name
 #: gh/entry.desktop:2
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #. Name
 #: gi/entry.desktop:2
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltar"
 
 #. Name
 #: gl/entry.desktop:2
@@ -525,17 +520,17 @@ msgstr "Groenland"
 #. Name
 #: gm/entry.desktop:2
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #. Name
 #: gn/entry.desktop:2
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #. Name
 #: gp/entry.desktop:2
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #. Name
 #: gq/entry.desktop:2
@@ -550,32 +545,32 @@ msgstr "Griekenland"
 #. Name
 #: gt/entry.desktop:2
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #. Name
 #: gu/entry.desktop:2
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #. Name
 #: gw/entry.desktop:2
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinee-Bissau"
 
 #. Name
 #: gy/entry.desktop:2
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #. Name
 #: hk/entry.desktop:2
 msgid "Hong Kong SAR(China)"
-msgstr ""
+msgstr "Hongkong"
 
 #. Name
 #: hn/entry.desktop:2
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. Name
 #: hr/entry.desktop:2
@@ -585,7 +580,7 @@ msgstr "Kroatië"
 #. Name
 #: ht/entry.desktop:2
 msgid "Haiti"
-msgstr ""
+msgstr "Haïti"
 
 #. Name
 #: hu/entry.desktop:2
@@ -605,12 +600,12 @@ msgstr "Ierland"
 #. Name
 #: il/entry.desktop:3
 msgid "Israel"
-msgstr ""
+msgstr "Israël"
 
 #. Name
 #: in/entry.desktop:2
 msgid "India"
-msgstr ""
+msgstr "India"
 
 #. Name
 #: iq/entry.desktop:2
@@ -620,7 +615,7 @@ msgstr "Irak"
 #. Name
 #: ir/entry.desktop:2
 msgid "Iran"
-msgstr ""
+msgstr "Iran"
 
 #. Name
 #: is/entry.desktop:2
@@ -635,7 +630,7 @@ msgstr "Italië"
 #. Name
 #: jm/entry.desktop:2
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #. Name
 #: jo/entry.desktop:2
@@ -645,19 +640,17 @@ msgstr "Jordanië"
 #. Name
 #: jp/entry.desktop:2
 msgid "Japan"
-msgstr ""
+msgstr "Japan"
 
 #. Name
 #: jv/entry.desktop:2
-#, fuzzy
-#| msgid "Indonesia"
 msgid "Indonesia (Java)"
-msgstr "Indonesië"
+msgstr "Indonesië (Java)"
 
 #. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 #. Name
 #: kg/entry.desktop:2
@@ -672,17 +665,17 @@ msgstr "Cambodja"
 #. Name
 #: ki/entry.desktop:2
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #. Name
 #: km/entry.desktop:2
 msgid "Comoros"
-msgstr ""
+msgstr "Comoren"
 
 #. Name
 #: kn/entry.desktop:2
 msgid "St. Kitts and Nevis"
-msgstr "St. Kitts en Nevis"
+msgstr "Saint Kitts en Nevis"
 
 #. Name
 #: kp/entry.desktop:2
@@ -702,7 +695,7 @@ msgstr "Koeweit"
 #. Name
 #: ky/entry.desktop:2
 msgid "Cayman Islands"
-msgstr "Kaaiman Eilanden"
+msgstr "Kaaimaneilanden"
 
 #. Name
 #: kz/entry.desktop:2
@@ -712,7 +705,7 @@ msgstr "Kazachstan"
 #. Name
 #: la/entry.desktop:2
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #. Name
 #: lb/entry.desktop:2
@@ -722,27 +715,27 @@ msgstr "Libanon"
 #. Name
 #: lc/entry.desktop:2
 msgid "St. Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #. Name
 #: li/entry.desktop:2
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #. Name
 #: lk/entry.desktop:2
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #. Name
 #: lr/entry.desktop:2
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #. Name
 #: ls/entry.desktop:2
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #. Name
 #: lt/entry.desktop:2
@@ -772,7 +765,7 @@ msgstr "Marokko"
 #. Name
 #: mc/entry.desktop:2
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #. Name
 #: md/entry.desktop:2
@@ -782,22 +775,22 @@ msgstr "Moldavië"
 #. Name
 #: me/entry.desktop:3
 msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
 
 #. Name
 #: mg/entry.desktop:2
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #. Name
 #: mh/entry.desktop:2
 msgid "Marshall Islands"
-msgstr "Marshall Eilanden"
+msgstr "Marshalleilanden"
 
 #. Name
 #: mi/entry.desktop:2 nz/entry.desktop:3
 msgid "New Zealand"
-msgstr "Nieuw Zeeland"
+msgstr "Nieuw-Zeeland"
 
 #. Name
 #: mk/entry.desktop:3
@@ -807,12 +800,12 @@ msgstr "Macedonië"
 #. Name
 #: ml/entry.desktop:2
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. Name
 #: mm/entry.desktop:2
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. Name
 #: mn/entry.desktop:2
@@ -822,12 +815,12 @@ msgstr "Mongolië"
 #. Name
 #: mo/entry.desktop:2
 msgid "Macau SAR(China)"
-msgstr ""
+msgstr "Macau"
 
 #. Name
 #: mq/entry.desktop:2
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #. Name
 #: mr/entry.desktop:2
@@ -837,18 +830,17 @@ msgstr "Mauritanië"
 #. Name
 #: ms/entry.desktop:2
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #. Name
 #: mt/entry.desktop:3
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #. Name
 #: mu/entry.desktop:2
-#, fuzzy
 msgid "Mauritius"
-msgstr "Mauritanië"
+msgstr "Mauritius"
 
 #. Name
 #: mv/entry.desktop:2
@@ -857,14 +849,13 @@ msgstr "Malediven"
 
 #. Name
 #: mw/entry.desktop:2
-#, fuzzy
 msgid "Malawi"
-msgstr "Maleisië"
+msgstr "Malawi"
 
 #. Name
 #: mx/entry.desktop:2
 msgid "Mexico"
-msgstr ""
+msgstr "Mexico"
 
 #. Name
 #: my/entry.desktop:2
@@ -874,7 +865,7 @@ msgstr "Maleisië"
 #. Name
 #: mz/entry.desktop:2
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambique"
 
 #. Name
 #: na/entry.desktop:2
@@ -884,28 +875,27 @@ msgstr "Namibië"
 #. Name
 #: nc/entry.desktop:2
 msgid "New Caledonia"
-msgstr "Nieuw Caledonië"
+msgstr "Nieuw-Caledonië"
 
 #. Name
 #: ne/entry.desktop:2
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #. Name
 #: nf/entry.desktop:2
 msgid "Norfolk Island"
-msgstr "Norfolk Eiland"
+msgstr "Norfolkeiland"
 
 #. Name
 #: ng/entry.desktop:2
-#, fuzzy
 msgid "Nigeria"
-msgstr "Algerije"
+msgstr "Nigeria"
 
 #. Name
 #: ni/entry.desktop:2
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #. Name
 #: nl/entry.desktop:3
@@ -920,42 +910,42 @@ msgstr "Noorwegen"
 #. Name
 #: np/entry.desktop:2
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. Name
 #: nr/entry.desktop:2
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. Name
 #: nu/entry.desktop:2
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #. Name
 #: om/entry.desktop:2
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #. Name
 #: pa/entry.desktop:2
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #. Name
 #: pe/entry.desktop:2
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #. Name
 #: pf/entry.desktop:2
 msgid "French Polynesia"
-msgstr "Frans Polinesië"
+msgstr "Frans-Polynesië"
 
 #. Name
 #: pg/entry.desktop:2
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papoea-Nieuw-Guinea"
 
 #. Name
 #: ph/entry.desktop:2
@@ -964,9 +954,8 @@ msgstr "Filippijnen"
 
 #. Name
 #: pk/entry.desktop:2
-#, fuzzy
 msgid "Pakistan"
-msgstr "Tadjikistan"
+msgstr "Pakistan"
 
 #. Name
 #: pl/entry.desktop:2
@@ -981,12 +970,12 @@ msgstr "Saint Pierre en Miquelon"
 #. Name
 #: pn/entry.desktop:2
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #. Name
 #: pr/entry.desktop:2
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #. Name
 #: ps/entry.desktop:2
@@ -996,22 +985,22 @@ msgstr "Palestijns territorium"
 #. Name
 #: pt/entry.desktop:3
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #. Name
 #: pw/entry.desktop:2
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. Name
 #: py/entry.desktop:2
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #. Name
 #: qa/entry.desktop:2
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 #. Name
 #: ro/entry.desktop:2
@@ -1031,17 +1020,17 @@ msgstr "Rusland"
 #. Name
 #: rw/entry.desktop:2
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #. Name
 #: sa/entry.desktop:2
 msgid "Saudi Arabia"
-msgstr "Saudi-Arabië"
+msgstr "Saoedi-Arabië"
 
 #. Name
 #: sb/entry.desktop:2
 msgid "Solomon Islands"
-msgstr "Solomon Eilanden"
+msgstr "Solomoneilanden"
 
 #. Name
 #: sc/entry.desktop:2
@@ -1051,7 +1040,7 @@ msgstr "Seychellen"
 #. Name
 #: sd/entry.desktop:2
 msgid "Sudan"
-msgstr ""
+msgstr "Soedan"
 
 #. Name
 #: se/entry.desktop:2
@@ -1061,12 +1050,12 @@ msgstr "Zweden"
 #. Name
 #: sg/entry.desktop:2
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #. Name
 #: sh/entry.desktop:2
 msgid "Saint Helena"
-msgstr ""
+msgstr "Sint-Helena"
 
 #. Name
 #: si/entry.desktop:2
@@ -1081,12 +1070,12 @@ msgstr "Slowakije"
 #. Name
 #: sm/entry.desktop:2
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #. Name
 #: sn/entry.desktop:2
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #. Name
 #: so/entry.desktop:2
@@ -1096,7 +1085,7 @@ msgstr "Somalie"
 #. Name
 #: sr/entry.desktop:2
 msgid "Suriname"
-msgstr ""
+msgstr "Suriname"
 
 #. Name
 #: st/entry.desktop:2
@@ -1106,7 +1095,7 @@ msgstr "Sao Tome en Principe"
 #. Name
 #: sv/entry.desktop:2
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #. Name
 #: sy/entry.desktop:2
@@ -1115,14 +1104,13 @@ msgstr "Syrië"
 
 #. Name
 #: sz/entry.desktop:2
-#, fuzzy
 msgid "Swaziland"
-msgstr "Zwitserland"
+msgstr "Swaziland"
 
 #. Name
 #: tc/entry.desktop:2
 msgid "Turks and Caicos Islands"
-msgstr "Turks en Caicos Eilanden"
+msgstr "Turks en Caicos"
 
 #. Name
 #: td/entry.desktop:2
@@ -1132,12 +1120,12 @@ msgstr "Tsjaad"
 #. Name
 #: tg/entry.desktop:2
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. Name
 #: th/entry.desktop:2
 msgid "Thailand"
-msgstr ""
+msgstr "Thailand"
 
 #. Name
 #: tj/entry.desktop:2
@@ -1147,13 +1135,12 @@ msgstr "Tadjikistan"
 #. Name
 #: tk/entry.desktop:2
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #. Name
 #: tm/entry.desktop:2
-#, fuzzy
 msgid "Turkmenistan"
-msgstr "Tadjikistan"
+msgstr "Turkmenistan"
 
 #. Name
 #: tn/entry.desktop:2
@@ -1163,12 +1150,12 @@ msgstr "Tunisie"
 #. Name
 #: to/entry.desktop:2
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. Name
 #: tp/entry.desktop:2
 msgid "East Timor"
-msgstr "Oost Timor"
+msgstr "Oost-Timor"
 
 #. Name
 #: tr/entry.desktop:2
@@ -1183,17 +1170,17 @@ msgstr "Trinidad en Tobago"
 #. Name
 #: tv/entry.desktop:2
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. Name
 #: tw/entry.desktop:3
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 #. Name
 #: tz/entry.desktop:2
 msgid "Tanzania, United Republic of"
-msgstr "Tanzania, Verenigde republiek van"
+msgstr "Tanzania"
 
 #. Name
 #: ua/entry.desktop:3
@@ -1203,7 +1190,7 @@ msgstr "Oekraïne"
 #. Name
 #: ug/entry.desktop:2
 msgid "Uganda"
-msgstr ""
+msgstr "Oeganda"
 
 #. Name
 #: us/entry.desktop:2
@@ -1213,13 +1200,12 @@ msgstr "Verenigde Staten van Amerika"
 #. Name
 #: uy/entry.desktop:2
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #. Name
 #: uz/entry.desktop:2
-#, fuzzy
 msgid "Uzbekistan"
-msgstr "Tadjikistan"
+msgstr "Oezbekistan"
 
 #. Name
 #: va/entry.desktop:2
@@ -1229,22 +1215,22 @@ msgstr "Vaticaanstad"
 #. Name
 #: vc/entry.desktop:2
 msgid "St. Vincent and the Grenadines"
-msgstr "St. Vincent en de Grenadines"
+msgstr "Saint Vincent en de Grenadines"
 
 #. Name
 #: ve/entry.desktop:2
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. Name
 #: vg/entry.desktop:2
 msgid "Virgin Islands, British"
-msgstr "Virgin Eilanden, Britse"
+msgstr "Maagdeneilanden, Britse"
 
 #. Name
 #: vi/entry.desktop:2
 msgid "Virgin Islands, U.S."
-msgstr "Virgin Eilanden, U.S."
+msgstr "Maagdeneilanden, Amerikaanse"
 
 #. Name
 #: vn/entry.desktop:2
@@ -1254,7 +1240,7 @@ msgstr "Viëtnam"
 #. Name
 #: vu/entry.desktop:2
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #. Name
 #: wf/entry.desktop:2
@@ -1264,7 +1250,7 @@ msgstr "Wallis en Futuna"
 #. Name
 #: ws/entry.desktop:3
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. Name
 #: ye/entry.desktop:2
@@ -1279,9 +1265,9 @@ msgstr "Zuid-Afrika"
 #. Name
 #: zm/entry.desktop:2
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #. Name
 #: zw/entry.desktop:2
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
diff --git a/translations/desktop_files/l10n-desktops/ru.po b/translations/desktop_files/l10n-desktops/ru.po
index 9b89c5c9e..47f7d4dba 100644
--- a/translations/desktop_files/l10n-desktops/ru.po
+++ b/translations/desktop_files/l10n-desktops/ru.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-16 18:21+0000\n"
-"PO-Revision-Date: 2023-12-03 17:55+0000\n"
-"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/l10n-desktop-files/ru/>\n"
 "Language: ru\n"
@@ -266,7 +267,7 @@ msgstr "Бразили�"
 #. Name
 #: braille/entry.desktop:2
 msgid "Braille"
-msgstr ""
+msgstr "Шрифт Брайл�"
 
 #. Name
 #: bs/entry.desktop:2
@@ -436,7 +437,7 @@ msgstr "Западна� Сахара"
 #. Name
 #: eo/entry.desktop:2
 msgid "Esperanto"
-msgstr ""
+msgstr "Э�перанто"
 
 #. Name
 #: er/entry.desktop:2
@@ -645,10 +646,8 @@ msgstr "Япони�"
 
 #. Name
 #: jv/entry.desktop:2
-#, fuzzy
-#| msgid "Indonesia"
 msgid "Indonesia (Java)"
-msgstr "Индонези�"
+msgstr "Индонези� (Ява)"
 
 #. Name
 #: ke/entry.desktop:2
diff --git a/translations/desktop_files/l10n-desktops/sv.po b/translations/desktop_files/l10n-desktops/sv.po
index 166698a84..4bafb7edd 100644
--- a/translations/desktop_files/l10n-desktops/sv.po
+++ b/translations/desktop_files/l10n-desktops/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-16 18:21+0000\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-08-30 19:11+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/l10n-desktop-files/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -54,7 +55,7 @@ msgstr "Europa, öst"
 #. Name
 #: middleeast.desktop:2
 msgid "Middle-East"
-msgstr "Mellersta östern"
+msgstr "Mellanöstern"
 
 #. Name
 #: northafrica.desktop:2
@@ -119,7 +120,7 @@ msgstr "Förval"
 #. Name
 #: ad/entry.desktop:2
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #. Name
 #: ae/entry.desktop:2
@@ -139,7 +140,7 @@ msgstr "Antigua och Barbuda"
 #. Name
 #: ai/entry.desktop:2
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguila"
 
 #. Name
 #: al/entry.desktop:2
@@ -158,14 +159,13 @@ msgstr "Nederländska Antillerna"
 
 #. Name
 #: ao/entry.desktop:2
-#, fuzzy
 msgid "Angola"
-msgstr "Mongoliet"
+msgstr "Angola"
 
 #. Name
 #: ar/entry.desktop:2
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
 #. Name
 #: as/entry.desktop:2
@@ -185,7 +185,7 @@ msgstr "Australien"
 #. Name
 #: aw/entry.desktop:2
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #. Name
 #: ax/entry.desktop:2
@@ -195,7 +195,7 @@ msgstr "Ã…land"
 #. Name
 #: az/entry.desktop:2
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbajdzjan"
 
 #. Name
 #: ba/entry.desktop:2
@@ -205,12 +205,12 @@ msgstr "Bosnien och Herzegovina"
 #. Name
 #: bb/entry.desktop:2
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #. Name
 #: bd/entry.desktop:2
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #. Name
 #: be/entry.desktop:2
@@ -220,7 +220,7 @@ msgstr "Belgien"
 #. Name
 #: bf/entry.desktop:2
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. Name
 #: bg/entry.desktop:2
@@ -235,27 +235,27 @@ msgstr "Bahrein"
 #. Name
 #: bi/entry.desktop:2
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #. Name
 #: bj/entry.desktop:2
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #. Name
 #: bm/entry.desktop:2
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #. Name
 #: bn/entry.desktop:3
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #. Name
 #: bo/entry.desktop:2
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #. Name
 #: br/entry.desktop:2
@@ -265,22 +265,22 @@ msgstr "Brasilien"
 #. Name
 #: braille/entry.desktop:2
 msgid "Braille"
-msgstr ""
+msgstr "Blindskrift"
 
 #. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #. Name
 #: bt/entry.desktop:3
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #. Name
 #: bw/entry.desktop:2
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #. Name
 #: by/entry.desktop:3
@@ -290,7 +290,7 @@ msgstr "Vitryssland"
 #. Name
 #: bz/entry.desktop:2
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #. Name
 #: ca/entry.desktop:5
@@ -335,7 +335,7 @@ msgstr "Cooköarna"
 #. Name
 #: cl/entry.desktop:2
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #. Name
 #: cm/entry.desktop:2
@@ -350,12 +350,12 @@ msgstr "Kina"
 #. Name
 #: co/entry.desktop:2
 msgid "Colombia"
-msgstr ""
+msgstr "Colombia"
 
 #. Name
 #: cr/entry.desktop:2
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #. Name
 #: cu/entry.desktop:2
@@ -390,7 +390,7 @@ msgstr "Tyskland"
 #. Name
 #: dj/entry.desktop:2
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #. Name
 #: dk/entry.desktop:3
@@ -399,9 +399,8 @@ msgstr "Danmark"
 
 #. Name
 #: dm/entry.desktop:2
-#, fuzzy
 msgid "Dominica"
-msgstr "Dominikanska republiken"
+msgstr "Dominica"
 
 #. Name
 #: do/entry.desktop:2
@@ -416,7 +415,7 @@ msgstr "Algeriet"
 #. Name
 #: ec/entry.desktop:2
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #. Name
 #: ee/entry.desktop:2
@@ -436,12 +435,12 @@ msgstr "Västsahara"
 #. Name
 #: eo/entry.desktop:2
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
 #. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #. Name
 #: es/entry.desktop:2
@@ -455,14 +454,13 @@ msgstr "Etiopien"
 
 #. Name
 #: fi/entry.desktop:3
-#, fuzzy
 msgid "Finland"
-msgstr "Grönland"
+msgstr "Finland"
 
 #. Name
 #: fj/entry.desktop:2
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #. Name
 #: fk/entry.desktop:2
@@ -487,7 +485,7 @@ msgstr "Frankrike"
 #. Name
 #: ga/entry.desktop:2
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #. Name
 #: gb/entry.desktop:2
@@ -496,9 +494,8 @@ msgstr "Storbritannien"
 
 #. Name
 #: gd/entry.desktop:2
-#, fuzzy
 msgid "Grenada"
-msgstr "Kanada"
+msgstr "Grenada"
 
 #. Name
 #: ge/entry.desktop:2
@@ -508,12 +505,12 @@ msgstr "Georgien"
 #. Name
 #: gh/entry.desktop:2
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #. Name
 #: gi/entry.desktop:2
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltar"
 
 #. Name
 #: gl/entry.desktop:2
@@ -523,17 +520,17 @@ msgstr "Grönland"
 #. Name
 #: gm/entry.desktop:2
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #. Name
 #: gn/entry.desktop:2
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #. Name
 #: gp/entry.desktop:2
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #. Name
 #: gq/entry.desktop:2
@@ -548,22 +545,22 @@ msgstr "Grekland"
 #. Name
 #: gt/entry.desktop:2
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #. Name
 #: gu/entry.desktop:2
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #. Name
 #: gw/entry.desktop:2
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #. Name
 #: gy/entry.desktop:2
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #. Name
 #: hk/entry.desktop:2
@@ -573,7 +570,7 @@ msgstr "Hong Kong (Kina)"
 #. Name
 #: hn/entry.desktop:2
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. Name
 #: hr/entry.desktop:2
@@ -583,7 +580,7 @@ msgstr "Kroatien"
 #. Name
 #: ht/entry.desktop:2
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #. Name
 #: hu/entry.desktop:2
@@ -603,7 +600,7 @@ msgstr "Irland"
 #. Name
 #: il/entry.desktop:3
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #. Name
 #: in/entry.desktop:2
@@ -618,7 +615,7 @@ msgstr "Irak"
 #. Name
 #: ir/entry.desktop:2
 msgid "Iran"
-msgstr ""
+msgstr "Iran"
 
 #. Name
 #: is/entry.desktop:2
@@ -633,7 +630,7 @@ msgstr "Italien"
 #. Name
 #: jm/entry.desktop:2
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #. Name
 #: jo/entry.desktop:2
@@ -643,19 +640,17 @@ msgstr "Jordanien"
 #. Name
 #: jp/entry.desktop:2
 msgid "Japan"
-msgstr ""
+msgstr "Japan"
 
 #. Name
 #: jv/entry.desktop:2
-#, fuzzy
-#| msgid "Indonesia"
 msgid "Indonesia (Java)"
 msgstr "Indonesien"
 
 #. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #. Name
 #: kg/entry.desktop:2
@@ -670,7 +665,7 @@ msgstr "Kambodja"
 #. Name
 #: ki/entry.desktop:2
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #. Name
 #: km/entry.desktop:2
@@ -695,7 +690,7 @@ msgstr "Sydkorea"
 #. Name
 #: kw/entry.desktop:2
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #. Name
 #: ky/entry.desktop:2
@@ -710,7 +705,7 @@ msgstr "Kazakstan"
 #. Name
 #: la/entry.desktop:2
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #. Name
 #: lb/entry.desktop:2
@@ -720,27 +715,27 @@ msgstr "Libanon"
 #. Name
 #: lc/entry.desktop:2
 msgid "St. Lucia"
-msgstr ""
+msgstr "St. Lucia"
 
 #. Name
 #: li/entry.desktop:2
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #. Name
 #: lk/entry.desktop:2
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #. Name
 #: lr/entry.desktop:2
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #. Name
 #: ls/entry.desktop:2
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #. Name
 #: lt/entry.desktop:2
@@ -770,7 +765,7 @@ msgstr "Marocko"
 #. Name
 #: mc/entry.desktop:2
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #. Name
 #: md/entry.desktop:2
@@ -780,7 +775,7 @@ msgstr "Moldavien"
 #. Name
 #: me/entry.desktop:3
 msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
 
 #. Name
 #: mg/entry.desktop:2
@@ -805,12 +800,12 @@ msgstr "Makedonien"
 #. Name
 #: ml/entry.desktop:2
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. Name
 #: mm/entry.desktop:2
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. Name
 #: mn/entry.desktop:2
@@ -824,9 +819,8 @@ msgstr "Macao (Kina)"
 
 #. Name
 #: mq/entry.desktop:2
-#, fuzzy
 msgid "Martinique"
-msgstr "Moçambique"
+msgstr "Martinique"
 
 #. Name
 #: mr/entry.desktop:2
@@ -836,18 +830,17 @@ msgstr "Mauretanien"
 #. Name
 #: ms/entry.desktop:2
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #. Name
 #: mt/entry.desktop:3
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #. Name
 #: mu/entry.desktop:2
-#, fuzzy
 msgid "Mauritius"
-msgstr "Mauretanien"
+msgstr "Mauritius"
 
 #. Name
 #: mv/entry.desktop:2
@@ -857,17 +850,17 @@ msgstr "Maldiverna"
 #. Name
 #: mw/entry.desktop:2
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #. Name
 #: mx/entry.desktop:2
 msgid "Mexico"
-msgstr ""
+msgstr "Mexico"
 
 #. Name
 #: my/entry.desktop:2
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 #. Name
 #: mz/entry.desktop:2
@@ -877,7 +870,7 @@ msgstr "Moçambique"
 #. Name
 #: na/entry.desktop:2
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #. Name
 #: nc/entry.desktop:2
@@ -887,7 +880,7 @@ msgstr "Nya Caledonien"
 #. Name
 #: ne/entry.desktop:2
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #. Name
 #: nf/entry.desktop:2
@@ -896,14 +889,13 @@ msgstr "Norfolkön"
 
 #. Name
 #: ng/entry.desktop:2
-#, fuzzy
 msgid "Nigeria"
-msgstr "Algeriet"
+msgstr "Nigeria"
 
 #. Name
 #: ni/entry.desktop:2
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #. Name
 #: nl/entry.desktop:3
@@ -918,32 +910,32 @@ msgstr "Norge"
 #. Name
 #: np/entry.desktop:2
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. Name
 #: nr/entry.desktop:2
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. Name
 #: nu/entry.desktop:2
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #. Name
 #: om/entry.desktop:2
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #. Name
 #: pa/entry.desktop:2
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #. Name
 #: pe/entry.desktop:2
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #. Name
 #: pf/entry.desktop:2
@@ -962,9 +954,8 @@ msgstr "Filippinerna"
 
 #. Name
 #: pk/entry.desktop:2
-#, fuzzy
 msgid "Pakistan"
-msgstr "Tadzjikistan"
+msgstr "Pakistan"
 
 #. Name
 #: pl/entry.desktop:2
@@ -979,12 +970,12 @@ msgstr "Saint Pierre och Miquelon"
 #. Name
 #: pn/entry.desktop:2
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairnöarna"
 
 #. Name
 #: pr/entry.desktop:2
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #. Name
 #: ps/entry.desktop:2
@@ -994,22 +985,22 @@ msgstr "Palestina"
 #. Name
 #: pt/entry.desktop:3
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #. Name
 #: pw/entry.desktop:2
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. Name
 #: py/entry.desktop:2
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #. Name
 #: qa/entry.desktop:2
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 #. Name
 #: ro/entry.desktop:2
@@ -1029,7 +1020,7 @@ msgstr "Ryssland"
 #. Name
 #: rw/entry.desktop:2
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #. Name
 #: sa/entry.desktop:2
@@ -1049,7 +1040,7 @@ msgstr "Seychellerna"
 #. Name
 #: sd/entry.desktop:2
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #. Name
 #: se/entry.desktop:2
@@ -1059,12 +1050,12 @@ msgstr "Sverige"
 #. Name
 #: sg/entry.desktop:2
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #. Name
 #: sh/entry.desktop:2
 msgid "Saint Helena"
-msgstr ""
+msgstr "Sankta Helena"
 
 #. Name
 #: si/entry.desktop:2
@@ -1079,17 +1070,17 @@ msgstr "Slovakien"
 #. Name
 #: sm/entry.desktop:2
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #. Name
 #: sn/entry.desktop:2
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #. Name
 #: so/entry.desktop:2
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #. Name
 #: sr/entry.desktop:2
@@ -1104,7 +1095,7 @@ msgstr "São Tomé och Príncipe"
 #. Name
 #: sv/entry.desktop:2
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #. Name
 #: sy/entry.desktop:2
@@ -1113,9 +1104,8 @@ msgstr "Syrien"
 
 #. Name
 #: sz/entry.desktop:2
-#, fuzzy
 msgid "Swaziland"
-msgstr "Schweiz"
+msgstr "Swaziland"
 
 #. Name
 #: tc/entry.desktop:2
@@ -1130,12 +1120,12 @@ msgstr "Tchad"
 #. Name
 #: tg/entry.desktop:2
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. Name
 #: th/entry.desktop:2
 msgid "Thailand"
-msgstr ""
+msgstr "Thailand"
 
 #. Name
 #: tj/entry.desktop:2
@@ -1145,13 +1135,12 @@ msgstr "Tadzjikistan"
 #. Name
 #: tk/entry.desktop:2
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #. Name
 #: tm/entry.desktop:2
-#, fuzzy
 msgid "Turkmenistan"
-msgstr "Tadzjikistan"
+msgstr "Turkmenistan"
 
 #. Name
 #: tn/entry.desktop:2
@@ -1161,7 +1150,7 @@ msgstr "Tunisien"
 #. Name
 #: to/entry.desktop:2
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. Name
 #: tp/entry.desktop:2
@@ -1181,12 +1170,12 @@ msgstr "Trinidad och Tobago"
 #. Name
 #: tv/entry.desktop:2
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. Name
 #: tw/entry.desktop:3
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 #. Name
 #: tz/entry.desktop:2
@@ -1201,7 +1190,7 @@ msgstr "Ukraina"
 #. Name
 #: ug/entry.desktop:2
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #. Name
 #: us/entry.desktop:2
@@ -1211,13 +1200,12 @@ msgstr "Amerikas förenta stater"
 #. Name
 #: uy/entry.desktop:2
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #. Name
 #: uz/entry.desktop:2
-#, fuzzy
 msgid "Uzbekistan"
-msgstr "Tadzjikistan"
+msgstr "Uzbekistan"
 
 #. Name
 #: va/entry.desktop:2
@@ -1232,7 +1220,7 @@ msgstr "St. Vincent och Grenadinerna"
 #. Name
 #: ve/entry.desktop:2
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. Name
 #: vg/entry.desktop:2
@@ -1247,12 +1235,12 @@ msgstr "Amerikanska Jungfruöarna"
 #. Name
 #: vn/entry.desktop:2
 msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
 
 #. Name
 #: vu/entry.desktop:2
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #. Name
 #: wf/entry.desktop:2
@@ -1262,7 +1250,7 @@ msgstr "Wallis och Futuna"
 #. Name
 #: ws/entry.desktop:3
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. Name
 #: ye/entry.desktop:2
@@ -1277,9 +1265,9 @@ msgstr "Sydafrika"
 #. Name
 #: zm/entry.desktop:2
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #. Name
 #: zw/entry.desktop:2
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
diff --git a/translations/desktop_files/libkonq-desktops/es_AR.po b/translations/desktop_files/libkonq-desktops/es_AR.po
new file mode 100644
index 000000000..3bf688cb2
--- /dev/null
+++ b/translations/desktop_files/libkonq-desktops/es_AR.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-22 18:52+0200\n"
+"PO-Revision-Date: 2025-03-08 20:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/libkonq-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: directory_bookmarkbar.desktop:3
+#, fuzzy
+msgid "Bookmark Toolbar"
+msgstr "Barra de herramientas de marcadores"
+
+#. Name
+#: favicons/favicons.desktop:3
+#, fuzzy
+msgid "KDED Favicon Module"
+msgstr "Módulo Favicon de KDED"
+
+#. Comment
+#: favicons/favicons.desktop:4
+#, fuzzy
+msgid "Shortcut icon support"
+msgstr "Soporte para iconos de acceso directo"
+
+#. Comment
+#: konqpopupmenuplugin.desktop:4
+msgid "Plugin for the Konqueror Popup Menu"
+msgstr "Plugin para el menú emergente de Konqueror"
+
+#. Name
+#: servicemenus/edit-as-root.desktop:6
+#, fuzzy
+msgid "Edit as system administrator"
+msgstr "Editar como administrador del sistema"
diff --git a/translations/desktop_files/libkonq-desktops/ka.po b/translations/desktop_files/libkonq-desktops/ka.po
index cd7e9e522..cfcfd9999 100644
--- a/translations/desktop_files/libkonq-desktops/ka.po
+++ b/translations/desktop_files/libkonq-desktops/ka.po
@@ -1,42 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 18:52+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/libkonq-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: directory_bookmarkbar.desktop:3
 msgid "Bookmark Toolbar"
-msgstr "ს�ნიშნეთ� პ�ნელი"
+msgstr "ს�ნიშნეების პ�ნელი"
 
 #. Name
 #: favicons/favicons.desktop:3
 msgid "KDED Favicon Module"
-msgstr "KDED Favicon მ�დული"
+msgstr "KDED-ის Favicon მ�დული"
 
 #. Comment
 #: favicons/favicons.desktop:4
 msgid "Shortcut icon support"
-msgstr "მ�ლმხმ�ბი ხ�ტულების მხ�რდ�ჭერ�"
+msgstr "მ�ლს�ხმ�ბის ხ�ტულების მხ�რდ�ჭერ�"
 
 #. Comment
 #: konqpopupmenuplugin.desktop:4
 msgid "Plugin for the Konqueror Popup Menu"
-msgstr "Konqueror-ის ჩ�მ�შლ�დი მენიუს პლ�გინი"
+msgstr "Konqueror-ის მხტუნ�რ� მენიუს დ�მ�ტებ�"
 
 #. Name
 #: servicemenus/edit-as-root.desktop:6
 msgid "Edit as system administrator"
-msgstr ""
+msgstr "ჩ�სწ�რებ� �დმინის ს�ხელით"
diff --git a/translations/desktop_files/libkonq-desktops/nl.po b/translations/desktop_files/libkonq-desktops/nl.po
index 29b03d561..c4943fdbf 100644
--- a/translations/desktop_files/libkonq-desktops/nl.po
+++ b/translations/desktop_files/libkonq-desktops/nl.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 18:52+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/libkonq-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: directory_bookmarkbar.desktop:3
 msgid "Bookmark Toolbar"
-msgstr "Bladwijzer - werkbalk"
+msgstr "Bladwijzerwerkbalk"
 
 #. Name
 #: favicons/favicons.desktop:3
 msgid "KDED Favicon Module"
-msgstr ""
+msgstr "KDED-faviconmodule"
 
 #. Comment
 #: favicons/favicons.desktop:4
@@ -34,9 +35,9 @@ msgstr "Ondersteuning voor pictogrammen"
 #. Comment
 #: konqpopupmenuplugin.desktop:4
 msgid "Plugin for the Konqueror Popup Menu"
-msgstr "Plugin voor Konqueror's contextmenu"
+msgstr "Plug-in voor Konquerors rechtermuisknopmenu"
 
 #. Name
 #: servicemenus/edit-as-root.desktop:6
 msgid "Edit as system administrator"
-msgstr ""
+msgstr "Bewerken als beheerder"
diff --git a/translations/desktop_files/tde_release_notes.desktop/el.po b/translations/desktop_files/tde_release_notes.desktop/el.po
new file mode 100644
index 000000000..7bb6c3234
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/el.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# "blu.256" <mavridisf@gmail.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 20:22+0200\n"
+"PO-Revision-Date: 2025-04-24 12:44+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tde_release_notesdesktop/el/>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "Πλη�οφο�ίες σχετικά με την έκδοση του TDE"
diff --git a/translations/desktop_files/tde_release_notes.desktop/es_AR.po b/translations/desktop_files/tde_release_notes.desktop/es_AR.po
new file mode 100644
index 000000000..3e321dc77
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/es_AR.po
@@ -0,0 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 20:22+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr ""
diff --git a/translations/desktop_files/tde_release_notes.desktop/ka.po b/translations/desktop_files/tde_release_notes.desktop/ka.po
new file mode 100644
index 000000000..d636648b8
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/ka.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 20:22+0200\n"
+"PO-Revision-Date: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tde_release_notesdesktop/ka/>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "TDE-ის გ�მ�ცემის შენიშვნები"
diff --git a/translations/desktop_files/tde_release_notes.desktop/nl.po b/translations/desktop_files/tde_release_notes.desktop/nl.po
new file mode 100644
index 000000000..bbd2b570e
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/nl.po
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Heimen Stoffels <vistausss@outlook.com>, 2024.
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 20:22+0200\n"
+"PO-Revision-Date: 2024-11-18 13:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tde_release_notesdesktop/nl/>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "Wijzigingslog"
diff --git a/translations/desktop_files/tde_release_notes.desktop/zh_Hans.po b/translations/desktop_files/tde_release_notes.desktop/zh_Hans.po
new file mode 100644
index 000000000..35dfc128b
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/zh_Hans.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Toad114514 <xiaolan2332021@163.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 20:22+0200\n"
+"PO-Revision-Date: 2025-02-22 09:41+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/tde_release_notesdesktop/zh_Hans/>\n"
+"Language: zh_Hans\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.17\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "TDE �行版日志"
diff --git a/translations/desktop_files/tdehtml_plugins.desktop/es_AR.po b/translations/desktop_files/tdehtml_plugins.desktop/es_AR.po
new file mode 100644
index 000000000..277d09df1
--- /dev/null
+++ b/translations/desktop_files/tdehtml_plugins.desktop/es_AR.po
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-22 19:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: tdehtml_plugins.desktop:14
+msgid "Plugins"
+msgstr ""
+
+#. Comment
+#: tdehtml_plugins.desktop:16
+msgid "Configure the browser plugins"
+msgstr ""
+
+#. Keywords
+#: tdehtml_plugins.desktop:18
+msgid "konqueror;kfm;browser;html;web;www;fonts;plugins;"
+msgstr ""
diff --git a/translations/desktop_files/tdehtml_plugins.desktop/ka.po b/translations/desktop_files/tdehtml_plugins.desktop/ka.po
index 4352538e6..b22be15f6 100644
--- a/translations/desktop_files/tdehtml_plugins.desktop/ka.po
+++ b/translations/desktop_files/tdehtml_plugins.desktop/ka.po
@@ -1,32 +1,34 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 19:02+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdehtml_pluginsdesktop/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: tdehtml_plugins.desktop:14
 msgid "Plugins"
-msgstr "პლ�გინები"
+msgstr "დ�მ�ტებები"
 
 #. Comment
 #: tdehtml_plugins.desktop:16
 msgid "Configure the browser plugins"
-msgstr "ბრ�უზერის პლ�გინების კ�ნფიგურ�ცი�"
+msgstr "ბრ�უზერის დ�მ�ტებების მ�რგებ�"
 
 #. Keywords
 #: tdehtml_plugins.desktop:18
 msgid "konqueror;kfm;browser;html;web;www;fonts;plugins;"
 msgstr ""
+"konqueror;kfm;browser;html;web;www;fonts;plugins;დ�მ�ტებები;ბრ�უზერი;ვები;"
diff --git a/translations/desktop_files/tdehtml_plugins.desktop/nl.po b/translations/desktop_files/tdehtml_plugins.desktop/nl.po
index 3e4ca74e0..4dcf57f79 100644
--- a/translations/desktop_files/tdehtml_plugins.desktop/nl.po
+++ b/translations/desktop_files/tdehtml_plugins.desktop/nl.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 19:02+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-01-07 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdehtml_pluginsdesktop/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: tdehtml_plugins.desktop:14
 msgid "Plugins"
-msgstr ""
+msgstr "Plug-ins"
 
 #. Comment
 #: tdehtml_plugins.desktop:16
 msgid "Configure the browser plugins"
-msgstr "Hier kunt u de browser-plugins instellen"
+msgstr "Stel de browser-plug-ins in"
 
 #. Keywords
 #: tdehtml_plugins.desktop:18
diff --git a/translations/desktop_files/tdeintegration.desktop/es_AR.po b/translations/desktop_files/tdeintegration.desktop/es_AR.po
new file mode 100644
index 000000000..2c15bccb8
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/es_AR.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:05+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr ""
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr ""
diff --git a/translations/desktop_files/tdeintegration.desktop/ka.po b/translations/desktop_files/tdeintegration.desktop/ka.po
new file mode 100644
index 000000000..c6510adda
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/ka.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:05+0200\n"
+"PO-Revision-Date: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeintegrationdesktop/ka/>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "TDE-ის ინტეგრ�ციის მ�დული"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "�რ�-TDE-ის �პლიკ�ციის ინტერფეისის ინტეგრ�ციის მ�დული"
diff --git a/translations/desktop_files/tdeintegration.desktop/nl.po b/translations/desktop_files/tdeintegration.desktop/nl.po
new file mode 100644
index 000000000..b1612fb3e
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/nl.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Heimen Stoffels <vistausss@outlook.com>, 2024.
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:05+0200\n"
+"PO-Revision-Date: 2024-11-18 13:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdeintegrationdesktop/nl/>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "TDE-integratiemodule"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "Een module voor het integreren van niet-TDE-programma's"
diff --git a/translations/desktop_files/tdeintegration.desktop/sv.po b/translations/desktop_files/tdeintegration.desktop/sv.po
new file mode 100644
index 000000000..1b1204011
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/sv.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:05+0200\n"
+"PO-Revision-Date: 2025-06-17 16:58+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeintegrationdesktop/sv/>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "TDE-integrationsmodul"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "Modul för att integrera gränssnitt av icke-TDE-program"
diff --git a/translations/desktop_files/tdeioslave-desktops/es_AR.po b/translations/desktop_files/tdeioslave-desktops/es_AR.po
new file mode 100644
index 000000000..85b50692d
--- /dev/null
+++ b/translations/desktop_files/tdeioslave-desktops/es_AR.po
@@ -0,0 +1,551 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: cgi/kcmcgi/kcmcgi.desktop:9
+msgid "CGI Scripts"
+msgstr ""
+
+#. Comment
+#: cgi/kcmcgi/kcmcgi.desktop:11
+msgid "Configure the CGI TDEIO slave"
+msgstr ""
+
+#. Keywords
+#: cgi/kcmcgi/kcmcgi.desktop:13
+msgid "CGI;TDEIO;Slave;Paths;"
+msgstr ""
+
+#. Name
+#: home/kdedmodule/homedirnotify.desktop:4
+msgid "KDED Home Base URL Notifier"
+msgstr ""
+
+#. Comment
+#: home/kdedmodule/homedirnotify.desktop:6
+msgid "Provides change notification for user's home folder ($HOME)"
+msgstr ""
+
+#. Name
+#: man/kmanpart.desktop:4
+msgid "KManPart"
+msgstr ""
+
+#. Comment
+#: man/kmanpart.desktop:6
+msgid "Embeddable Troff Viewer"
+msgstr ""
+
+#. Name
+#: media/mediamanager/mediamanager.desktop:4
+msgid "KDED Media Manager"
+msgstr ""
+
+#. Comment
+#: media/mediamanager/mediamanager.desktop:6
+msgid "Keep track of media activities and allow to (un)mount (media:/)"
+msgstr ""
+
+#. Name
+#: media/medianotifier/medianotifier.desktop:4
+msgid "Media Notifier Daemon"
+msgstr ""
+
+#. Comment
+#: media/medianotifier/medianotifier.desktop:6
+msgid "A media plugged notifier"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/audiocd.desktop:6
+msgid "Audio CD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/blankbluray.desktop:6
+msgid "Blank BLURAY"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/blankcd.desktop:6
+msgid "Blank CD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/blankdvd.desktop:6
+msgid "Blank DVD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/bluray_encrypted_locked.desktop:7
+msgid "Encrypted Locked BLURAY"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/bluray_encrypted_unlocked.desktop:7
+msgid "Encrypted Unlocked BLURAY"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/bluray_mounted.desktop:6
+msgid "Mounted BLURAY"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/bluray_unmounted.desktop:6
+msgid "Unmounted BLURAY"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/blurayvideo.desktop:6
+msgid "BLURAY Video Disk"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/camera_mounted.desktop:6
+msgid "Mounted Camera"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/camera_unmounted.desktop:6
+msgid "Unmounted Camera"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-r_encrypted_locked.desktop:7
+msgid "Encrypted Locked CD-R"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-r_encrypted_unlocked.desktop:7
+msgid "Encrypted Unlocked CD-R"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-r_mounted.desktop:6
+msgid "Mounted CD-R"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-r_unmounted.desktop:6
+msgid "Unmounted CD-R"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-rw_encrypted_locked.desktop:7
+msgid "Encrypted Locked CD-RW"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7
+msgid "Encrypted Unlocked CD-RW"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-rw_mounted.desktop:6
+msgid "Mounted CD-RW"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cd-rw_unmounted.desktop:6
+msgid "Unmounted CD-RW"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cdrom_encrypted_locked.desktop:7
+msgid "Encrypted Locked CD-ROM"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cdrom_encrypted_unlocked.desktop:7
+msgid "Encrypted Unlocked CD-ROM"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cdrom_mounted.desktop:6
+msgid "Mounted CD-ROM"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/cdrom_unmounted.desktop:6
+msgid "Unmounted CD-ROM"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/dvd_encrypted_locked.desktop:7
+msgid "Encrypted Locked DVD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/dvd_encrypted_unlocked.desktop:7
+msgid "Encrypted Unlocked DVD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/dvd_mounted.desktop:6
+msgid "Mounted DVD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/dvd_unmounted.desktop:6
+msgid "Unmounted DVD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/dvdvideo.desktop:6
+msgid "DVD Video Disk"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/floppy5_mounted.desktop:6
+msgid "Mounted 5¼\" Floppy"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/floppy5_unmounted.desktop:6
+msgid "Unmounted 5¼\" Floppy"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/floppy_mounted.desktop:6
+msgid "Mounted Floppy"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/floppy_unmounted.desktop:6
+msgid "Unmounted Floppy"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/gphoto2camera.desktop:6
+msgid "Camera"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/hdd_encrypted_locked.desktop:7
+msgid "Encrypted Locked Hard Disk Volume"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/hdd_encrypted_unlocked.desktop:7
+msgid "Encrypted Unlocked Hard Disk Volume"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/hdd_mounted.desktop:6
+msgid "Mounted Hard Disk Volume"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/hdd_unmounted.desktop:6
+msgid "Unmounted Hard Disk Volume"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/mycomputer.desktop:6
+msgid "My Computer"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/mydocuments.desktop:6
+msgid "My Documents"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/mynetworkplaces.desktop:6
+msgid "My Network Places"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/nfs_mounted.desktop:6
+msgid "Mounted NFS Share"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/nfs_unmounted.desktop:6
+msgid "Unmounted NFS Share"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/printers.desktop:6
+msgid "Printers"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/removable_encrypted_locked.desktop:7
+msgid "Encrypted Locked Removable Medium"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/removable_encrypted_unlocked.desktop:7
+msgid "Encrypted Unlocked Removable Medium"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/removable_mounted.desktop:6
+msgid "Mounted Removable Medium"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/removable_unmounted.desktop:6
+msgid "Unmounted Removable Medium"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/smb_mounted.desktop:6
+msgid "Mounted Samba (Microsoft Network) Share"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/smb_unmounted.desktop:6
+msgid "Unmounted Samba (Microsoft Network) Share"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/svcd.desktop:6
+msgid "Super Video CD"
+msgstr ""
+
+#. Comment
+#. Name
+#: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
+#: trash/kcmtrash.desktop:11
+msgid "Trash"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/vcd.desktop:6
+msgid "Video CD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/webbrowser.desktop:6
+msgid "Web Browser"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/zip_mounted.desktop:6
+msgid "Mounted Zip Disk"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/zip_unmounted.desktop:6
+msgid "Unmounted Zip Disk"
+msgstr ""
+
+#. Name
+#: media/propsdlgplugin/media_propsdlgplugin.desktop:6
+msgid "Media Properties Page"
+msgstr ""
+
+#. Comment
+#: media/propsdlgplugin/media_propsdlgplugin.desktop:8
+msgid "Konqueror properties dialog plugin to configure mount behaviour"
+msgstr ""
+
+#. Name
+#: media/services/media_eject.desktop:10
+msgid "Eject"
+msgstr ""
+
+#. Name
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
+msgid "Mount"
+msgstr ""
+
+#. Name
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
+msgid "Safely Remove"
+msgstr ""
+
+#. Name
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
+msgid "Unmount"
+msgstr ""
+
+#. Name
+#: media/tdecmodule/media.desktop:10 system/entries/media.desktop:6
+msgid "Storage Media"
+msgstr ""
+
+#. Comment
+#: media/tdecmodule/media.desktop:12
+msgid "Configure Storage Media"
+msgstr ""
+
+#. Keywords
+#: media/tdecmodule/media.desktop:14
+msgid "storage;media;usb;cdrom;device;"
+msgstr ""
+
+#. Name
+#: media/tdefile-plugin/tdefile_media.desktop:6
+msgid "Medium Information"
+msgstr ""
+
+#. Name
+#: remote/kdedmodule/remotedirnotify.desktop:4
+msgid "KDED Remote Base URL Notifier"
+msgstr ""
+
+#. Comment
+#: remote/kdedmodule/remotedirnotify.desktop:6
+msgid "Provides change notification for network folders"
+msgstr ""
+
+#. Name
+#: smb/smb-network.desktop:4
+msgid "Samba Shares"
+msgstr ""
+
+#. Comment
+#: smb/x-smb-server.desktop:2
+msgid "Windows Server"
+msgstr ""
+
+#. Comment
+#: smb/x-smb-workgroup.desktop:2
+msgid "Windows Workgroup"
+msgstr ""
+
+#. Name
+#: system/entries/documents.desktop:6
+msgid "Documents Folder"
+msgstr ""
+
+#. Name
+#: system/entries/home.desktop:6
+msgid "Home Folder"
+msgstr ""
+
+#. Name
+#: system/entries/remote.desktop:6
+msgid "Remote Places"
+msgstr ""
+
+#. Name
+#: system/entries/users.desktop:6
+msgid "Users Folders"
+msgstr ""
+
+#. Name
+#: system/kdedmodule/systemdirnotify.desktop:4
+msgid "KDED System Base URL Notifier"
+msgstr ""
+
+#. Comment
+#: system/kdedmodule/systemdirnotify.desktop:6
+msgid ""
+"Provides change notification for folders monitored by the system:/ tdeio "
+"plugin"
+msgstr ""
+
+#. Comment
+#: system/mimetypes/system_directory.desktop:6
+msgid "System Folder"
+msgstr ""
+
+#. Name
+#: thumbnail/cursorthumbnail.desktop:4
+msgid "Cursor Files"
+msgstr ""
+
+#. Name
+#: thumbnail/djvuthumbnail.desktop:4
+msgid "DjVu Files"
+msgstr ""
+
+#. Name
+#: thumbnail/exrthumbnail.desktop:4
+msgid "EXR Images"
+msgstr ""
+
+#. Name
+#: thumbnail/htmlthumbnail.desktop:4
+msgid "HTML Files"
+msgstr ""
+
+#. Name
+#: thumbnail/imagethumbnail.desktop:4
+msgid "Images"
+msgstr ""
+
+#. Name
+#: thumbnail/textthumbnail.desktop:4
+msgid "Text Files"
+msgstr ""
+
+#. Comment
+#: thumbnail/thumbcreator.desktop:5
+msgid "Thumbnail Handler"
+msgstr ""
+
+#. Comment
+#. Name
+#: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
+msgid "Trash Properties"
+msgstr ""
+
+#. Keywords
+#: trash/kcmtrash.desktop:15
+msgid "trash;properties;size;limits;delete"
+msgstr ""
+
+#. Name
+#: trash/tdefile-plugin/tdefile_trash.desktop:4
+#: trash/tdefile-plugin/tdefile_trash_system.desktop:4
+msgid "Trash File Info"
+msgstr ""
+
+#. Description
+#: fish/fish.protocol:14
+msgid "A tdeioslave for the FISH protocol"
+msgstr ""
+
+#. Description
+#: fish/nxfish.protocol:14
+msgid "A tdeioslave for the NXFISH protocol"
+msgstr ""
+
+#. Description
+#: mac/mac.protocol:9
+msgid "A tdeioslave for MacOS HFS+ partitions"
+msgstr ""
+
+#. Description
+#: sftp/sftp.protocol:15
+msgid "A tdeioslave for sftp"
+msgstr ""
+
+#. ExtraNames
+#: trash/trash.protocol:25
+msgid "Original Path,Deletion Date"
+msgstr ""
diff --git a/translations/desktop_files/tdeioslave-desktops/ka.po b/translations/desktop_files/tdeioslave-desktops/ka.po
index caaf63779..b36ff0679 100644
--- a/translations/desktop_files/tdeioslave-desktops/ka.po
+++ b/translations/desktop_files/tdeioslave-desktops/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-12-13 07:11+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeioslave-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -29,7 +30,7 @@ msgstr "CGI TDEIO slave-ის კ�ნფიგურ�ცი�"
 #. Keywords
 #: cgi/kcmcgi/kcmcgi.desktop:13
 msgid "CGI;TDEIO;Slave;Paths;"
-msgstr ""
+msgstr "CGI;TDEIO;Slave;Paths;ბილიკები;"
 
 #. Name
 #: home/kdedmodule/homedirnotify.desktop:4
@@ -40,43 +41,43 @@ msgstr "KDED ძირითáƒ�დი თáƒ�ვფურცლის URL შეá
 #: home/kdedmodule/homedirnotify.desktop:6
 msgid "Provides change notification for user's home folder ($HOME)"
 msgstr ""
+"მ�გ�წ�დებთ ცვლილების გ�ფრთხილებ�ს მ�მხმ�რებლის ს�წყისი ს�ქ�ღ�ლდის შეს�ხებ "
+"($HOME)"
 
 #. Name
 #: man/kmanpart.desktop:4
 msgid "KManPart"
-msgstr ""
+msgstr "KManPart"
 
 #. Comment
 #: man/kmanpart.desktop:6
 msgid "Embeddable Troff Viewer"
-msgstr "ჩ�შენებული დ�მთვ�ლიერებელი პრ�გრ�მ� Troff"
+msgstr "ჩ�შენებ�დი დ�მთვ�ლიერებელი პრ�გრ�მ� Troff"
 
 #. Name
 #: media/mediamanager/mediamanager.desktop:4
 msgid "KDED Media Manager"
-msgstr "მ�ტ�რებლების მმ�რთველი KDED"
+msgstr "KDED მედიის მმ�რთველი"
 
 #. Comment
 #: media/mediamanager/mediamanager.desktop:6
 msgid "Keep track of media activities and allow to (un)mount (media:/)"
-msgstr ""
-"თვ�ლყურს �დევნებს მედიის �ქტიურ�ბ�ს დ� ს�შუ�ლებ�ს �ძლევს (დე)მ�ნტირების "
-"გ�კეთებ�ს (media:/)"
+msgstr "მედიის �ქტივ�ბების ტრეკინგი დ� მიმ�გრების/მ�ხსნის (media:/) დ�შვებ�"
 
 #. Name
 #: media/medianotifier/medianotifier.desktop:4
 msgid "Media Notifier Daemon"
-msgstr "მედიის შემტყ�ბინებელი"
+msgstr "მედიის შეტყ�ბინების დემ�ნი"
 
 #. Comment
 #: media/medianotifier/medianotifier.desktop:6
 msgid "A media plugged notifier"
-msgstr "მედიის ჩ�დგმის შემტყ�ბინებელი"
+msgstr "მედიის მიერთების შეტყ�ბინებ�"
 
 #. Comment
 #: media/mimetypes/audiocd.desktop:6
 msgid "Audio CD"
-msgstr ""
+msgstr "�უდი� CD"
 
 #. Comment
 #: media/mimetypes/blankbluray.desktop:6
@@ -96,22 +97,22 @@ msgstr "სუფთ� DVD"
 #. Comment
 #: media/mimetypes/bluray_encrypted_locked.desktop:7
 msgid "Encrypted Locked BLURAY"
-msgstr ""
+msgstr "დ�შიფრული დ�ბლ�კილი BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked BLURAY"
-msgstr ""
+msgstr "დ�შიფრული გ�ნბლ�კილი BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_mounted.desktop:6
 msgid "Mounted BLURAY"
-msgstr "მ�ნტირებული BLURAY"
+msgstr "მიმ�გრებული BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_unmounted.desktop:6
 msgid "Unmounted BLURAY"
-msgstr "დემ�ნტირებული BLURAY"
+msgstr "მ�ხსნილი BLURAY"
 
 #. Comment
 #: media/mimetypes/blurayvideo.desktop:6
@@ -121,92 +122,92 @@ msgstr "ვიდე� BLURAY დისკი"
 #. Comment
 #: media/mimetypes/camera_mounted.desktop:6
 msgid "Mounted Camera"
-msgstr "მ�ნტირებული კ�მერ�"
+msgstr "მიმ�გრებული კ�მერ�"
 
 #. Comment
 #: media/mimetypes/camera_unmounted.desktop:6
 msgid "Unmounted Camera"
-msgstr "დემ�ნტირებული კ�მერ�"
+msgstr "მ�ხსნილი კ�მერ�"
 
 #. Comment
 #: media/mimetypes/cd-r_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-R"
-msgstr ""
+msgstr "დ�შიფრული დ�ბლ�კილი CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-R"
-msgstr ""
+msgstr "დ�შიფრული გ�ნბლ�კილი CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_mounted.desktop:6
 msgid "Mounted CD-R"
-msgstr "მ�ნტირებული CD-R"
+msgstr "მიმ�გრებული CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_unmounted.desktop:6
 msgid "Unmounted CD-R"
-msgstr "დემ�ნტირებული CD-R"
+msgstr "მ�ხსნილი CD-R"
 
 #. Comment
 #: media/mimetypes/cd-rw_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-RW"
-msgstr ""
+msgstr "დ�შიფრული დ�ბლ�კილი CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-RW"
-msgstr ""
+msgstr "დ�შიფრული გ�ნბლ�კილი CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
 msgid "Mounted CD-RW"
-msgstr "მ�ნტირებული CD-RW"
+msgstr "მიმ�გრებული CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
-msgstr "დემ�ნტირებული CD-RW"
+msgstr "მ�ხსნილი CD-RW"
 
 #. Comment
 #: media/mimetypes/cdrom_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-ROM"
-msgstr ""
+msgstr "დ�შიფრული დ�ბლ�კილი CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-ROM"
-msgstr ""
+msgstr "დ�შიფრული გ�ნბლ�კილი CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_mounted.desktop:6
 msgid "Mounted CD-ROM"
-msgstr "მ�ნტირებული CD-ROM"
+msgstr "მიმ�გრებული CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_unmounted.desktop:6
 msgid "Unmounted CD-ROM"
-msgstr "დემ�ნტირებული CD-ROM"
+msgstr "მ�ხსნილი CD-ROM"
 
 #. Comment
 #: media/mimetypes/dvd_encrypted_locked.desktop:7
 msgid "Encrypted Locked DVD"
-msgstr ""
+msgstr "დ�შიფრული დ�ბლ�კილი DVD"
 
 #. Comment
 #: media/mimetypes/dvd_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked DVD"
-msgstr ""
+msgstr "დ�შიფრული გ�ნბლ�კილი DVD"
 
 #. Comment
 #: media/mimetypes/dvd_mounted.desktop:6
 msgid "Mounted DVD"
-msgstr "მ�ნტირებული DVD"
+msgstr "მიმ�გრებული DVD"
 
 #. Comment
 #: media/mimetypes/dvd_unmounted.desktop:6
 msgid "Unmounted DVD"
-msgstr "დემ�ნტირებული DVD"
+msgstr "მ�ხსნილი DVD"
 
 #. Comment
 #: media/mimetypes/dvdvideo.desktop:6
@@ -216,22 +217,22 @@ msgstr "ვიდე� DVD დისკი"
 #. Comment
 #: media/mimetypes/floppy5_mounted.desktop:6
 msgid "Mounted 5¼\" Floppy"
-msgstr "მ�ნტირებული დისკწ�მყვ�ნი 5¼\""
+msgstr "მიმ�გრებული 5¼\" დისკეტ�"
 
 #. Comment
 #: media/mimetypes/floppy5_unmounted.desktop:6
 msgid "Unmounted 5¼\" Floppy"
-msgstr "დემ�ნტირებული დისკწ�მყვ�ნი 5¼\""
+msgstr "მ�ხსნილი 5¼\" დისკეტ�"
 
 #. Comment
 #: media/mimetypes/floppy_mounted.desktop:6
 msgid "Mounted Floppy"
-msgstr "მ�ნტირებული დრეკ�დი დისკი"
+msgstr "მიმ�გრებული დისკეტ�"
 
 #. Comment
 #: media/mimetypes/floppy_unmounted.desktop:6
 msgid "Unmounted Floppy"
-msgstr "დემ�ნტირებული დრეკ�დი დისკი"
+msgstr "მ�ხსნილი დისკეტ�"
 
 #. Comment
 #: media/mimetypes/gphoto2camera.desktop:6
@@ -240,88 +241,83 @@ msgstr "კ�მერ�"
 
 #. Comment
 #: media/mimetypes/hdd_encrypted_locked.desktop:7
-#, fuzzy
 msgid "Encrypted Locked Hard Disk Volume"
-msgstr "მ�ნტირებული ხისტი დისკის ტ�მი"
+msgstr "დ�შიფრული მიმ�გრებული მყ�რი დისკის ტ�მი"
 
 #. Comment
 #: media/mimetypes/hdd_encrypted_unlocked.desktop:7
-#, fuzzy
 msgid "Encrypted Unlocked Hard Disk Volume"
-msgstr "დემ�ნტირებული ხისტი დისკის ტ�მი"
+msgstr "დ�შიფრული მ�ხსნილი მყ�რი დისკის ტ�მი"
 
 #. Comment
 #: media/mimetypes/hdd_mounted.desktop:6
 msgid "Mounted Hard Disk Volume"
-msgstr "მ�ნტირებული ხისტი დისკის ტ�მი"
+msgstr "მიმ�გრებული მყ�რი დისკის ტ�მი"
 
 #. Comment
 #: media/mimetypes/hdd_unmounted.desktop:6
 msgid "Unmounted Hard Disk Volume"
-msgstr "დემ�ნტირებული ხისტი დისკის ტ�მი"
+msgstr "მ�ხსნილი მყ�რი დისკის ტ�მი"
 
 #. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
-msgstr ""
+msgstr "ჩემი კ�მპიუტერი"
 
 #. Comment
 #: media/mimetypes/mydocuments.desktop:6
 msgid "My Documents"
-msgstr ""
+msgstr "ჩემი დ�კუმენტები"
 
 #. Comment
 #: media/mimetypes/mynetworkplaces.desktop:6
-#, fuzzy
 msgid "My Network Places"
-msgstr "დ�შ�რებული �დგილები"
+msgstr "ჩემი ქსელის მდებ�რე�ბები"
 
 #. Comment
 #: media/mimetypes/nfs_mounted.desktop:6
 msgid "Mounted NFS Share"
-msgstr "მ�ნტირებული NFS რესურსი"
+msgstr "მიმ�გრებული NFS რესურსი"
 
 #. Comment
 #: media/mimetypes/nfs_unmounted.desktop:6
 msgid "Unmounted NFS Share"
-msgstr "დემ�ნტირებული NFS რესურსი"
+msgstr "მ�ხსნილი NFS რესურსი"
 
 #. Comment
 #: media/mimetypes/printers.desktop:6
 msgid "Printers"
-msgstr ""
+msgstr "პრინტერები"
 
 #. Comment
 #: media/mimetypes/removable_encrypted_locked.desktop:7
-#, fuzzy
 msgid "Encrypted Locked Removable Medium"
-msgstr "მ�ნტირებული პ�რტ�ტიული მ�წყ�ბილ�ბ�"
+msgstr "დ�შიფრული დ�ბლ�კილი მ�ხსნ�დი მედი�"
 
 #. Comment
 #: media/mimetypes/removable_encrypted_unlocked.desktop:7
-#, fuzzy
 msgid "Encrypted Unlocked Removable Medium"
-msgstr "დემ�ნტირებული პ�რტ�ტიული მ�წყ�ბილ�ბ�"
+msgstr "დ�შიფრული გ�ნბლ�კილი მ�ხსნ�დი მედი�"
 
 #. Comment
 #: media/mimetypes/removable_mounted.desktop:6
 msgid "Mounted Removable Medium"
-msgstr "მ�ნტირებული პ�რტ�ტიული მ�წყ�ბილ�ბ�"
+msgstr "მიმ�გრებული მ�ხსნ�დი მედი�"
 
 #. Comment
 #: media/mimetypes/removable_unmounted.desktop:6
 msgid "Unmounted Removable Medium"
-msgstr "დემ�ნტირებული პ�რტ�ტიული მ�წყ�ბილ�ბ�"
+msgstr "მ�ხსნილი მ�ხსნ�დი მედი�"
 
 #. Comment
 #: media/mimetypes/smb_mounted.desktop:6
 msgid "Mounted Samba (Microsoft Network) Share"
-msgstr "მ�ნტირებული Samba რესურსი (Microsoft-ის ქსელი)"
+msgstr "მიმ�გრებული Samba-ის(Microsoft-ის ქსელი) გ�ზი�რებული"
 
 #. Comment
 #: media/mimetypes/smb_unmounted.desktop:6
 msgid "Unmounted Samba (Microsoft Network) Share"
-msgstr "დემ�ნტირებული Samba რესურსი (Microsoft-ის ქსელი)"
+msgstr "მ�ხსნილი Samba-ის (Microsoft-ის ქსელი) გ�ზი�რებული"
 
 #. Comment
 #: media/mimetypes/svcd.desktop:6
@@ -333,110 +329,107 @@ msgstr "სუპერ ვიდე� CD"
 #: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
 #: trash/kcmtrash.desktop:11
 msgid "Trash"
-msgstr "ურნ�"
+msgstr "ნ�გვის ყუთი"
 
 #. Comment
 #: media/mimetypes/vcd.desktop:6
-#, fuzzy
 msgid "Video CD"
-msgstr "სუპერ ვიდე� CD"
+msgstr "ვიდე� CD"
 
 #. Comment
 #: media/mimetypes/webbrowser.desktop:6
 msgid "Web Browser"
-msgstr ""
+msgstr "ვებ ბრ�უზერი"
 
 #. Comment
 #: media/mimetypes/zip_mounted.desktop:6
 msgid "Mounted Zip Disk"
-msgstr "მ�ნტირებული ди�к Zip"
+msgstr "მიმ�გრებული Zip დისკი"
 
 #. Comment
 #: media/mimetypes/zip_unmounted.desktop:6
 msgid "Unmounted Zip Disk"
-msgstr "დემ�ნტირებული ди�к Zip"
+msgstr "მ�ხსნილი Zip დისკი"
 
 #. Name
 #: media/propsdlgplugin/media_propsdlgplugin.desktop:6
-#, fuzzy
 msgid "Media Properties Page"
-msgstr "მედიის შემტყ�ბინებელი"
+msgstr "მედიის თვისებების გვერდი"
 
 #. Comment
 #: media/propsdlgplugin/media_propsdlgplugin.desktop:8
 msgid "Konqueror properties dialog plugin to configure mount behaviour"
-msgstr ""
+msgstr "Konqueror-ის თვისებების დი�ლ�გის დ�მ�ტებ� მიმ�გრების ქცევის მ�ს�რგებ�დ"
 
 #. Name
 #: media/services/media_eject.desktop:10
 msgid "Eject"
-msgstr "CD-ს �მ�ღებ�"
+msgstr "�მ�ღებ�"
 
 #. Name
 #: media/services/media_lock.desktop:10
 msgid "Lock"
-msgstr ""
+msgstr "დ�ბლ�კვ�"
 
 #. Name
 #: media/services/media_mount.desktop:10
 msgid "Mount"
-msgstr "მ�ნტირებ�"
+msgstr "მიმ�გრებ�"
 
 #. Name
 #: media/services/media_realfolder.desktop:10
 msgid "Open Medium System Folder"
-msgstr "მედიუმის სისტემური ს�ქ�ღ�ლდის გ�ხსნ�"
+msgstr "მედიის სისტემური ს�ქ�ღ�ლდის გ�ხსნ�"
 
 #. Name
 #: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
-msgstr "უს�ფრთხ�დ გ�მ�რთვ�"
+msgstr "უს�ფრთხ�დ მ�ხსნ�"
 
 #. Name
 #: media/services/media_unlock.desktop:10
 msgid "Unlock"
-msgstr ""
+msgstr "გ�ნბლ�კვ�"
 
 #. Name
 #: media/services/media_unmount.desktop:10
 msgid "Unmount"
-msgstr "დემ�ნტირებ�"
+msgstr "მ�ხსნ�"
 
 #. Name
 #: media/tdecmodule/media.desktop:10 system/entries/media.desktop:6
 msgid "Storage Media"
-msgstr "მ�ნ�ცემთ� შენ�ხვის მ�წყ�ბილ�ბები"
+msgstr "ს�ც�ვის მედი�"
 
 #. Comment
 #: media/tdecmodule/media.desktop:12
 msgid "Configure Storage Media"
-msgstr "შენ�ხვის მედიის გ�მ�რთვ�"
+msgstr "ს�ც�ვის მედიის მ�რგებ�"
 
 #. Keywords
 #: media/tdecmodule/media.desktop:14
 msgid "storage;media;usb;cdrom;device;"
-msgstr ""
+msgstr "storage;media;usb;cdrom;device;ს�ც�ვი;მედი�;მ�წყ�ბილ�ბ�;"
 
 #. Name
 #: media/tdefile-plugin/tdefile_media.desktop:6
 msgid "Medium Information"
-msgstr "ცნ�ბები მ�ტ�რებლის შეს�ხებ"
+msgstr "მედიის ინფ�რმ�ცი�"
 
 #. Name
 #: remote/kdedmodule/remotedirnotify.desktop:4
-#, fuzzy
 msgid "KDED Remote Base URL Notifier"
-msgstr "KDED ძირით�დი თ�ვფურცლის URL შემტყ�ბინებელი"
+msgstr "KDED დ�შ�რებული ს�ბ�ზის� ბმულის გ�ფრთხილებ�"
 
 #. Comment
 #: remote/kdedmodule/remotedirnotify.desktop:6
 msgid "Provides change notification for network folders"
-msgstr ""
+msgstr "მ�გ�წვდით ცვლილების გ�ფრთხილებ�ს ქსელის ს�ქ�ღ�ლდეებისთვის"
 
 #. Name
 #: smb/smb-network.desktop:4
 msgid "Samba Shares"
-msgstr "Samba-ს ს�ზი�რ�ები"
+msgstr "Samba-ს გ�ზი�რებულები"
 
 #. Comment
 #: smb/x-smb-server.desktop:2
@@ -450,9 +443,8 @@ msgstr "Windows ს�მუშ�� გჯუფი"
 
 #. Name
 #: system/entries/documents.desktop:6
-#, fuzzy
 msgid "Documents Folder"
-msgstr "ს�წყისი ს�ქ�ღ�ლდე"
+msgstr "დ�კუმენტების ს�ქ�ღ�ლდე"
 
 #. Name
 #: system/entries/home.desktop:6
@@ -467,13 +459,12 @@ msgstr "დ�შ�რებული �დგილები"
 #. Name
 #: system/entries/users.desktop:6
 msgid "Users Folders"
-msgstr "მ�მხმ�რებლის დ�სტები"
+msgstr "მ�მხმ�რებლის ს�ქ�ღ�ლდეები"
 
 #. Name
 #: system/kdedmodule/systemdirnotify.desktop:4
-#, fuzzy
 msgid "KDED System Base URL Notifier"
-msgstr "KDED ძირით�დი თ�ვფურცლის URL შემტყ�ბინებელი"
+msgstr "KDED სისტემის ს�ბ�ზის� ბმულის გ�ფრთხილებ�"
 
 #. Comment
 #: system/kdedmodule/systemdirnotify.desktop:6
@@ -481,6 +472,8 @@ msgid ""
 "Provides change notification for folders monitored by the system:/ tdeio "
 "plugin"
 msgstr ""
+"მ�გ�წვდით ცვლილების გ�ფრთხილებ�ს tdeio-ის დ�მ�ტების მიერ მ�ნიტ�რინგის ქვეშ "
+"system:/ მდებ�რე�ბებისთვის"
 
 #. Comment
 #: system/mimetypes/system_directory.desktop:6
@@ -490,7 +483,7 @@ msgstr "სისტემური ს�ქ�ღ�ლდე"
 #. Name
 #: thumbnail/cursorthumbnail.desktop:4
 msgid "Cursor Files"
-msgstr "კურს�რთ� ფ�ილები"
+msgstr "კურს�რის ფ�ილები"
 
 #. Name
 #: thumbnail/djvuthumbnail.desktop:4
@@ -520,24 +513,24 @@ msgstr "ტექსტური ფ�ილები"
 #. Comment
 #: thumbnail/thumbcreator.desktop:5
 msgid "Thumbnail Handler"
-msgstr "მინი-გ�მ�ს�ხულების დ�მმუშ�ვებელი"
+msgstr "მინი�ტურების დ�მმუშ�ვებელი"
 
 #. Comment
 #. Name
 #: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
 msgid "Trash Properties"
-msgstr ""
+msgstr "ნ�გვის ყუთის თვისებები"
 
 #. Keywords
 #: trash/kcmtrash.desktop:15
 msgid "trash;properties;size;limits;delete"
-msgstr ""
+msgstr "trash;properties;size;limits;deleteნ�გვის ყუთი;ზ�მ�;ს�ზღვრები;თვისებები"
 
 #. Name
 #: trash/tdefile-plugin/tdefile_trash.desktop:4
 #: trash/tdefile-plugin/tdefile_trash_system.desktop:4
 msgid "Trash File Info"
-msgstr "ურნ�ში �რსებული ფ�ილის შეს�ხებ ცნ�ბი"
+msgstr "ინფ�რმ�ცი� ნ�გვის ყუთის ფ�ილის შეს�ხებ"
 
 #. Description
 #: fish/fish.protocol:14
@@ -552,15 +545,14 @@ msgstr "tdeioslave NXFISH �ქმისთვის"
 #. Description
 #: mac/mac.protocol:9
 msgid "A tdeioslave for MacOS HFS+ partitions"
-msgstr "tdeioslave MacOS HFS+ პ�რტიციებისთვის"
+msgstr "tdeioslave MacOS HFS+ დ�ნ�ყ�ფებისთვის"
 
 #. Description
 #: sftp/sftp.protocol:15
-#, fuzzy
 msgid "A tdeioslave for sftp"
-msgstr "tdeioslave FISH პრ�ტ�კ�ლისთვის"
+msgstr "tdeioslave SFTP პრ�ტ�კ�ლისთვის"
 
 #. ExtraNames
 #: trash/trash.protocol:25
 msgid "Original Path,Deletion Date"
-msgstr "ს�წყისი გეზი, წ�შლის თ�რიღი"
+msgstr "ს�წყისი ბილიკი, წ�შლის თ�რიღი"
diff --git a/translations/desktop_files/tdeioslave-desktops/ru.po b/translations/desktop_files/tdeioslave-desktops/ru.po
index 5a3e69b82..586e95cf1 100644
--- a/translations/desktop_files/tdeioslave-desktops/ru.po
+++ b/translations/desktop_files/tdeioslave-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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-06-29 05:58+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeioslave-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -75,7 +77,7 @@ msgstr "Си�тема обработки уведомлений от подкл
 #. Comment
 #: media/mimetypes/audiocd.desktop:6
 msgid "Audio CD"
-msgstr "�удио CD"
+msgstr "�удио-CD"
 
 #. Comment
 #: media/mimetypes/blankbluray.desktop:6
@@ -371,7 +373,7 @@ msgstr ""
 #. Name
 #: media/services/media_eject.desktop:10
 msgid "Eject"
-msgstr "Извлечь CD"
+msgstr "Извлечь"
 
 #. Name
 #: media/services/media_lock.desktop:10
@@ -386,7 +388,7 @@ msgstr "Подключить"
 #. Name
 #: media/services/media_realfolder.desktop:10
 msgid "Open Medium System Folder"
-msgstr "Открыть �и�темную папку"
+msgstr "Открыть �и�темную папку но�ител�"
 
 #. Name
 #: media/services/media_safelyremove.desktop:10
@@ -406,7 +408,7 @@ msgstr "Отключить"
 #. Name
 #: media/tdecmodule/media.desktop:10 system/entries/media.desktop:6
 msgid "Storage Media"
-msgstr "У�трой�тва хранени� данных"
+msgstr "�о�ители данных"
 
 #. Comment
 #: media/tdecmodule/media.desktop:12
@@ -456,7 +458,7 @@ msgstr "Документы"
 #. Name
 #: system/entries/home.desktop:6
 msgid "Home Folder"
-msgstr "Домашн�� папка"
+msgstr "Домашний каталог"
 
 #. Name
 #: system/entries/remote.desktop:6
@@ -466,7 +468,7 @@ msgstr "Сетевые ре�ур�ы"
 #. Name
 #: system/entries/users.desktop:6
 msgid "Users Folders"
-msgstr "Пользователь�кие папки"
+msgstr "Каталоги пользователей"
 
 #. Name
 #: system/kdedmodule/systemdirnotify.desktop:4
@@ -484,7 +486,7 @@ msgstr "От�леживание изменений в �етевых папка
 #. Comment
 #: system/mimetypes/system_directory.desktop:6
 msgid "System Folder"
-msgstr "Си�темна� папка"
+msgstr "Си�темный каталог"
 
 #. Name
 #: thumbnail/cursorthumbnail.desktop:4
diff --git a/translations/desktop_files/tdeioslave-desktops/uk.po b/translations/desktop_files/tdeioslave-desktops/uk.po
index f9d4b9004..c20e6893a 100644
--- a/translations/desktop_files/tdeioslave-desktops/uk.po
+++ b/translations/desktop_files/tdeioslave-desktops/uk.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Roman Savochenko <roman@oscada.org>, 2020.
+# Roman Savochenko <roman@oscada.org>, 2020, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2020-10-25 06:14+0000\n"
+"PO-Revision-Date: 2025-02-22 09:41+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/tdeioslave-desktop-files/uk/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2.2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -143,12 +143,12 @@ msgstr "Кодований Деблокований CD-R"
 #. Comment
 #: media/mimetypes/cd-r_mounted.desktop:6
 msgid "Mounted CD-R"
-msgstr "Змонтований гравер КД"
+msgstr "Змонтований гравер КД-R"
 
 #. Comment
 #: media/mimetypes/cd-r_unmounted.desktop:6
 msgid "Unmounted CD-R"
-msgstr "Демонтований гравер КД"
+msgstr "Демонтований гравер КД-R"
 
 #. Comment
 #: media/mimetypes/cd-rw_encrypted_locked.desktop:7
@@ -163,12 +163,12 @@ msgstr "Кодований Деблокований CD-RW"
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
 msgid "Mounted CD-RW"
-msgstr "Змонтований гравер КД"
+msgstr "Змонтований гравер КД-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
-msgstr "Демонтований гравер КД"
+msgstr "Демонтований гравер КД-RW"
 
 #. Comment
 #: media/mimetypes/cdrom_encrypted_locked.desktop:7
@@ -273,7 +273,7 @@ msgstr "Мої Документи"
 #. Comment
 #: media/mimetypes/mynetworkplaces.desktop:6
 msgid "My Network Places"
-msgstr "Мої Віддалені Мі�ц�"
+msgstr "Мої Мережеві Мі�ц�"
 
 #. Comment
 #: media/mimetypes/nfs_mounted.desktop:6
@@ -456,7 +456,7 @@ msgstr "Домашн� тека"
 #. Name
 #: system/entries/remote.desktop:6
 msgid "Remote Places"
-msgstr "Віддалені мі�ц�"
+msgstr "Віддалені Мі�ц�"
 
 #. Name
 #: system/entries/users.desktop:6
diff --git a/translations/desktop_files/tdepasswd-desktops/es_AR.po b/translations/desktop_files/tdepasswd-desktops/es_AR.po
new file mode 100644
index 000000000..9b85e0229
--- /dev/null
+++ b/translations/desktop_files/tdepasswd-desktops/es_AR.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 19:32+0200\n"
+"PO-Revision-Date: 2025-03-08 20:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/tdepasswd-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kcm/kcm_useraccount.desktop:10
+#, fuzzy
+msgid "Password & User Account"
+msgstr "Contraseña y cuenta de usuario"
+
+#. Comment
+#: kcm/kcm_useraccount.desktop:12
+msgid "User information such as password, name and email"
+msgstr "Información del usuario como la contraseña, el nombre o el mail"
+
+#. Keywords
+#: kcm/kcm_useraccount.desktop:14
+#, fuzzy
+msgid "password;email;name;organization;realname;login image;face;echo mode;"
+msgstr ""
+"contraseña;correo electrónico;nombre;organización;nombre real;imagen de "
+"acceso;cara;modo de eco;"
+
+#. Name
+#: tdepasswd.desktop:9
+#, fuzzy
+msgid "Change Password"
+msgstr "Cambiar la contraseña"
diff --git a/translations/desktop_files/tdepasswd-desktops/ka.po b/translations/desktop_files/tdepasswd-desktops/ka.po
index d96ba09cd..95248e86c 100644
--- a/translations/desktop_files/tdepasswd-desktops/ka.po
+++ b/translations/desktop_files/tdepasswd-desktops/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 19:32+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdepasswd-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcm/kcm_useraccount.desktop:10
@@ -24,12 +25,14 @@ msgstr "მáƒ�მხმáƒ�რებლის áƒ�ნგáƒ�რიშები დá
 #. Comment
 #: kcm/kcm_useraccount.desktop:12
 msgid "User information such as password, name and email"
-msgstr "ცნ�ბები მ�მხმ�რებლების შეს�ხებ, რ�გ�რიც�� პ�რ�ლი, ს�ხელი დ� ელ-ფ�სტ�"
+msgstr "ცნ�ბები მ�მხმ�რებლების შეს�ხებ, რ�გ�რიც�� პ�რ�ლი, ს�ხელი დ� ელფ�სტ�"
 
 #. Keywords
 #: kcm/kcm_useraccount.desktop:14
 msgid "password;email;name;organization;realname;login image;face;echo mode;"
 msgstr ""
+"password;email;name;organization;realname;login image;face;echo "
+"mode;პ�რ�ლი;ელფ�სტ�;ს�ხელი;"
 
 #. Name
 #: tdepasswd.desktop:9
diff --git a/translations/desktop_files/tdepasswd-desktops/nl.po b/translations/desktop_files/tdepasswd-desktops/nl.po
index 0323b4322..51e47d3d9 100644
--- a/translations/desktop_files/tdepasswd-desktops/nl.po
+++ b/translations/desktop_files/tdepasswd-desktops/nl.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 19:32+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-01-08 21:12+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdepasswd-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcm/kcm_useraccount.desktop:10
 msgid "Password & User Account"
-msgstr "Wachtwoord en gebruikerbeheer"
+msgstr "Wachtwoord en gebruikersaccount"
 
 #. Comment
 #: kcm/kcm_useraccount.desktop:12
 msgid "User information such as password, name and email"
-msgstr "Gebruikerinformatie zoals wachtwoord, naam en e-mailadres"
+msgstr "Gebruikersinformatie, zoals wachtwoord, naam en e-mailadres"
 
 #. Keywords
 #: kcm/kcm_useraccount.desktop:14
diff --git a/translations/desktop_files/tdeprint-desktops/es_AR.po b/translations/desktop_files/tdeprint-desktops/es_AR.po
new file mode 100644
index 000000000..f52a48f77
--- /dev/null
+++ b/translations/desktop_files/tdeprint-desktops/es_AR.po
@@ -0,0 +1,93 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
+msgid "KJobViewer"
+msgstr ""
+
+#. GenericName
+#. Comment
+#: kjobviewer/kjobviewer-autostart.desktop:9 kjobviewer/kjobviewer.desktop:10
+#: slave/mimetypes/jobs.desktop:2
+msgid "Print Jobs"
+msgstr ""
+
+#. Name
+#: kprinter/kprinter.desktop:9
+msgid "KPrinter"
+msgstr ""
+
+#. GenericName
+#: kprinter/kprinter.desktop:11
+msgid "Printing Tool"
+msgstr ""
+
+#. Name
+#: printmgr/printers.desktop:12
+msgid "Printers"
+msgstr ""
+
+#. Comment
+#: printmgr/printers.desktop:14
+msgid "Printing system configuration (printers, jobs, classes, ...)"
+msgstr ""
+
+#. Keywords
+#: printmgr/printers.desktop:16
+msgid "print;printer;printing management;"
+msgstr ""
+
+#. Comment
+#: slave/mimetypes/class.desktop:2
+msgid "Class of Printers"
+msgstr ""
+
+#. Comment
+#: slave/mimetypes/driver.desktop:2
+msgid "Printer Driver"
+msgstr ""
+
+#. Comment
+#: slave/mimetypes/folder.desktop:2
+msgid "Print Folder"
+msgstr ""
+
+#. Comment
+#. Name
+#: slave/mimetypes/manager.desktop:2 tdeprint_part/tdeprint_part.desktop:4
+msgid "Print Management Tool"
+msgstr ""
+
+#. Comment
+#: slave/mimetypes/printer.desktop:2
+msgid "Printer"
+msgstr ""
+
+#. Comment
+#: slave/mimetypes/printermodel.desktop:2
+msgid "Printer Model"
+msgstr ""
+
+#. Name
+#: tdeprintfax/tdeprintfax.desktop:2
+msgid "TDEPrintFax"
+msgstr ""
+
+#. GenericName
+#: tdeprintfax/tdeprintfax.desktop:4
+msgid "Fax Utility"
+msgstr ""
diff --git a/translations/desktop_files/tdeprint-desktops/ka.po b/translations/desktop_files/tdeprint-desktops/ka.po
index a44986c75..791d35aa6 100644
--- a/translations/desktop_files/tdeprint-desktops/ka.po
+++ b/translations/desktop_files/tdeprint-desktops/ka.po
@@ -1,42 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeprint-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
 msgid "KJobViewer"
-msgstr ""
+msgstr "KJobViewer"
 
 #. GenericName
 #. Comment
 #: kjobviewer/kjobviewer-autostart.desktop:9 kjobviewer/kjobviewer.desktop:10
 #: slave/mimetypes/jobs.desktop:2
 msgid "Print Jobs"
-msgstr "ბეჭდვის დ�ვ�ლებ�"
+msgstr "დ�ვ�ლებების ბეჭდვ�"
 
 #. Name
 #: kprinter/kprinter.desktop:9
 msgid "KPrinter"
-msgstr "პრინტერი"
+msgstr "KPrinter"
 
 #. GenericName
 #: kprinter/kprinter.desktop:11
 msgid "Printing Tool"
-msgstr "ს�ბეჭდი უტილიტ�"
+msgstr "ბეჭდვის პრ�გრ�მ�"
 
 #. Name
 #: printmgr/printers.desktop:12
@@ -51,12 +52,12 @@ msgstr "ბეჭდვის სისტემის კáƒ�ნფიგურá
 #. Keywords
 #: printmgr/printers.desktop:16
 msgid "print;printer;printing management;"
-msgstr ""
+msgstr "print;printer;printing management;ბეჭდვ�;პრინტერი;პრინტერის მ�რთვ�;"
 
 #. Comment
 #: slave/mimetypes/class.desktop:2
 msgid "Class of Printers"
-msgstr "პრინტერთ� კლ�სი"
+msgstr "პრინტერების კლ�სი"
 
 #. Comment
 #: slave/mimetypes/driver.desktop:2
@@ -66,13 +67,13 @@ msgstr "პრინტერის დრ�ივერი"
 #. Comment
 #: slave/mimetypes/folder.desktop:2
 msgid "Print Folder"
-msgstr "ს�ბეჭდი ს�ქ�ღ�ლდე"
+msgstr "ბეჭდვის ს�ქ�ღ�ლდე"
 
 #. Comment
 #. Name
 #: slave/mimetypes/manager.desktop:2 tdeprint_part/tdeprint_part.desktop:4
 msgid "Print Management Tool"
-msgstr "ბეჭდვის მ�რთვის ხელს�წყ�"
+msgstr "ბეჭდვის მ�რთვის პრ�გრ�მ�"
 
 #. Comment
 #: slave/mimetypes/printer.desktop:2
@@ -87,9 +88,9 @@ msgstr "პრინტერის მ�დელი"
 #. Name
 #: tdeprintfax/tdeprintfax.desktop:2
 msgid "TDEPrintFax"
-msgstr ""
+msgstr "TDEPrintFax"
 
 #. GenericName
 #: tdeprintfax/tdeprintfax.desktop:4
 msgid "Fax Utility"
-msgstr "ფ�ქსთ�ნ ს�მუშ�� უტილიტ�"
+msgstr "ფ�ქსის პრ�გრ�მ�"
diff --git a/translations/desktop_files/tdeprint-desktops/nl.po b/translations/desktop_files/tdeprint-desktops/nl.po
index 2249c4c3a..c56849713 100644
--- a/translations/desktop_files/tdeprint-desktops/nl.po
+++ b/translations/desktop_files/tdeprint-desktops/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\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-01-09 21:29+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdeprint-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
 msgid "KJobViewer"
-msgstr ""
+msgstr "KJobViewer"
 
 #. GenericName
 #. Comment
@@ -40,14 +41,13 @@ msgstr "Afdrukprogramma"
 
 #. Name
 #: printmgr/printers.desktop:12
-#, fuzzy
 msgid "Printers"
-msgstr "Kprinter"
+msgstr "Printers"
 
 #. Comment
 #: printmgr/printers.desktop:14
 msgid "Printing system configuration (printers, jobs, classes, ...)"
-msgstr "Configuratie van het afdruksysteem (printers, taken, klassen, ...)"
+msgstr "Stel het afdruksysteem in (printers, taken, klassen, etc.)"
 
 #. Keywords
 #: printmgr/printers.desktop:16
@@ -73,13 +73,12 @@ msgstr "Afdrukmap"
 #. Name
 #: slave/mimetypes/manager.desktop:2 tdeprint_part/tdeprint_part.desktop:4
 msgid "Print Management Tool"
-msgstr "Hulpprogramma voor printerbeheer"
+msgstr "Afdrukhulpprogramma"
 
 #. Comment
 #: slave/mimetypes/printer.desktop:2
-#, fuzzy
 msgid "Printer"
-msgstr "Kprinter"
+msgstr "Printer"
 
 #. Comment
 #: slave/mimetypes/printermodel.desktop:2
@@ -89,7 +88,7 @@ msgstr "Printermodel"
 #. Name
 #: tdeprintfax/tdeprintfax.desktop:2
 msgid "TDEPrintFax"
-msgstr ""
+msgstr "TDEPrintFax"
 
 #. GenericName
 #: tdeprintfax/tdeprintfax.desktop:4
diff --git a/translations/desktop_files/tdeprint-desktops/ru.po b/translations/desktop_files/tdeprint-desktops/ru.po
index 60c2e3ae1..9817e3394 100644
--- a/translations/desktop_files/tdeprint-desktops/ru.po
+++ b/translations/desktop_files/tdeprint-desktops/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:17+0000\n"
-"PO-Revision-Date: 2022-02-14 23:01+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/tdeprint-desktop-files/ru/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
@@ -53,7 +53,7 @@ msgstr "�а�тройки �и�темы печати (принтеры, зад
 #. Keywords
 #: printmgr/printers.desktop:16
 msgid "print;printer;printing management;"
-msgstr ""
+msgstr "печать;принтер;управление печатью;"
 
 #. Comment
 #: slave/mimetypes/class.desktop:2
@@ -89,7 +89,7 @@ msgstr "Модель принтера"
 #. Name
 #: tdeprintfax/tdeprintfax.desktop:2
 msgid "TDEPrintFax"
-msgstr ""
+msgstr "TDEPrintFax"
 
 #. GenericName
 #: tdeprintfax/tdeprintfax.desktop:4
diff --git a/translations/desktop_files/tdescreensaver-desktops/es_AR.po b/translations/desktop_files/tdescreensaver-desktops/es_AR.po
new file mode 100644
index 000000000..bbac60709
--- /dev/null
+++ b/translations/desktop_files/tdescreensaver-desktops/es_AR.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 20:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: KBlankscreen.desktop:8
+msgid "Blank Screen"
+msgstr ""
+
+#. Name
+#: KBlankscreen.desktop:12 KRandom.desktop:12
+msgid "Setup..."
+msgstr ""
+
+#. Name
+#: KBlankscreen.desktop:17 KRandom.desktop:17
+msgid "Display in Specified Window"
+msgstr ""
+
+#. Name
+#: KBlankscreen.desktop:22 KRandom.desktop:22
+msgid "Display in Root Window"
+msgstr ""
+
+#. Name
+#: KRandom.desktop:8
+msgid "Random"
+msgstr ""
diff --git a/translations/desktop_files/tdescreensaver-desktops/nl.po b/translations/desktop_files/tdescreensaver-desktops/nl.po
index fc6966d4d..9e58bd5fe 100644
--- a/translations/desktop_files/tdescreensaver-desktops/nl.po
+++ b/translations/desktop_files/tdescreensaver-desktops/nl.po
@@ -1,40 +1,41 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:36+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-01-09 21:29+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdescreensaver-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: KBlankscreen.desktop:8
 msgid "Blank Screen"
-msgstr "Leeg scherm"
+msgstr "Zwart scherm"
 
 #. Name
 #: KBlankscreen.desktop:12 KRandom.desktop:12
 msgid "Setup..."
-msgstr "Instellingen..."
+msgstr "Instellingen…"
 
 #. Name
 #: KBlankscreen.desktop:17 KRandom.desktop:17
 msgid "Display in Specified Window"
-msgstr "In een gedefinieerd venster weergeven"
+msgstr "Tonen in opgegeven venster"
 
 #. Name
 #: KBlankscreen.desktop:22 KRandom.desktop:22
 msgid "Display in Root Window"
-msgstr "In hoofdvenster weergeven"
+msgstr "Tonen in hoofdvenster"
 
 #. Name
 #: KRandom.desktop:8
diff --git a/translations/desktop_files/tdm-sessions/de.po b/translations/desktop_files/tdm-sessions/de.po
index b54caf96d..5f4b68c4c 100644
--- a/translations/desktop_files/tdm-sessions/de.po
+++ b/translations/desktop_files/tdm-sessions/de.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Etienne Ruedin <ruedin@gmx.net>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:47+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: 2024-08-11 04:10+0000\n"
+"Last-Translator: Etienne Ruedin <ruedin@gmx.net>\n"
+"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-sessions/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: tde.desktop.cmake:7
@@ -38,7 +39,7 @@ msgstr ""
 #. Comment
 #: 9wm.desktop:8
 msgid "An emulation of the Plan 9 window manager 8-1/2"
-msgstr "Emulation des Plan 9-Fenstermanagers 8-1/2"
+msgstr "Emulation der Plan 9-Fensterverwaltung 8-1/2"
 
 #. Name
 #: admin.desktop:7
@@ -61,8 +62,8 @@ msgid ""
 "A minimal window manager based on AEWM, enhanced by virtual desktops and "
 "partial GNOME support"
 msgstr ""
-"Minimalistischer Fenstermanager. Beruht auf AEWM, verbessert durch virtuelle "
-"Arbeitsflächen und teilweise GNOME-Unterstützung "
+"Minimalistische Fensterverwaltung. Beruht auf AEWM, verbessert durch "
+"virtuelle Arbeitsflächen und teilweise GNOME-Unterstützung"
 
 #. Name
 #: aewm.desktop:6
@@ -72,7 +73,7 @@ msgstr ""
 #. Comment
 #: aewm.desktop:8
 msgid "A minimalist window manager"
-msgstr "Minimalistischer Fenstermanager"
+msgstr "Minimalistische Fensterverwaltung"
 
 #. Name
 #: afterstep.desktop:6
@@ -82,7 +83,7 @@ msgstr ""
 #. Comment
 #: afterstep.desktop:8
 msgid "A window manager with the NeXTStep look and feel, based on FVWM"
-msgstr "Fenstermanager mit der Optik von NeXTStep, basiert auf FVWM"
+msgstr "Fensterverwaltung mit der Optik von NeXTStep, basiert auf FVWM"
 
 #. Name
 #: amaterus.desktop:6
diff --git a/translations/desktop_files/tdm-sessions/es_AR.po b/translations/desktop_files/tdm-sessions/es_AR.po
new file mode 100644
index 000000000..f3d910a5a
--- /dev/null
+++ b/translations/desktop_files/tdm-sessions/es_AR.po
@@ -0,0 +1,566 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 20:47+0200\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/tdm-sessions/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: tde.desktop.cmake:7
+#, fuzzy
+msgid "TDE"
+msgstr "TDE"
+
+#. Comment
+#: tde.desktop.cmake:8
+msgid ""
+"The Trinity Desktop Environment. A powerful Open Source graphical desktop "
+"environment"
+msgstr ""
+"El Entorno de Escritorio Trinity, un potente entorno de escritorio gráfico "
+"realizado de código abierto"
+
+#. Name
+#: 9wm.desktop:6
+msgid "9WM"
+msgstr "9WM"
+
+#. Comment
+#: 9wm.desktop:8
+msgid "An emulation of the Plan 9 window manager 8-1/2"
+msgstr "Una emulación del gestor de ventanas Plan 9 8-1/2"
+
+#. Name
+#: admin.desktop:7
+msgid "admin"
+msgstr "admin"
+
+#. Comment
+#: admin.desktop:9
+msgid "Yast Admin Session"
+msgstr "Sesión de Admin Yast"
+
+#. Name
+#: aewm++.desktop:6
+msgid "AEWM++"
+msgstr "AEWM++"
+
+#. Comment
+#: aewm++.desktop:8
+msgid ""
+"A minimal window manager based on AEWM, enhanced by virtual desktops and "
+"partial GNOME support"
+msgstr ""
+"Un gestor de ventanas minimalista basado en AEWM, mejorado con soporte para "
+"escritorios virtailes y, parcialmente, GNOME"
+
+#. Name
+#: aewm.desktop:6
+msgid "AEWM"
+msgstr "AEWM"
+
+#. Comment
+#: aewm.desktop:8
+msgid "A minimalist window manager"
+msgstr "Un gestor de ventanas minimalista"
+
+#. Name
+#: afterstep.desktop:6
+msgid "AfterStep"
+msgstr "AfterStep"
+
+#. Comment
+#: afterstep.desktop:8
+msgid "A window manager with the NeXTStep look and feel, based on FVWM"
+msgstr "Un gestor de ventanas con el aspecto de NeXTStep, basado en FVWM"
+
+#. Name
+#: amaterus.desktop:6
+msgid "AMATERUS"
+msgstr "AMATERUS"
+
+#. Comment
+#: amaterus.desktop:8
+msgid "A GTK+ based window manager with a window grouping feature"
+msgstr ""
+"Un gestor de ventanas basado en GTK+ con la posibilidad de agrupar ventanas"
+
+#. Name
+#: amiwm.desktop:6
+msgid "AmiWM"
+msgstr "AmiWM"
+
+#. Comment
+#: amiwm.desktop:8
+msgid "The Amiga look-alike window manager"
+msgstr "Un gestor de ventanas con el aspecto de Amiga"
+
+#. Name
+#: asclassic.desktop:6
+msgid "ASClassic"
+msgstr "ASClassic"
+
+#. Comment
+#: asclassic.desktop:8
+msgid "AfterStep Classic, a window manager based on AfterStep v1.1"
+msgstr "AfterStep Classic, un gestor de ventanas basado en AfterStep v1.1"
+
+#. Name
+#: blackbox.desktop:6
+msgid "Blackbox"
+msgstr "Blackbox"
+
+#. Comment
+#: blackbox.desktop:8
+msgid "A fast & light window manager"
+msgstr "Un gestor de ventanas rápido y ligero"
+
+#. Name
+#: cde.desktop:6
+msgid "CDE"
+msgstr "CDE"
+
+#. Comment
+#: cde.desktop:8
+msgid ""
+"The Common Desktop Environment, a proprietary industry standard desktop "
+"environment"
+msgstr ""
+"El Common Desktop Environment, un estándar en los entornos de escritorio "
+"propietarios"
+
+#. Name
+#: ctwm.desktop:6
+msgid "CTWM"
+msgstr "CTWM"
+
+#. Comment
+#: ctwm.desktop:8
+msgid "Claude's Tab Window Manager, TWM enhanced by virtual screens, etc."
+msgstr "Claude's Tab Window Manager, TWM mejorado con pantallas virtuales, etc."
+
+#. Name
+#: cwwm.desktop:6
+msgid "CWWM"
+msgstr "CWWM"
+
+#. Comment
+#: cwwm.desktop:8
+msgid "The ChezWam Window Manager, a minimalist window manager based on EvilWM"
+msgstr "El gestor de ventanas ChezWam, un gestor minimalista basado en EvilWM"
+
+#. Name
+#: enlightenment.desktop:6
+msgid "Enlightenment"
+msgstr "Enlightenment"
+
+#. Comment
+#: enlightenment.desktop:8
+msgid "An extremely themable very feature-rich window manager"
+msgstr ""
+"Un gestor de ventanas lleno de características y extremadamente "
+"personalizable"
+
+#. Name
+#: evilwm.desktop:6
+msgid "EvilWM"
+msgstr "EvilWM"
+
+#. Comment
+#: evilwm.desktop:8
+msgid "A minimalist window manager based on AEWM"
+msgstr "Un administrado de ventanas minimalista basado en AEWM"
+
+#. Name
+#: fluxbox.desktop:6
+msgid "Fluxbox"
+msgstr "Fluxbox"
+
+#. Comment
+#: fluxbox.desktop:8
+msgid "A highly configurable and low resource window manager based on Blackbox"
+msgstr ""
+"Un gestor de ventanas basado en Blackbox muy configurable y con poco consumo "
+"de recursos"
+
+#. Name
+#: flwm.desktop:6
+msgid "FLWM"
+msgstr "FLWM"
+
+#. Comment
+#: flwm.desktop:8
+msgid "The Fast Light Window Manager, based primarily on WM2"
+msgstr "El Fast Light Window Manager, basado principalmente en WM2"
+
+#. Name
+#: fvwm.desktop:6
+msgid "FVWM"
+msgstr "FVWM"
+
+#. Comment
+#: fvwm.desktop:8 fvwm2.desktop:8
+msgid "A powerful ICCCM-compliant multiple virtual desktop window manager"
+msgstr ""
+"Un potente gestor de ventanas, compatible con ICCCM y que soporta varios "
+"escritorios virtuales"
+
+#. Name
+#: fvwm2.desktop:6
+msgid "FVWM2"
+msgstr "FVWM2"
+
+#. Name
+#: fvwm95.desktop:6
+msgid "FVWM95"
+msgstr "FVWM95"
+
+#. Comment
+#: fvwm95.desktop:8
+msgid "A Windows 95 look-alike derivative of FVWM"
+msgstr "Un derivado de FVWM de aspecto similar a Win95"
+
+#. Name
+#: gnome.desktop:6
+msgid "GNOME"
+msgstr "GNOME"
+
+#. Comment
+#: gnome.desktop:8
+msgid ""
+"The GNU Network Object Model Environment. A complete, free and easy-to-use "
+"desktop environment"
+msgstr ""
+"El GNU Network Object Model Environment, un entorno de escritorio completo, "
+"libre y enfocado en el minimalismo"
+
+#. Name
+#: golem.desktop:6
+msgid "Golem"
+msgstr "Golem"
+
+#. Comment
+#: golem.desktop:8
+msgid "A lightweight window manager"
+msgstr "Un gestor de ventanas ligero"
+
+#. Name
+#: icewm.desktop:6
+msgid "IceWM"
+msgstr "IceWM"
+
+#. Comment
+#: icewm.desktop:8
+msgid "A Windows 95-OS/2-Motif-like window manager"
+msgstr "Un gestor de ventanas similar a Win95-OS/2-Motif"
+
+#. Name
+#: ion.desktop:6
+msgid "Ion"
+msgstr "Ion"
+
+#. Comment
+#: ion.desktop:8
+msgid "A keyboard-friendly window manager with tiled windows, based on PWM"
+msgstr ""
+"Un gestor de ventanas utilizable desde el teclado con mosaico de ventanas, "
+"basado en PWM"
+
+#. Name
+#: kde-plasma-safe.desktop:7
+msgid "KDE Plasma Workspace (failsafe session)"
+msgstr "Espacio de trabajo Plasma de KDE (sesión a prueba de fallos)"
+
+#. Comment
+#: kde-plasma-safe.desktop:9
+msgid "The desktop made by KDE (failsafe session)"
+msgstr "El escritorio diseñado por KDE (sesión a prueba de fallos)"
+
+#. Name
+#: kde-plasma.desktop:7
+msgid "KDE Plasma Workspace"
+msgstr "Espacio de trabajo Plasma de KDE"
+
+#. Comment
+#: kde-plasma.desktop:9
+msgid "The desktop made by KDE"
+msgstr "El escritorio diseñado por KDE"
+
+#. Name
+#: larswm.desktop:6
+msgid "LarsWM"
+msgstr "LarsWM"
+
+#. Comment
+#: larswm.desktop:8
+msgid "The Lars Window Manager, based on 9WM, supports tiled windows"
+msgstr "El Lars Window Manager, basado en 9WM, soporta mosaico de ventanas"
+
+#. Name
+#: lwm.desktop:6
+msgid "LWM"
+msgstr "LWM"
+
+#. Comment
+#: lwm.desktop:8
+msgid "The Lightweight Window Manager. A non-configurable, bare window manager"
+msgstr ""
+"El Lightweight Window Manager, un sencillísimo y no configurable gestor de "
+"ventanas"
+
+#. Name
+#: matchbox.desktop:6
+msgid "Matchbox"
+msgstr "Matchbox"
+
+#. Comment
+#: matchbox.desktop:8
+msgid "A window manager for handheld devices"
+msgstr "Un gestor de ventanas para dispositivos de mano"
+
+#. Name
+#: metacity.desktop:6
+msgid "Metacity"
+msgstr "Metacity"
+
+#. Comment
+#: metacity.desktop:8
+msgid "A lightweight GTK2 based window manager"
+msgstr "Un gestor de ventanas ligero basado en GTK2"
+
+#. Name
+#: mwm.desktop:6
+msgid "MWM"
+msgstr "MWM"
+
+#. Comment
+#: mwm.desktop:8
+msgid "The Motif Window Manager"
+msgstr "El gestor de ventanas de Motif"
+
+#. Name
+#: olvwm.desktop:6
+msgid "OLVWM"
+msgstr "OLVWM"
+
+#. Comment
+#: olvwm.desktop:8
+msgid ""
+"The OpenLook Virtual Window Manager. OLWM enhanced for handling of virtual "
+"desktops"
+msgstr ""
+"El OpenLook Virtual Window Manager, un versión mejorada de OLWM con soporte "
+"para escritorios virtuales"
+
+#. Name
+#: olwm.desktop:6
+msgid "OLWM"
+msgstr "OLWM"
+
+#. Comment
+#: olwm.desktop:8
+msgid "The traditional Open Look Window Manager"
+msgstr "El tradicional Open Look Window Manager"
+
+#. Name
+#: openbox.desktop:6
+msgid "Openbox"
+msgstr "Openbox"
+
+#. Comment
+#: openbox.desktop:8
+msgid "A lightweight window manager based on Blackbox"
+msgstr "Un gestor de ventanas ligero basado en BlackBox"
+
+#. Name
+#: oroborus.desktop:6
+msgid "Oroborus"
+msgstr "Oroborus"
+
+#. Comment
+#: oroborus.desktop:8
+msgid "A lightweight themeable window manager"
+msgstr "Un gestor de ventanas ligero con temas"
+
+#. Name
+#: phluid.desktop:6
+msgid "Phluid"
+msgstr "Phluid"
+
+#. Comment
+#: phluid.desktop:8
+msgid "An Imlib2 based window manager"
+msgstr "Un gestor de ventanas basado en Imlib2"
+
+#. Name
+#: pwm.desktop:6
+msgid "PWM"
+msgstr "PWM"
+
+#. Comment
+#: pwm.desktop:8
+msgid ""
+"A lightweight window manager able to attach multiple windows to one frame"
+msgstr ""
+"Un gestor de ventanas ligero capaz de conectar varias ventanas a un mismo "
+"marco"
+
+#. Name
+#: qvwm.desktop:6
+msgid "QVWM"
+msgstr "QVWM"
+
+#. Comment
+#: qvwm.desktop:8
+msgid "A Windows 95 like window manager"
+msgstr "Un gestor de ventanas similar a Windows 95"
+
+#. Name
+#: ratpoison.desktop:6
+msgid "Ratpoison"
+msgstr "Ratpoison"
+
+#. Comment
+#: ratpoison.desktop:8
+msgid "A simple keyboard-only window manager modeled after Screen"
+msgstr "Un gestor de ventanas sólo para teclado realizado a partir de Screen"
+
+#. Name
+#: sapphire.desktop:6
+msgid "Sapphire"
+msgstr "Sapphire"
+
+#. Comment
+#: sapphire.desktop:8
+msgid "A minimal but configurable window manager"
+msgstr "Un gestor de ventanas minimalista pero configurable"
+
+#. Name
+#: sawfish.desktop:6
+msgid "Sawfish"
+msgstr "Sawfish"
+
+#. Comment
+#: sawfish.desktop:8
+msgid ""
+"An extensible window manager scriptable with an Emacs Lisp-like language"
+msgstr ""
+"Un gestor de ventanas extensible con guiones escritos en un lenguaje similar "
+"a Lisp de Emacs"
+
+#. Name
+#: twm.desktop:6
+msgid "TWM"
+msgstr "TWM"
+
+#. Comment
+#: twm.desktop:8
+msgid "The Tab Window Manager"
+msgstr "El Tab Window Manager"
+
+#. Name
+#: ude.desktop:6
+msgid "UDE"
+msgstr "UDE"
+
+#. Comment
+#: ude.desktop:8
+msgid "The UNIX Desktop Environment"
+msgstr "El UNIX Desktop Environment"
+
+#. Name
+#: vtwm.desktop:6
+msgid "VTWM"
+msgstr "VTWM"
+
+#. Comment
+#: vtwm.desktop:8
+msgid "The Virtual Tab Window Manager. TWM enhanced by virtual screens, etc."
+msgstr ""
+"El Virtual Tab Window Manager, TWM mejorado con pantallas virtuales, etc."
+
+#. Name
+#: w9wm.desktop:6
+msgid "W9WM"
+msgstr "W9WM"
+
+#. Comment
+#: w9wm.desktop:8
+msgid ""
+"A window manager based on 9WM, enhanced by virtual screens and keyboard "
+"bindings"
+msgstr ""
+"Un gestor de ventanas basado en 9WM, mejorado con ventanas virtuales y "
+"accesos rápidos de teclado"
+
+#. Name
+#: waimea.desktop:6
+msgid "Waimea"
+msgstr "Waimea"
+
+#. Comment
+#: waimea.desktop:8
+msgid "A highly customizable window manager based on Blackbox"
+msgstr "Un gestor de ventanas muy personalizable basado en Blackbox"
+
+#. Name
+#: wm2.desktop:6
+msgid "WM2"
+msgstr "WM2"
+
+#. Comment
+#: wm2.desktop:8
+msgid "A small, non-configurable window manager"
+msgstr "Un gestor de ventanas pequeño y no configurable"
+
+#. Name
+#: wmaker.desktop:6
+msgid "WindowMaker"
+msgstr "WindowMaker"
+
+#. Comment
+#: wmaker.desktop:8
+msgid "A simple window manager that resembles the NeXTStep look very closely"
+msgstr ""
+"Un gestor de ventanas sencillo cuyo aspecto se parece mucho al de NeXTStep"
+
+#. Name
+#: xfce.desktop:6
+msgid "XFce"
+msgstr "XFce"
+
+#. Comment
+#: xfce.desktop:8
+msgid ""
+"The Cholesterol Free Desktop Environment. A desktop environment reminiscent "
+"of CDE"
+msgstr ""
+"El Cholesterol Free Desktop Environment, un entorno de escritorio que "
+"recuerda a CDE"
+
+#. Name
+#: xfce4.desktop:6
+msgid "XFce 4"
+msgstr "XFce 4"
+
+#. Comment
+#: xfce4.desktop:8
+msgid ""
+"The Cholesterol Free Desktop Environment, version 4. A desktop environment "
+"reminiscent of CDE"
+msgstr ""
+"El Cholesterol Free Desktop Environment, versión 4. Un entorno de escritorio "
+"que recuerda a CDE"
diff --git a/translations/desktop_files/tdm-sessions/ka.po b/translations/desktop_files/tdm-sessions/ka.po
index 550cf6a7b..c037577a9 100644
--- a/translations/desktop_files/tdm-sessions/ka.po
+++ b/translations/desktop_files/tdm-sessions/ka.po
@@ -1,59 +1,59 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:47+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: 2024-12-07 03:11+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-sessions/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: tde.desktop.cmake:7
 msgid "TDE"
-msgstr ""
+msgstr "TDE"
 
 #. Comment
 #: tde.desktop.cmake:8
-#, fuzzy
 msgid ""
 "The Trinity Desktop Environment. A powerful Open Source graphical desktop "
 "environment"
 msgstr ""
-"Common Desktop Environment, UNIX -ის ს�მუშ�� სფერ�ს ს�მრეწვლ� სტ�ნდ�რტი"
+"ს�მუშ�� გ�რემ� Trinity. მძლ�ვრი ღი� კ�დის მქ�ნე გრ�ფიკული ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: 9wm.desktop:6
 msgid "9WM"
-msgstr ""
+msgstr "9WM"
 
 #. Comment
 #: 9wm.desktop:8
 msgid "An emulation of the Plan 9 window manager 8-1/2"
-msgstr "Plan 9 ფ�ნჯრის მმ�რთველის ემულ�ტ�რი"
+msgstr "Plan 9 ფ�ნჯრის მმ�რთველის ემულ�ტ�რი 8-1/2"
 
 #. Name
 #: admin.desktop:7
 msgid "admin"
-msgstr ""
+msgstr "�დმინი"
 
 #. Comment
 #: admin.desktop:9
 msgid "Yast Admin Session"
-msgstr ""
+msgstr "Yast-ის �დმინის სესი�"
 
 #. Name
 #: aewm++.desktop:6
 msgid "AEWM++"
-msgstr ""
+msgstr "AEWM++"
 
 #. Comment
 #: aewm++.desktop:8
@@ -61,33 +61,33 @@ msgid ""
 "A minimal window manager based on AEWM, enhanced by virtual desktops and "
 "partial GNOME support"
 msgstr ""
-"მინიმ�ლური ფ�ნჯრის მენეჯერი AEWM -ის ბ�ზ�ზე, имеющий ча�тичную поддержку "
-"GNOME."
+"მინიმ�ლისტური ფ�ნჯრების მმ�რთველი, დ�ფუძნებული AEWM-ზე, გ�ფ�რთ�ებული "
+"ვირტუ�ლური ს�მუშ�� მ�გიდების� დ� ნ�წილ�ბრივი GNOME-ის მხ�რდ�ჭერით"
 
 #. Name
 #: aewm.desktop:6
 msgid "AEWM"
-msgstr ""
+msgstr "AEWM"
 
 #. Comment
 #: aewm.desktop:8
 msgid "A minimalist window manager"
-msgstr "მინიმ�ლისტური ფ�ნჯრების მნეჯერი"
+msgstr "მინიმ�ლისტური ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: afterstep.desktop:6
 msgid "AfterStep"
-msgstr ""
+msgstr "AfterStep"
 
 #. Comment
 #: afterstep.desktop:8
 msgid "A window manager with the NeXTStep look and feel, based on FVWM"
-msgstr "ფ�ნჯრის მენეჯერი FVWM -ის ბ�ზ�ზე, რ�მელიც NeXTStep-ს ჰგ�ვს"
+msgstr "ფ�ნჯრის მენეჯერი FVWM ის ბ�ზ�ზე, რ�მელიც NeXTStep-ს ჰგ�ვს"
 
 #. Name
 #: amaterus.desktop:6
 msgid "AMATERUS"
-msgstr ""
+msgstr "AMATERUS"
 
 #. Comment
 #: amaterus.desktop:8
@@ -97,17 +97,17 @@ msgstr "ფáƒ�ნჯრის მენეჯერი GTK+ ს ბáƒ�ზáƒ�ზá
 #. Name
 #: amiwm.desktop:6
 msgid "AmiWM"
-msgstr ""
+msgstr "AmiWM"
 
 #. Comment
 #: amiwm.desktop:8
 msgid "The Amiga look-alike window manager"
-msgstr "ფ�ნჯრის მენეჯერი Amiga-ს სტილში"
+msgstr "ფ�ნჯრის მენეჯერი Amiga-ის სტილში"
 
 #. Name
 #: asclassic.desktop:6
 msgid "ASClassic"
-msgstr ""
+msgstr "ASClassic"
 
 #. Comment
 #: asclassic.desktop:8
@@ -117,17 +117,17 @@ msgstr "AfterStep Classic, ფ�ნჯრის მენეჯერი AfterS
 #. Name
 #: blackbox.desktop:6
 msgid "Blackbox"
-msgstr ""
+msgstr "Blackbox"
 
 #. Comment
 #: blackbox.desktop:8
 msgid "A fast & light window manager"
-msgstr "სწრ�ფი დ� მსუბუქი ფ�ნჯრის მენეჯერი"
+msgstr "სწრ�ფი დ� მსუბუქი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: cde.desktop:6
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Comment
 #: cde.desktop:8
@@ -135,22 +135,22 @@ msgid ""
 "The Common Desktop Environment, a proprietary industry standard desktop "
 "environment"
 msgstr ""
-"Common Desktop Environment, UNIX -ის ს�მუშ�� სფერ�ს ს�მრეწვლ� სტ�ნდ�რტი"
+"Common Desktop Environment, UNIX -ის ს�მუშ�� სფერ�ს ს�მრეწველ� სტ�ნდ�რტი"
 
 #. Name
 #: ctwm.desktop:6
 msgid "CTWM"
-msgstr ""
+msgstr "CTWM"
 
 #. Comment
 #: ctwm.desktop:8
 msgid "Claude's Tab Window Manager, TWM enhanced by virtual screens, etc."
-msgstr "Claude's Tab Window Manager - TWM-ის გ�უმჯ�ბესებული ვერსი�"
+msgstr "Claude's Tab Window Manager - TWM-ის გ�უმჯ�ბესებული ვერსი�."
 
 #. Name
 #: cwwm.desktop:6
 msgid "CWWM"
-msgstr ""
+msgstr "CWWM"
 
 #. Comment
 #: cwwm.desktop:8
@@ -161,7 +161,7 @@ msgstr ""
 #. Name
 #: enlightenment.desktop:6
 msgid "Enlightenment"
-msgstr ""
+msgstr "Enlightenment"
 
 #. Comment
 #: enlightenment.desktop:8
@@ -171,7 +171,7 @@ msgstr "მრáƒ�ვáƒ�ლფუნქციური ფáƒ�ნჯრის მá
 #. Name
 #: evilwm.desktop:6
 msgid "EvilWM"
-msgstr ""
+msgstr "EvilWM"
 
 #. Comment
 #: evilwm.desktop:8
@@ -181,17 +181,19 @@ msgstr "მინიმáƒ�ლისტური ფáƒ�ნჯრის მენá
 #. Name
 #: fluxbox.desktop:6
 msgid "Fluxbox"
-msgstr ""
+msgstr "Fluxbox"
 
 #. Comment
 #: fluxbox.desktop:8
 msgid "A highly configurable and low resource window manager based on Blackbox"
-msgstr "კ�ნფიგურირებ�დი ფ�ნჯრის მენეჯერი Blackbox -ის ბ�ზ�ზე"
+msgstr ""
+"მ�რგებ�დი დ� ნ�კლები რესურსების მხ�რჯველი ფ�ნჯრის მენეჯერი Blackbox -ის "
+"ბ�ზ�ზე"
 
 #. Name
 #: flwm.desktop:6
 msgid "FLWM"
-msgstr ""
+msgstr "FLWM"
 
 #. Comment
 #: flwm.desktop:8
@@ -201,23 +203,24 @@ msgstr "სწრ�ფი დ� მსუბუქი ფ�ნჯრები
 #. Name
 #: fvwm.desktop:6
 msgid "FVWM"
-msgstr ""
+msgstr "FVWM"
 
 #. Comment
 #: fvwm.desktop:8 fvwm2.desktop:8
 msgid "A powerful ICCCM-compliant multiple virtual desktop window manager"
 msgstr ""
-"ძლიერი ICCCM-თ�ვსებ�დი ვირტულური ს�მუშ�� დ�ფების მხ�რდ�მჭერი ფ�ნჯრის მენეჯერი"
+"მძლ�ვრი ICCCM-თ�ვსებ�დი ვირტუ�ლური ს�მუშ�� დ�ფების მხ�რდ�მჭერი ფ�ნჯრის "
+"მენეჯერი"
 
 #. Name
 #: fvwm2.desktop:6
 msgid "FVWM2"
-msgstr ""
+msgstr "FVWM2"
 
 #. Name
 #: fvwm95.desktop:6
 msgid "FVWM95"
-msgstr ""
+msgstr "FVWM95"
 
 #. Comment
 #: fvwm95.desktop:8
@@ -227,7 +230,7 @@ msgstr "FVWM კლ�ნი Windows 95-ის სტილში"
 #. Name
 #: gnome.desktop:6
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #. Comment
 #: gnome.desktop:8
@@ -241,108 +244,109 @@ msgstr ""
 #. Name
 #: golem.desktop:6
 msgid "Golem"
-msgstr ""
+msgstr "Golem"
 
 #. Comment
 #: golem.desktop:8
 msgid "A lightweight window manager"
-msgstr "მსუბუქი ფ�ნჯრი მენეჯერი"
+msgstr "მსუბუქი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: icewm.desktop:6
 msgid "IceWM"
-msgstr ""
+msgstr "IceWM"
 
 #. Comment
 #: icewm.desktop:8
 msgid "A Windows 95-OS/2-Motif-like window manager"
-msgstr "ფ�ნჯრების მენეჯერი Windows95-OS/2-Motif სტილში"
+msgstr "ფ�ნჯრების მმ�რთველი Windows95-OS/2-Motif-ის სტილში"
 
 #. Name
 #: ion.desktop:6
 msgid "Ion"
-msgstr ""
+msgstr "Ion"
 
 #. Comment
 #: ion.desktop:8
 msgid "A keyboard-friendly window manager with tiled windows, based on PWM"
-msgstr "კლ�ვი�ტურით მ�რთვ�დი ფ�ნჯრების მენეჯერი, PWM-ის ბ�ზ�ზე"
+msgstr "კლ�ვი�ტურით მ�რთვ�დი ფ�ნჯრების მმ�რთველი, PWM-ის ბ�ზ�ზე"
 
 #. Name
 #: kde-plasma-safe.desktop:7
 msgid "KDE Plasma Workspace (failsafe session)"
-msgstr ""
+msgstr "KDE Plasma Workspace (უს�ფრთხ� სესი�)"
 
 #. Comment
 #: kde-plasma-safe.desktop:9
 msgid "The desktop made by KDE (failsafe session)"
-msgstr ""
+msgstr "ს�მუშ�� გ�რემ� KDE (უს�ფრთხ� სესი�)"
 
 #. Name
 #: kde-plasma.desktop:7
 msgid "KDE Plasma Workspace"
-msgstr ""
+msgstr "ს�მუშ�� სივრცე KDE Plasma"
 
 #. Comment
 #: kde-plasma.desktop:9
 msgid "The desktop made by KDE"
-msgstr ""
+msgstr "ს�მუშ�� მ�გიდ� KDE-სგ�ნ"
 
 #. Name
 #: larswm.desktop:6
 msgid "LarsWM"
-msgstr ""
+msgstr "LarsWM"
 
 #. Comment
 #: larswm.desktop:8
-#, fuzzy
 msgid "The Lars Window Manager, based on 9WM, supports tiled windows"
-msgstr "სწრ�ფი დ� მსუბუქი ფ�ნჯრების მენეჯერი WM2 -ის ბ�ზ�ზე"
+msgstr ""
+"ფ�ნჯრების მმ�რთველი Lars, დ�ფუძნებული 9WM-ზე. �ქვს ფ�ნჯრების მ�ზ�იკ�დ "
+"დ�ლ�გების ფუნქცი�"
 
 #. Name
 #: lwm.desktop:6
 msgid "LWM"
-msgstr ""
+msgstr "LWM"
 
 #. Comment
 #: lwm.desktop:8
 msgid "The Lightweight Window Manager. A non-configurable, bare window manager"
-msgstr "მსუბუქი �რ�კ�ნფიგურირებ�დი ფ�ნჯრების მენეჯერი"
+msgstr "მსუბუქი �რ�კ�ნფიგურირებ�დი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: matchbox.desktop:6
 msgid "Matchbox"
-msgstr ""
+msgstr "Matchbox"
 
 #. Comment
 #: matchbox.desktop:8
 msgid "A window manager for handheld devices"
-msgstr "ფ�ნჯრების მენეჯერი მ�ბილური მ�წყ�ბილ�ბებისთვის"
+msgstr "ფ�ნჯრების მმ�რთველი მ�ბილური მ�წყ�ბილ�ბებისთვის"
 
 #. Name
 #: metacity.desktop:6
 msgid "Metacity"
-msgstr ""
+msgstr "Metacity"
 
 #. Comment
 #: metacity.desktop:8
 msgid "A lightweight GTK2 based window manager"
-msgstr "GTK2-ს ბ�ზ�ზე მსუბუქი ფ�ნჯრის მენეჯერი"
+msgstr "მსუბუქი ფ�ნჯრები მმ�რთველი GTK2-ის ბ�ზ�ზე"
 
 #. Name
 #: mwm.desktop:6
 msgid "MWM"
-msgstr ""
+msgstr "MWM"
 
 #. Comment
 #: mwm.desktop:8
 msgid "The Motif Window Manager"
-msgstr "ფ�ნჯრის მენეჯერი Motif"
+msgstr "ფ�ნჯრების მმ�რთველი Motif"
 
 #. Name
 #: olvwm.desktop:6
 msgid "OLVWM"
-msgstr ""
+msgstr "OLVWM"
 
 #. Comment
 #: olvwm.desktop:8
@@ -355,110 +359,110 @@ msgstr ""
 #. Name
 #: olwm.desktop:6
 msgid "OLWM"
-msgstr ""
+msgstr "OLWM"
 
 #. Comment
 #: olwm.desktop:8
 msgid "The traditional Open Look Window Manager"
-msgstr "OpenLook სისტემის ტრ�დიციული ფ�ნჯრის მენეჯერი"
+msgstr "OpenLook სისტემის ტრ�დიციული ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: openbox.desktop:6
 msgid "Openbox"
-msgstr ""
+msgstr "Openbox"
 
 #. Comment
 #: openbox.desktop:8
 msgid "A lightweight window manager based on Blackbox"
-msgstr "Blackbox-ის ბ�ზ�ზე ფ�ნჯრი�ს მენეჯერი"
+msgstr "ფ�ნჯრების მმ�რთველი Blackbox-ის ბ�ზ�ზე"
 
 #. Name
 #: oroborus.desktop:6
 msgid "Oroborus"
-msgstr ""
+msgstr "Oroborus"
 
 #. Comment
 #: oroborus.desktop:8
 msgid "A lightweight themeable window manager"
-msgstr "მსუბუქი ფ�ნჯრის მენეჯერი თემების მხ�რდ�ჭერით"
+msgstr "მსუბუქი ფ�ნჯრების მმ�რთველი თემების მხ�რდ�ჭერით"
 
 #. Name
 #: phluid.desktop:6
 msgid "Phluid"
-msgstr ""
+msgstr "Phluid"
 
 #. Comment
 #: phluid.desktop:8
 msgid "An Imlib2 based window manager"
-msgstr "ფ�ნჯრის მენეჯერი imlib2 ის ბ�ზ�ზე"
+msgstr "ფ�ნჯრების მმ�რთველი imlib2 ის ბ�ზ�ზე"
 
 #. Name
 #: pwm.desktop:6
 msgid "PWM"
-msgstr ""
+msgstr "PWM"
 
 #. Comment
 #: pwm.desktop:8
 msgid ""
 "A lightweight window manager able to attach multiple windows to one frame"
 msgstr ""
-"მსუბუქი ფ�ნჯრის მენეჯერი, რ�მელს�ც შეუძლი� ბევრი ფ�ნჯრის ერთ ჩ�რჩ�ში ჩ�სმ�"
+"მსუბუქი ფ�ნჯრების მმ�რთველი, რ�მელს�ც ბევრი ფ�ნჯრის ერთ ჩ�რჩ�ში ჩ�სმ� შეუძლი�"
 
 #. Name
 #: qvwm.desktop:6
 msgid "QVWM"
-msgstr ""
+msgstr "QVWM"
 
 #. Comment
 #: qvwm.desktop:8
 msgid "A Windows 95 like window manager"
-msgstr "ფ�ნჯრის მენეჯერი Windows 95-ს სტილში"
+msgstr "ფ�ნჯრების მმ�რთველი Windows 95-ს სტილში"
 
 #. Name
 #: ratpoison.desktop:6
 msgid "Ratpoison"
-msgstr ""
+msgstr "Ratpoison"
 
 #. Comment
 #: ratpoison.desktop:8
 msgid "A simple keyboard-only window manager modeled after Screen"
-msgstr "მ�რტივი კლ�ი�ტურით მ�რთვ�დი ფ�ნჯრის მმ�რთველი"
+msgstr "მ�რტივი, კლ�ვი�ტურით მ�რთვ�დი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: sapphire.desktop:6
 msgid "Sapphire"
-msgstr "ს�ფირ�ნი"
+msgstr "Sapphire"
 
 #. Comment
 #: sapphire.desktop:8
 msgid "A minimal but configurable window manager"
-msgstr "მინიმ�ლური მ�გრ�მ კ�ნფიგურირებ�დი ფ�ნჯრის მენეჯერი"
+msgstr "მინიმ�ლური, მ�გრ�მ მ�რგებ�დი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: sawfish.desktop:6
 msgid "Sawfish"
-msgstr ""
+msgstr "Sawfish"
 
 #. Comment
 #: sawfish.desktop:8
 msgid ""
 "An extensible window manager scriptable with an Emacs Lisp-like language"
-msgstr "Lisp სკრიპტებით გ�ფ�თ�ვებ�დი Emacs ის მ�გვ�რი ფ�ნჯრის მენეჯერი"
+msgstr "Lisp სკრიპტებით გ�ფ�რთ�ებ�დი Emacs ის მ�გვ�რი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: twm.desktop:6
 msgid "TWM"
-msgstr ""
+msgstr "TWM"
 
 #. Comment
 #: twm.desktop:8
 msgid "The Tab Window Manager"
-msgstr "X11 სისტემის ტრ�დიციული ფ�ნჯრის მენეჯერი"
+msgstr "ჩ�ნ�რთები�ნი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: ude.desktop:6
 msgid "UDE"
-msgstr ""
+msgstr "UDE"
 
 #. Comment
 #: ude.desktop:8
@@ -468,17 +472,19 @@ msgstr "UNIX-ის ს�მუშ�� გ�რემ�"
 #. Name
 #: vtwm.desktop:6
 msgid "VTWM"
-msgstr ""
+msgstr "VTWM"
 
 #. Comment
 #: vtwm.desktop:8
 msgid "The Virtual Tab Window Manager. TWM enhanced by virtual screens, etc."
-msgstr "ვირტუ�ლური ეკრ�ნებით �ღჭურვილი TWM-ის ვ�რი�ნტი"
+msgstr ""
+"ვირტუ�ლური ეკრ�ნებით �ღჭურვილი TWM-ის გ�ფ�რთ�ებულ ვ�რი�ნტი ვირტუ�ლური "
+"ეკრ�ნების დ� �.შ. მხ�რდ�ჭერით."
 
 #. Name
 #: w9wm.desktop:6
 msgid "W9WM"
-msgstr ""
+msgstr "W9WM"
 
 #. Comment
 #: w9wm.desktop:8
@@ -486,44 +492,43 @@ msgid ""
 "A window manager based on 9WM, enhanced by virtual screens and keyboard "
 "bindings"
 msgstr ""
-"ფ�ნჯრის მენეჯერი 9wm-ს ბ�ზ�ზე, ვირტუ�ლური ეკრ�ნებით დ� კლ�ვი�ტურის "
-"შეს�ბ�მის�ბებით"
+"ფ�ნჯრების მმ�რთველი 9WM-ს ბ�ზ�ზე, ვირტუ�ლური ეკრ�ნებით დ� კლ�ვი�ტურის "
+"მ�ლს�ხმ�ბებით"
 
 #. Name
 #: waimea.desktop:6
 msgid "Waimea"
-msgstr ""
+msgstr "Waimea"
 
 #. Comment
 #: waimea.desktop:8
 msgid "A highly customizable window manager based on Blackbox"
-msgstr "კ�ნფიგურირებ�დი ფ�ნჯრის მენეჯერი Blackbox-ს ბ�ზ�ზე"
+msgstr "მ�რგებ�დი ფ�ნჯრების მმ�რთველი Blackbox-ს ბ�ზ�ზე"
 
 #. Name
 #: wm2.desktop:6
 msgid "WM2"
-msgstr ""
+msgstr "WM2"
 
 #. Comment
 #: wm2.desktop:8
 msgid "A small, non-configurable window manager"
-msgstr "პ�ტ�რ� დ� �რ�კ�ნფიგურირებ�დი ფ�ნჯრის მენეჯერი"
+msgstr "პ�ტ�რ� დ� �რ�მ�რგებ�დი ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: wmaker.desktop:6
-#, fuzzy
 msgid "WindowMaker"
-msgstr "X11 სისტემის ტრ�დიციული ფ�ნჯრის მენეჯერი"
+msgstr "WindowMaker"
 
 #. Comment
 #: wmaker.desktop:8
 msgid "A simple window manager that resembles the NeXTStep look very closely"
-msgstr "NeXTStep -ის მ�გვ�რი მ�რტივი ფ�ნჯრის მენეჯერი"
+msgstr "NeXTStep-ის მსგ�ვსი მ�რტივი ფ�ნჯრების მ�რთველი"
 
 #. Name
 #: xfce.desktop:6
 msgid "XFce"
-msgstr ""
+msgstr "XFce"
 
 #. Comment
 #: xfce.desktop:8
@@ -535,7 +540,7 @@ msgstr "CDE-ს მáƒ�გვáƒ�რი სáƒ�მუშáƒ�áƒ� დáƒ�ფáƒ� ქáƒ�á
 #. Name
 #: xfce4.desktop:6
 msgid "XFce 4"
-msgstr ""
+msgstr "XFce 4"
 
 #. Comment
 #: xfce4.desktop:8
diff --git a/translations/desktop_files/tdm-sessions/nl.po b/translations/desktop_files/tdm-sessions/nl.po
index 450b78291..98d4d1d21 100644
--- a/translations/desktop_files/tdm-sessions/nl.po
+++ b/translations/desktop_files/tdm-sessions/nl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Heimen Stoffels <vistausss@outlook.com>, 2022.
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:47+0200\n"
-"PO-Revision-Date: 2022-05-03 17:20+0000\n"
-"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"PO-Revision-Date: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
 "Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdebase/tdm-sessions/nl/>\n"
 "Language: nl\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.12.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: tde.desktop.cmake:7
@@ -28,8 +29,8 @@ msgid ""
 "The Trinity Desktop Environment. A powerful Open Source graphical desktop "
 "environment"
 msgstr ""
-"De Trinity Desktop Environment, een krachtige open source grafische desktop "
-"environment"
+"De Trinity Desktop Environment, een krachtige, opensource grafische "
+"werkomgeving"
 
 #. Name
 #: 9wm.desktop:6
@@ -39,7 +40,7 @@ msgstr "9WM"
 #. Comment
 #: 9wm.desktop:8
 msgid "An emulation of the Plan 9 window manager 8-1/2"
-msgstr "Een emulator voor de Plan9 windowmanager 8-1/2"
+msgstr "Een emulator voor de Plan9-vensterbeheerder 8-1/2"
 
 #. Name
 #: admin.desktop:7
@@ -62,8 +63,8 @@ msgid ""
 "A minimal window manager based on AEWM, enhanced by virtual desktops and "
 "partial GNOME support"
 msgstr ""
-"Een minimalistische windowmanager gebaseerd op AEWM, uitgebreid met virtuele "
-"bureaubladen en gedeeltelijke GNOME-ondersteuning"
+"Een minimalistische vensterbeheerder gebaseerd op AEWM, uitgebreid met "
+"virtuele werkbladen en gedeeltelijke GNOME-ondersteuning"
 
 #. Name
 #: aewm.desktop:6
@@ -73,7 +74,7 @@ msgstr "AEWM"
 #. Comment
 #: aewm.desktop:8
 msgid "A minimalist window manager"
-msgstr "Een minimalistische windowmanager"
+msgstr "Een minimalistische vensterbeheerder"
 
 #. Name
 #: afterstep.desktop:6
@@ -84,7 +85,8 @@ msgstr "AfterStep"
 #: afterstep.desktop:8
 msgid "A window manager with the NeXTStep look and feel, based on FVWM"
 msgstr ""
-"Een windowmanager met het uiterlijk en gedrag van NeXTStep; gebaseerd op FVWM"
+"Een vensterbeheerder met het uiterlijk en gedrag van NeXTStep; gebaseerd op "
+"FVWM"
 
 #. Name
 #: amaterus.desktop:6
@@ -94,43 +96,42 @@ msgstr "AMATERUS"
 #. Comment
 #: amaterus.desktop:8
 msgid "A GTK+ based window manager with a window grouping feature"
-msgstr ""
-"Een op GTK+ gebaseerde windowmanager met venstergroeperingfunctionaliteit"
+msgstr "Een op GTK+ gebaseerde vensterbeheerder met venstergroeperingsfuncties"
 
 #. Name
 #: amiwm.desktop:6
 msgid "AmiWM"
-msgstr ""
+msgstr "AmiWM"
 
 #. Comment
 #: amiwm.desktop:8
 msgid "The Amiga look-alike window manager"
-msgstr "Een Amiga-achtige windowmanager"
+msgstr "Een Amiga-achtige vensterbeheerder"
 
 #. Name
 #: asclassic.desktop:6
 msgid "ASClassic"
-msgstr ""
+msgstr "ASClassic"
 
 #. Comment
 #: asclassic.desktop:8
 msgid "AfterStep Classic, a window manager based on AfterStep v1.1"
-msgstr "AfterStep Classic, een windowmanager gebaseerd op AfterStep 1.1"
+msgstr "AfterStep Classic, een vensterbeheerder gebaseerd op AfterStep 1.1"
 
 #. Name
 #: blackbox.desktop:6
 msgid "Blackbox"
-msgstr ""
+msgstr "Blackbox"
 
 #. Comment
 #: blackbox.desktop:8
 msgid "A fast & light window manager"
-msgstr "Een snelle lichtgewicht windowmanager"
+msgstr "Een snelle, lichte vensterbeheerder"
 
 #. Name
 #: cde.desktop:6
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Comment
 #: cde.desktop:8
@@ -138,91 +139,93 @@ msgid ""
 "The Common Desktop Environment, a proprietary industry standard desktop "
 "environment"
 msgstr ""
-"The Common Desktop Environment, een commerciële industrieel gestandariseerde "
-"desktop environment"
+"De Common Desktop Environment, een commerciële, industrieel "
+"gestandaardiseerde werkomgeving"
 
 #. Name
 #: ctwm.desktop:6
 msgid "CTWM"
-msgstr ""
+msgstr "CTWM"
 
 #. Comment
 #: ctwm.desktop:8
 msgid "Claude's Tab Window Manager, TWM enhanced by virtual screens, etc."
-msgstr "Claude's Tab Window Manager, TWM uitgebreid met virtuele schermen etc."
+msgstr ""
+"Claude's Tab Window Manager - TWM uitgebreid met virtuele schermen en meer"
 
 #. Name
 #: cwwm.desktop:6
 msgid "CWWM"
-msgstr ""
+msgstr "CWWM"
 
 #. Comment
 #: cwwm.desktop:8
 msgid "The ChezWam Window Manager, a minimalist window manager based on EvilWM"
 msgstr ""
-"The ChezWam Window Manager, een minimalistische windowmanager gebaseerd op "
+"De ChezWam Window Manager, een minimalistische vensterbeheerder gebaseerd op "
 "EvilWM"
 
 #. Name
 #: enlightenment.desktop:6
 msgid "Enlightenment"
-msgstr ""
+msgstr "Enlightenment"
 
 #. Comment
 #: enlightenment.desktop:8
 msgid "An extremely themable very feature-rich window manager"
-msgstr "Een zeer rijke en configureerbare windowmanager"
+msgstr "Een zeer aanpasbare vensterbeheerder met vele instelmogelijkheden"
 
 #. Name
 #: evilwm.desktop:6
 msgid "EvilWM"
-msgstr ""
+msgstr "EvilWM"
 
 #. Comment
 #: evilwm.desktop:8
 msgid "A minimalist window manager based on AEWM"
-msgstr "Een minimalistische windowmanager gebaseerd op AEWM"
+msgstr "Een minimalistische vensterbeheerder gebaseerd op AEWM"
 
 #. Name
 #: fluxbox.desktop:6
 msgid "Fluxbox"
-msgstr ""
+msgstr "Fluxbox"
 
 #. Comment
 #: fluxbox.desktop:8
 msgid "A highly configurable and low resource window manager based on Blackbox"
-msgstr ""
-"Een zeer configureerbare lichtgewicht windowmanager gebaseerd op Blackbox."
+msgstr "Een zeer instelbare lichte vensterbeheerder gebaseerd op Blackbox"
 
 #. Name
 #: flwm.desktop:6
 msgid "FLWM"
-msgstr ""
+msgstr "FLWM"
 
 #. Comment
 #: flwm.desktop:8
 msgid "The Fast Light Window Manager, based primarily on WM2"
-msgstr "De Fast Light Window Manager, primair gebaseerd op WM2."
+msgstr "De Fast Light Window Manager, voornamelijk gebaseerd op WM2"
 
 #. Name
 #: fvwm.desktop:6
 msgid "FVWM"
-msgstr ""
+msgstr "FVWM"
 
 #. Comment
 #: fvwm.desktop:8 fvwm2.desktop:8
 msgid "A powerful ICCCM-compliant multiple virtual desktop window manager"
-msgstr "Een krachtige ICCCM-compliant windowmanager met meerdere bureaubladen"
+msgstr ""
+"Een krachtige met ICCCM overeenkomende vensterbeheerder met meerdere "
+"werkbladen"
 
 #. Name
 #: fvwm2.desktop:6
 msgid "FVWM2"
-msgstr ""
+msgstr "FVWM2"
 
 #. Name
 #: fvwm95.desktop:6
 msgid "FVWM95"
-msgstr ""
+msgstr "FVWM95"
 
 #. Comment
 #: fvwm95.desktop:8
@@ -232,7 +235,7 @@ msgstr "Een op Windows 95 lijkende variant van FVWM"
 #. Name
 #: gnome.desktop:6
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #. Comment
 #: gnome.desktop:8
@@ -240,50 +243,50 @@ msgid ""
 "The GNU Network Object Model Environment. A complete, free and easy-to-use "
 "desktop environment"
 msgstr ""
-"De GNU Network Object Model Environment, een complete, vrije en eenvoudig te "
-"gebruiken desktop environment."
+"De GNU Network Object Model Environment, een volledige, vrije en eenvoudig "
+"te gebruiken werkomgeving"
 
 #. Name
 #: golem.desktop:6
 msgid "Golem"
-msgstr ""
+msgstr "Golem"
 
 #. Comment
 #: golem.desktop:8
 msgid "A lightweight window manager"
-msgstr "Een lichtgewicht windowmanager"
+msgstr "Een lichte vensterbeheerder"
 
 #. Name
 #: icewm.desktop:6
 msgid "IceWM"
-msgstr ""
+msgstr "IceWM"
 
 #. Comment
 #: icewm.desktop:8
 msgid "A Windows 95-OS/2-Motif-like window manager"
-msgstr "Een Win95-OS/2-Motif-achtige windowmanager"
+msgstr "Een Win95-OS/2-Motif-achtige vensterbeheerder"
 
 #. Name
 #: ion.desktop:6
 msgid "Ion"
-msgstr ""
+msgstr "Ion"
 
 #. Comment
 #: ion.desktop:8
 msgid "A keyboard-friendly window manager with tiled windows, based on PWM"
 msgstr ""
-"Een toetsenbordvriendelijke windowmanager met getegelde vensters. Gebaseerd "
-"op PWM"
+"Een toetsenbordvriendelijke vensterbeheerder met getegelde vensters, "
+"gebaseerd op PWM"
 
 #. Name
 #: kde-plasma-safe.desktop:7
 msgid "KDE Plasma Workspace (failsafe session)"
-msgstr "KDE Plasma-werkruimte (sessie in veilige modus)"
+msgstr "KDE Plasma-werkruimte (veilige modus)"
 
 #. Comment
 #: kde-plasma-safe.desktop:9
 msgid "The desktop made by KDE (failsafe session)"
-msgstr "Het bureaublad gemaakt door KDE (sessie met veilig mislukken)"
+msgstr "De werkomgeving van KDE (veilige modus)"
 
 #. Name
 #: kde-plasma.desktop:7
@@ -293,54 +296,55 @@ msgstr "KDE Plasma-werkruimte"
 #. Comment
 #: kde-plasma.desktop:9
 msgid "The desktop made by KDE"
-msgstr "Het bureaublad gemaakt door KDE"
+msgstr "De werkomgeving van KDE"
 
 #. Name
 #: larswm.desktop:6
 msgid "LarsWM"
-msgstr ""
+msgstr "LarsWM"
 
 #. Comment
 #: larswm.desktop:8
 msgid "The Lars Window Manager, based on 9WM, supports tiled windows"
 msgstr ""
-"De Lars Window Manager, gebaseerd op 9WM. Biedt ondersteuning voor getegelde "
+"De Lars Window Manager, gebaseerd op 9WM, met ondersteuning voor getegelde "
 "vensters"
 
 #. Name
 #: lwm.desktop:6
 msgid "LWM"
-msgstr ""
+msgstr "LWM"
 
 #. Comment
 #: lwm.desktop:8
 msgid "The Lightweight Window Manager. A non-configurable, bare window manager"
-msgstr "De Lightweight Window Manager, een niet-instelbare, kale windowmanager"
+msgstr ""
+"De Lightweight Window Manager, een niet-instelbare, kale vensterbeheerder"
 
 #. Name
 #: matchbox.desktop:6
 msgid "Matchbox"
-msgstr ""
+msgstr "Matchbox"
 
 #. Comment
 #: matchbox.desktop:8
 msgid "A window manager for handheld devices"
-msgstr "Een windowmanager voor handcomputers"
+msgstr "Een vensterbeheerder voor handhelds"
 
 #. Name
 #: metacity.desktop:6
 msgid "Metacity"
-msgstr ""
+msgstr "Metacity"
 
 #. Comment
 #: metacity.desktop:8
 msgid "A lightweight GTK2 based window manager"
-msgstr "Een lichtgewicht op GTK2 gebaseerde windowmanager"
+msgstr "Een lichte, op GTK2 gebaseerde vensterbeheerder"
 
 #. Name
 #: mwm.desktop:6
 msgid "MWM"
-msgstr ""
+msgstr "MWM"
 
 #. Comment
 #: mwm.desktop:8
@@ -350,7 +354,7 @@ msgstr "De Motif Window Manager"
 #. Name
 #: olvwm.desktop:6
 msgid "OLVWM"
-msgstr ""
+msgstr "OLVWM"
 
 #. Comment
 #: olvwm.desktop:8
@@ -358,12 +362,12 @@ msgid ""
 "The OpenLook Virtual Window Manager. OLWM enhanced for handling of virtual "
 "desktops"
 msgstr ""
-"De OpenLook Virtual Window Manager. OLWM uitgebreid met virtuele bureaubladen"
+"De OpenLook Virtual Window Manager: OLWM uitgebreid met virtuele werkbladen"
 
 #. Name
 #: olwm.desktop:6
 msgid "OLWM"
-msgstr ""
+msgstr "OLWM"
 
 #. Comment
 #: olwm.desktop:8
@@ -373,94 +377,94 @@ msgstr "De traditionele Open Look Window Manager"
 #. Name
 #: openbox.desktop:6
 msgid "Openbox"
-msgstr ""
+msgstr "Openbox"
 
 #. Comment
 #: openbox.desktop:8
 msgid "A lightweight window manager based on Blackbox"
-msgstr "Een lichtgewicht windowmanager, gebaseerd op Blackbox"
+msgstr "Een lichte vensterbeheerder, gebaseerd op Blackbox"
 
 #. Name
 #: oroborus.desktop:6
 msgid "Oroborus"
-msgstr ""
+msgstr "Oroborus"
 
 #. Comment
 #: oroborus.desktop:8
 msgid "A lightweight themeable window manager"
-msgstr "Een lichtgewicht windowmanager met themabeheer"
+msgstr "Een lichte vensterbeheerder met themabeheer"
 
 #. Name
 #: phluid.desktop:6
 msgid "Phluid"
-msgstr ""
+msgstr "Phluid"
 
 #. Comment
 #: phluid.desktop:8
 msgid "An Imlib2 based window manager"
-msgstr "Een op imlib2 gebaseerde windowmanager"
+msgstr "Een op imlib2 gebaseerde vensterbeheerder"
 
 #. Name
 #: pwm.desktop:6
 msgid "PWM"
-msgstr ""
+msgstr "PWM"
 
 #. Comment
 #: pwm.desktop:8
 msgid ""
 "A lightweight window manager able to attach multiple windows to one frame"
 msgstr ""
-"Een lichtgewicht windowmanager, welke meerdere vensters kan verbinden met "
-"een frame"
+"Een lichte vensterbeheerder, welke meerdere vensters kan verbinden met een "
+"frame"
 
 #. Name
 #: qvwm.desktop:6
 msgid "QVWM"
-msgstr ""
+msgstr "QVWM"
 
 #. Comment
 #: qvwm.desktop:8
 msgid "A Windows 95 like window manager"
-msgstr "Een Win95-achtige windowmanager"
+msgstr "Een Windows 95-achtige vensterbeheerder"
 
 #. Name
 #: ratpoison.desktop:6
 msgid "Ratpoison"
-msgstr ""
+msgstr "Ratpoison"
 
 #. Comment
 #: ratpoison.desktop:8
 msgid "A simple keyboard-only window manager modeled after Screen"
 msgstr ""
-"Een eenvoudige windowmanager die alleen met het toetsenbord te bedienen is, "
-"geïnspireerd door Screen"
+"Een eenvoudige vensterbeheerder die alleen met het toetsenbord te bedienen "
+"is, geïnspireerd door Screen"
 
 #. Name
 #: sapphire.desktop:6
 msgid "Sapphire"
-msgstr ""
+msgstr "Sapphire"
 
 #. Comment
 #: sapphire.desktop:8
 msgid "A minimal but configurable window manager"
-msgstr "Een minimale maar instelbare windowmanager"
+msgstr "Een minimale doch instelbare vensterbeheerder"
 
 #. Name
 #: sawfish.desktop:6
 msgid "Sawfish"
-msgstr ""
+msgstr "Sawfish"
 
 #. Comment
 #: sawfish.desktop:8
 msgid ""
 "An extensible window manager scriptable with an Emacs Lisp-like language"
 msgstr ""
-"Een uitbreidbare windowmanager, scriptbaar via een Emacs Lisp-achtige taal"
+"Een uitbreidbare vensterbeheerder, scriptbaar via een Emacs Lisp-achtige taal"
 
 #. Name
 #: twm.desktop:6
 msgid "TWM"
-msgstr ""
+msgstr "TWM"
 
 #. Comment
 #: twm.desktop:8
@@ -470,7 +474,7 @@ msgstr "De Tab Window Manager"
 #. Name
 #: ude.desktop:6
 msgid "UDE"
-msgstr ""
+msgstr "UDE"
 
 #. Comment
 #: ude.desktop:8
@@ -480,18 +484,18 @@ msgstr "De Unix Desktop Environment"
 #. Name
 #: vtwm.desktop:6
 msgid "VTWM"
-msgstr ""
+msgstr "VTWM"
 
 #. Comment
 #: vtwm.desktop:8
 msgid "The Virtual Tab Window Manager. TWM enhanced by virtual screens, etc."
 msgstr ""
-"De Virtual Tab Window Manager. TWM uitgebreid met virtuele bureaubladen, etc."
+"De Virtual Tab Window Manager: TWM uitgebreid met virtuele werkbladen en meer"
 
 #. Name
 #: w9wm.desktop:6
 msgid "W9WM"
-msgstr ""
+msgstr "W9WM"
 
 #. Comment
 #: w9wm.desktop:8
@@ -499,28 +503,28 @@ msgid ""
 "A window manager based on 9WM, enhanced by virtual screens and keyboard "
 "bindings"
 msgstr ""
-"Een windowmanager gebaseerd op 9WM. Uitgebreid met virtuele bureaubladen en "
-"sneltoetsen"
+"Een op 9WM gebaseerde vensterbeheerder, uitgebreid met virtuele werkbladen "
+"en sneltoetsen"
 
 #. Name
 #: waimea.desktop:6
 msgid "Waimea"
-msgstr ""
+msgstr "Waimea"
 
 #. Comment
 #: waimea.desktop:8
 msgid "A highly customizable window manager based on Blackbox"
-msgstr "Een zeer instelbare windowmanager, gebaseerd op Blackbox"
+msgstr "Een zeer instelbare vensterbeheerder, gebaseerd op Blackbox"
 
 #. Name
 #: wm2.desktop:6
 msgid "WM2"
-msgstr ""
+msgstr "WM2"
 
 #. Comment
 #: wm2.desktop:8
 msgid "A small, non-configurable window manager"
-msgstr "Een kleine, niet-instelbare windowmanager"
+msgstr "Een kleine, niet-instelbare vensterbeheerder"
 
 #. Name
 #: wmaker.desktop:6
@@ -531,13 +535,13 @@ msgstr "WindowMaker"
 #: wmaker.desktop:8
 msgid "A simple window manager that resembles the NeXTStep look very closely"
 msgstr ""
-"Een eenvoudige windowmanager die het uiterlijk van NeXTStep zeer dicht "
+"Een eenvoudige vensterbeheerder die het uiterlijk van NeXTStep zeer dicht "
 "benaderd"
 
 #. Name
 #: xfce.desktop:6
 msgid "XFce"
-msgstr ""
+msgstr "Xfce"
 
 #. Comment
 #: xfce.desktop:8
@@ -545,13 +549,13 @@ msgid ""
 "The Cholesterol Free Desktop Environment. A desktop environment reminiscent "
 "of CDE"
 msgstr ""
-"The Cholesterol Free Desktop Environment. Een desktop environment die "
-"herinnert aan CDE"
+"De Cholesterol Free Desktop Environment, een werkomgeving die doet denken "
+"aan CDE"
 
 #. Name
 #: xfce4.desktop:6
 msgid "XFce 4"
-msgstr ""
+msgstr "Xfce 4"
 
 #. Comment
 #: xfce4.desktop:8
@@ -559,5 +563,5 @@ msgid ""
 "The Cholesterol Free Desktop Environment, version 4. A desktop environment "
 "reminiscent of CDE"
 msgstr ""
-"De Cholesterol Free Desktop Environment, versie 4. Een desktop environment "
-"die herinnert aan  CDE"
+"De Cholesterol Free Desktop Environment, versie 4, een werkomgeving die doet "
+"denken aan CDE"
diff --git a/translations/desktop_files/tdm-sessions/zh_CN.po b/translations/desktop_files/tdm-sessions/zh_CN.po
index 6646ae7e8..3be6e3afb 100644
--- a/translations/desktop_files/tdm-sessions/zh_CN.po
+++ b/translations/desktop_files/tdm-sessions/zh_CN.po
@@ -1,20 +1,21 @@
 # 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-06-25 20:47+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-12 05:21+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified Han script) <https://mirror.git."
+"trinitydesktop.org/weblate/projects/tdebase/tdm-sessions/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
 #: tde.desktop.cmake:7
@@ -26,7 +27,7 @@ msgstr ""
 msgid ""
 "The Trinity Desktop Environment. A powerful Open Source graphical desktop "
 "environment"
-msgstr "三�一体 桌�环境。强大的开放�代�图形桌�环境"
+msgstr "Trinity 桌�环境。既���强大的开�图形桌�环境"
 
 #. Name
 #: 9wm.desktop:6
diff --git a/translations/desktop_files/tdm-themes/es_AR.po b/translations/desktop_files/tdm-themes/es_AR.po
new file mode 100644
index 000000000..e348549fb
--- /dev/null
+++ b/translations/desktop_files/tdm-themes/es_AR.po
@@ -0,0 +1,49 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 20:50+0200\n"
+"PO-Revision-Date: 2024-06-24 19:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/tdm-themes/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: circles/GdmGreeterTheme.desktop:7
+msgid "Circles"
+msgstr "Círculos"
+
+#. Description
+#: circles/GdmGreeterTheme.desktop:9
+msgid "Theme with blue circles"
+msgstr "Tema con círculos azules"
+
+#. Name
+#: minimalist/GdmGreeterTheme.desktop:8
+msgid "Minimalist"
+msgstr "Minimalista"
+
+#. Description
+#: minimalist/GdmGreeterTheme.desktop:10
+msgid "A minimalist TDM theme for TDE, inspired by LightDM"
+msgstr "Un tema minimalista para TDM, inspirado por LightDM"
+
+#. Name
+#: o2_enterprise/GdmGreeterTheme.desktop:8
+msgid "O2 Enterprise"
+msgstr "O2 Enterprise"
+
+#. Description
+#: o2_enterprise/GdmGreeterTheme.desktop:10
+msgid "A sleek and professional looking TDM theme for Trinity"
+msgstr "Un tema de apariencia impecable y profesional para TDM"
diff --git a/translations/desktop_files/tdm-themes/ka.po b/translations/desktop_files/tdm-themes/ka.po
index 34f035f53..1b1ee435e 100644
--- a/translations/desktop_files/tdm-themes/ka.po
+++ b/translations/desktop_files/tdm-themes/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:50+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-themes/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,19 +30,19 @@ msgstr "ლურჯ წრეები�ნი თემ�"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "მინიმ�ლისტური"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "მინიმ�ლისტური TDM-ის თემ�, რ�მელიც LightDM-დ�ნ მ�დის"
 
 #. Name
 #: o2_enterprise/GdmGreeterTheme.desktop:8
 msgid "O2 Enterprise"
-msgstr ""
+msgstr "O2 Enterprise"
 
 #. Description
 #: o2_enterprise/GdmGreeterTheme.desktop:10
 msgid "A sleek and professional looking TDM theme for Trinity"
-msgstr ""
+msgstr "ლ�მ�ზი დ� პრ�ფესი�ნ�ლური გ�რეგნ�ბის მქ�ნე თემ� Trinity-სთვის"
diff --git a/translations/desktop_files/tdm-themes/nl.po b/translations/desktop_files/tdm-themes/nl.po
index d14aec1a6..6c15acb57 100644
--- a/translations/desktop_files/tdm-themes/nl.po
+++ b/translations/desktop_files/tdm-themes/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:50+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: 2024-11-18 13:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdm-themes/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -24,24 +25,24 @@ msgstr "Cirkels"
 #. Description
 #: circles/GdmGreeterTheme.desktop:9
 msgid "Theme with blue circles"
-msgstr "Thema met blauwe cirkels"
+msgstr "Een thema met blauwe cirkels"
 
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Minimalistisch"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Een minimalistisch thema voor TDE, geïnspireerd op LightDM"
 
 #. Name
 #: o2_enterprise/GdmGreeterTheme.desktop:8
 msgid "O2 Enterprise"
-msgstr ""
+msgstr "O2 zakelijk"
 
 #. Description
 #: o2_enterprise/GdmGreeterTheme.desktop:10
 msgid "A sleek and professional looking TDM theme for Trinity"
-msgstr ""
+msgstr "Een gelikt, professioneel uitziend TDM-thema voor Trinity"
diff --git a/translations/desktop_files/tdm-themes/ru.po b/translations/desktop_files/tdm-themes/ru.po
index 718650b99..88a783284 100644
--- a/translations/desktop_files/tdm-themes/ru.po
+++ b/translations/desktop_files/tdm-themes/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 20:50+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: 2023-12-17 17:55+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-themes/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,19 +31,19 @@ msgstr "Тема � �иними кругами"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Минимали�т"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Минимали�тична� тема TDM дл� TDE, вдохновлённа� LightDM"
 
 #. Name
 #: o2_enterprise/GdmGreeterTheme.desktop:8
 msgid "O2 Enterprise"
-msgstr ""
+msgstr "O2 Enterprise"
 
 #. Description
 #: o2_enterprise/GdmGreeterTheme.desktop:10
 msgid "A sleek and professional looking TDM theme for Trinity"
-msgstr ""
+msgstr "Элегантна� и профе��иональна� тема TDM дл� Trinity"
diff --git a/translations/desktop_files/twin-clients-desktops/es_AR.po b/translations/desktop_files/twin-clients-desktops/es_AR.po
new file mode 100644
index 000000000..44a73f628
--- /dev/null
+++ b/translations/desktop_files/twin-clients-desktops/es_AR.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:19+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: b2/b2.desktop:2
+msgid "B II"
+msgstr ""
+
+#. Name
+#: keramik/keramik.desktop:2
+msgid "Keramik"
+msgstr ""
+
+#. Name
+#: kwmtheme/kwmtheme.desktop:2
+msgid "KWM Theme"
+msgstr ""
+
+#. Name
+#: laptop/laptop.desktop:2
+msgid "Laptop"
+msgstr ""
+
+#. Name
+#: modernsystem/modernsystem.desktop:2
+msgid "Modern System"
+msgstr ""
+
+#. Name
+#: plastik/plastik.desktop:2
+msgid "Plastik"
+msgstr ""
+
+#. Name
+#: quartz/quartz.desktop:2
+msgid "Quartz"
+msgstr ""
+
+#. Name
+#: redmond/redmond.desktop:2
+msgid "Redmond"
+msgstr ""
+
+#. Name
+#: test/test.desktop:2
+msgid "KWin test"
+msgstr ""
+
+#. Name
+#: web/web.desktop:2
+msgid "Web"
+msgstr ""
diff --git a/translations/desktop_files/twin-clients-desktops/ka.po b/translations/desktop_files/twin-clients-desktops/ka.po
index 61cacc3d2..cad2a962c 100644
--- a/translations/desktop_files/twin-clients-desktops/ka.po
+++ b/translations/desktop_files/twin-clients-desktops/ka.po
@@ -1,40 +1,41 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 21:19+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-clients-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: b2/b2.desktop:2
 msgid "B II"
-msgstr ""
+msgstr "B II"
 
 #. Name
 #: keramik/keramik.desktop:2
 msgid "Keramik"
-msgstr ""
+msgstr "კერ�მიკ�"
 
 #. Name
 #: kwmtheme/kwmtheme.desktop:2
 msgid "KWM Theme"
-msgstr "KWM სტილი"
+msgstr "KWM-ის თემ�"
 
 #. Name
 #: laptop/laptop.desktop:2
 msgid "Laptop"
-msgstr "ლეპტ�პი"
+msgstr "ნ�უთბუქი"
 
 #. Name
 #: modernsystem/modernsystem.desktop:2
@@ -44,7 +45,7 @@ msgstr "თ�ნ�მედრ�ვე სისტემ�"
 #. Name
 #: plastik/plastik.desktop:2
 msgid "Plastik"
-msgstr "Пла�тик"
+msgstr "პლ�სტმ�ს�"
 
 #. Name
 #: quartz/quartz.desktop:2
@@ -59,9 +60,9 @@ msgstr "რედმ�ნდი"
 #. Name
 #: test/test.desktop:2
 msgid "KWin test"
-msgstr "KWin შემ�წმებ�"
+msgstr "KWin-ის შემ�წმებ�"
 
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "ვები"
diff --git a/translations/desktop_files/twin-clients-desktops/nl.po b/translations/desktop_files/twin-clients-desktops/nl.po
index d0c1f4e72..a120a4679 100644
--- a/translations/desktop_files/twin-clients-desktops/nl.po
+++ b/translations/desktop_files/twin-clients-desktops/nl.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 21:19+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: 2024-12-20 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/twin-clients-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: b2/b2.desktop:2
 msgid "B II"
-msgstr ""
+msgstr "B II"
 
 #. Name
 #: keramik/keramik.desktop:2
 msgid "Keramik"
-msgstr ""
+msgstr "Keramiek"
 
 #. Name
 #: kwmtheme/kwmtheme.desktop:2
@@ -34,7 +35,7 @@ msgstr "KWM-thema"
 #. Name
 #: laptop/laptop.desktop:2
 msgid "Laptop"
-msgstr ""
+msgstr "Laptop"
 
 #. Name
 #: modernsystem/modernsystem.desktop:2
@@ -44,24 +45,24 @@ msgstr "Modern systeem"
 #. Name
 #: plastik/plastik.desktop:2
 msgid "Plastik"
-msgstr ""
+msgstr "Plastik"
 
 #. Name
 #: quartz/quartz.desktop:2
 msgid "Quartz"
-msgstr ""
+msgstr "Quartz"
 
 #. Name
 #: redmond/redmond.desktop:2
 msgid "Redmond"
-msgstr ""
+msgstr "Redmond"
 
 #. Name
 #: test/test.desktop:2
 msgid "KWin test"
-msgstr ""
+msgstr "KWin-test"
 
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "Web"
diff --git a/translations/desktop_files/twin-clients-desktops/ru.po b/translations/desktop_files/twin-clients-desktops/ru.po
index db2d1ff33..2bdb5df23 100644
--- a/translations/desktop_files/twin-clients-desktops/ru.po
+++ b/translations/desktop_files/twin-clients-desktops/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Alexander Golubev <fatzer2@gmail.com>, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 21:19+0200\n"
-"PO-Revision-Date: 2022-02-14 23:01+0000\n"
+"PO-Revision-Date: 2024-03-02 05:44+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/twin-clients-desktop-files/ru/>\n"
@@ -14,9 +14,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: b2/b2.desktop:2
@@ -26,7 +26,7 @@ msgstr "B II"
 #. Name
 #: keramik/keramik.desktop:2
 msgid "Keramik"
-msgstr ""
+msgstr "Керамика"
 
 #. Name
 #: kwmtheme/kwmtheme.desktop:2
@@ -56,7 +56,7 @@ msgstr "Кварц"
 #. Name
 #: redmond/redmond.desktop:2
 msgid "Redmond"
-msgstr ""
+msgstr "Редмонд"
 
 #. Name
 #: test/test.desktop:2
@@ -66,4 +66,4 @@ msgstr "Проверка KWin"
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "Web"
diff --git a/translations/desktop_files/twin-desktops/de.po b/translations/desktop_files/twin-desktops/de.po
index 6a1f1483d..095ce49e1 100644
--- a/translations/desktop_files/twin-desktops/de.po
+++ b/translations/desktop_files/twin-desktops/de.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Etienne Ruedin <ruedin@gmx.net>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-04 18:14+0000\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: 2024-08-11 04:10+0000\n"
+"Last-Translator: Etienne Ruedin <ruedin@gmx.net>\n"
+"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -42,8 +43,8 @@ msgid ""
 "twin;window;manager;border;style;theme;look;feel;layout;button;handle;edge;"
 "kwm;decoration;"
 msgstr ""
-"KWin;Kwm;Fenster;Manager;Rahmen;Design;Stile;Themes;Optik;Erscheinungsbild;"
-"Layout;Knöpfe;Ränder;Dekorationen;"
+"KWin;Kwm;Fenster;Verwaltung;Manager;Rahmen;Design;Stile;Themen;Optik;Erschein"
+"ungsbild;Layout;Knöpfe;Ränder;Dekorationen;"
 
 #. Name
 #: kcmtwin/twinoptions/twinactions.desktop:11
diff --git a/translations/desktop_files/twin-desktops/es_AR.po b/translations/desktop_files/twin-desktops/es_AR.po
new file mode 100644
index 000000000..1ecf762b1
--- /dev/null
+++ b/translations/desktop_files/twin-desktops/es_AR.po
@@ -0,0 +1,223 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2025-03-15 15:44+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/twin-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: kcmtwin/showdesktop.desktop:4
+#, fuzzy
+msgid "Show Desktop"
+msgstr "Mostrar escritorio"
+
+#. Comment
+#: kcmtwin/showdesktop.desktop:6
+msgid "A button that gives quick access to the desktop when pressed"
+msgstr "Muestra rápidamente el escritorio al pulsarlo"
+
+#. Name
+#: kcmtwin/twindecoration/twindecoration.desktop:11
+msgid "Window Decorations"
+msgstr "Decoración de ventanas"
+
+#. Comment
+#: kcmtwin/twindecoration/twindecoration.desktop:13
+msgid "Configure the look and feel of window titles"
+msgstr ""
+"Configuración del aspecto y comportamiento de los títulos de las ventanas"
+
+#. Keywords
+#: kcmtwin/twindecoration/twindecoration.desktop:15
+msgid ""
+"twin;window;manager;border;style;theme;look;feel;layout;button;handle;edge;"
+"kwm;decoration;"
+msgstr ""
+"twin;ventana;gestor;borde;estilo;tema;aspecto;comportamiento;disposición;botó"
+"n;asa;esquina;kwm;decoración;"
+
+#. Name
+#: kcmtwin/twinoptions/twinactions.desktop:11
+msgid "Actions"
+msgstr "Acciones"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactions.desktop:13
+msgid "Configure keyboard and mouse settings"
+msgstr "Configuración del teclado y del moose"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactions.desktop:15
+msgid ""
+"shade;maximise;maximize;minimize;minimise;lower;operations menu;titlebar;"
+"resize;"
+msgstr ""
+"agarrar;maximizar;minimizar;pasar al frente;pasar atrás;operaciones;menú;"
+"barra de título;redimensionarmenu;titlebar;redimensionar;"
+
+#. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "Activar bordes"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "Configurar la función de bordes/esquinas activas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+"comportamiento de la ventana;ventanas;marco;barra de título;bordes;esquinas;"
+"esquinas activas;aerosnap;"
+
+#. Name
+#: kcmtwin/twinoptions/twinadvanced.desktop:11
+msgid "Advanced"
+msgstr "Avanzado"
+
+#. Comment
+#: kcmtwin/twinoptions/twinadvanced.desktop:13
+msgid "Configure advanced window management features"
+msgstr "Configuración de las propiedades avanzadas del gestor de ventanas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinadvanced.desktop:15
+msgid "shading;border;hover;active borders;"
+msgstr "agarrando;borde;mouse sobre;bordes activos;"
+
+#. Name
+#: kcmtwin/twinoptions/twinfocus.desktop:11
+msgid "Focus"
+msgstr "Foco"
+
+#. Comment
+#: kcmtwin/twinoptions/twinfocus.desktop:13
+msgid "Configure the window focus policy"
+msgstr "Configuración de la política de enfocado de ventanas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinfocus.desktop:15
+msgid ""
+"focus;placement;auto raise;raise;click raise;keyboard;CDE;alt-tab;all "
+"desktop;"
+msgstr ""
+"foco;ubicación;auto psara al frente;pasar al frente;pulsar;teclado;CDE;alt-"
+"tab;todo el escritorio;"
+
+#. Name
+#: kcmtwin/twinoptions/twinmoving.desktop:11
+msgid "Moving"
+msgstr "Moviendo"
+
+#. Comment
+#: kcmtwin/twinoptions/twinmoving.desktop:13
+msgid "Configure the way that windows are moved"
+msgstr "Configuración del modo de movimiento de las ventanas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinmoving.desktop:15
+msgid "moving;smart;cascade;maximize;maximise;snap zone;snap;border;"
+msgstr ""
+"moviendo;inteligente;cascada;maximizar;zona de "
+"adhesión;adhesión;adherir;borde"
+
+#. Name
+#: kcmtwin/twinoptions/twinoptions.desktop:11
+msgid "Window Behavior"
+msgstr "Comportamiento de la ventana"
+
+#. Comment
+#: kcmtwin/twinoptions/twinoptions.desktop:13
+msgid "Configure the window behavior"
+msgstr "Configuración del comportamiento de la ventana"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinoptions.desktop:15
+msgid ""
+"focus;placement;window behavior;animation;raise;auto raise;windows;frame;"
+"titlebar;doubleclick;"
+msgstr ""
+"foco;ubicación;posición;ventana;comportamiento;animación;frente;pasar al "
+"frente;ventanas;marco;barra de título;doble pulsación;"
+
+#. Name
+#: kcmtwin/twinoptions/twintranslucency.desktop:11
+msgid "Translucency"
+msgstr "Translúcido"
+
+#. Comment
+#: kcmtwin/twinoptions/twintranslucency.desktop:13
+msgid "Configure window translucency and shadow management"
+msgstr "Configurar la opacidad de la ventana y gestión de sombra"
+
+#. Keywords
+#: kcmtwin/twinoptions/twintranslucency.desktop:15
+msgid "translucency;transparence;shadows;"
+msgstr "translucido;transparente;sombras;opacidad;"
+
+#. Name
+#: kcmtwin/twinrules/twinrules.desktop:11
+msgid "Window-Specific Settings"
+msgstr "Preferencias específicas de la ventana"
+
+#. Comment
+#: kcmtwin/twinrules/twinrules.desktop:13
+msgid "Configure settings specifically for a window"
+msgstr "Configurar parámetros específicos de una ventana"
+
+#. Keywords
+#: kcmtwin/twinrules/twinrules.desktop:15
+msgid ""
+"size;position;state;window behavior;windows;specific;workarounds;remember;"
+"rules;"
+msgstr ""
+"tamaño;posición;estado;comportamiento de la "
+"ventana;ventanas;específico;soluciones;recordar;reglas;"
+
+#. Description
+#: data/fsp_workarounds_1.twinrules:2
+msgid "(Default) Disable focus stealing prevention for XV"
+msgstr "(Por omisión) Deshabilitar la prevención de robo del foco para XV"
+
+#. Description
+#: data/fsp_workarounds_1.twinrules:10
+msgid "(Default) Allow focus stealing by the screen locker"
+msgstr "(Por omisión) Permitir que el bloqueador de pantalla robe el foco"
+
+#. Description
+#: data/fsp_workarounds_1.twinrules:21
+msgid "(Default) Allow focus stealing by the kdesktop run dialog"
+msgstr ""
+"(Por omisión) Permitir el robo de foco mediante el cuadro de diálogo de "
+"ejecución de kdesktop"
+
+#. Description
+#: data/fsp_workarounds_1.twinrules:32
+msgid "(Default) Allow focus stealing by the settings test dialog"
+msgstr ""
+"(Por omisión) Permitir el robo de foco mediante el cuadro de diálogo de "
+"prueba de configuración"
+
+#. Description
+#: data/fsp_workarounds_1.twinrules:45
+msgid "(Default) Hide system modal dialog class from taskbar"
+msgstr ""
+"(Por omisión) Ocultar la clase de diálogo modal del sistema de la barra de "
+"tareas"
diff --git a/translations/desktop_files/twin-desktops/ka.po b/translations/desktop_files/twin-desktops/ka.po
index 0c33ab44d..64a11c265 100644
--- a/translations/desktop_files/twin-desktops/ka.po
+++ b/translations/desktop_files/twin-desktops/ka.po
@@ -1,40 +1,43 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-04 18:14+0000\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: 2024-12-13 07:11+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
 msgid "Show Desktop"
-msgstr "ს�მუშ�� დ�ფის ჩვენებ�"
+msgstr "ს�მუშ�� მ�გიდის ჩვენებ�"
 
 #. Comment
 #: kcmtwin/showdesktop.desktop:6
 msgid "A button that gives quick access to the desktop when pressed"
 msgstr ""
+"ღილ�კი, რ�მელიც, რ�ც� დ��წვებით, ს�მუშ�� მ�გიდ�სთ�ნ სწრ�ფი წვდ�მის "
+"ს�შუ�ლებ�ს მ�გცემთ"
 
 #. Name
 #: kcmtwin/twindecoration/twindecoration.desktop:11
 msgid "Window Decorations"
-msgstr "ფ�ნჯრის დეკ�რ�ცი�"
+msgstr "ფ�ნჯრის დეკ�რ�ციები"
 
 #. Comment
 #: kcmtwin/twindecoration/twindecoration.desktop:13
 msgid "Configure the look and feel of window titles"
-msgstr "ფ�ნჯრის ს�თ�ურის იერს�ხის კ�ნფიგურ�ცი�"
+msgstr "ფ�ნჯრის ს�თ�ურის იერს�ხის მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twindecoration/twindecoration.desktop:15
@@ -42,16 +45,19 @@ msgid ""
 "twin;window;manager;border;style;theme;look;feel;layout;button;handle;edge;"
 "kwm;decoration;"
 msgstr ""
+"twin;window;manager;border;style;theme;look;feel;layout;button;handle;edge;kw"
+"m;decoration;დეკ�რ�ცი�;ღილ�კი;ს�ზღვ�რი;სტილი;ფ�ნჯ�რ�;მ�რთვ�;გ�ნლ�გებ�;შეგრძნე"
+"ბ�;თემ�;"
 
 #. Name
 #: kcmtwin/twinoptions/twinactions.desktop:11
 msgid "Actions"
-msgstr "ქცევ�"
+msgstr "ქმედებები"
 
 #. Comment
 #: kcmtwin/twinoptions/twinactions.desktop:13
 msgid "Configure keyboard and mouse settings"
-msgstr "კლ�ვი�ტურის დ� თ�გუნ�ს პ�რ�მეტრების კ�ნფიგურ�ცი�"
+msgstr "კლ�ვი�ტურის დ� თ�გუნ�ს მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinactions.desktop:15
@@ -59,18 +65,18 @@ msgid ""
 "shade;maximise;maximize;minimize;minimise;lower;operations menu;titlebar;"
 "resize;"
 msgstr ""
+"shade;maximise;maximize;minimize;minimise;lower;operations "
+"menu;titlebar;resize;ზ�მ�;მენიუ;დ�ჩრდილვ�;გ�შლ�;ჩ�კეცვ�;"
 
 #. Name
 #: kcmtwin/twinoptions/twinactiveborders.desktop:11
 msgid "Active Borders"
-msgstr ""
+msgstr "�ქტიური ს�ზღვრები"
 
 #. Comment
 #: kcmtwin/twinoptions/twinactiveborders.desktop:13
-#, fuzzy
-#| msgid "Configure advanced window management features"
 msgid "Configure active borders/corners feature"
-msgstr "ფ�ნჯრების მენეჯერის დ�მ�ტებითი ფუნქციების კ�ნფიგურ�ცი�"
+msgstr "�ქტიური ს�ზღვრების/კუთხეების თვისების მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinactiveborders.desktop:15
@@ -78,6 +84,8 @@ msgid ""
 "window behavior;windows;frame;titlebar;borders;corners;active borders;"
 "aerosnap;"
 msgstr ""
+"window behavior;windows;frame;titlebar;borders;corners;active "
+"borders;aerosnap;ფ�ნჯრის ქცევ�;ფ�ნჯრები;ჩ�რჩ�;კუთხეები;�ქტიური კუთხეები;"
 
 #. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
@@ -87,12 +95,12 @@ msgstr "დ�მ�ტებით"
 #. Comment
 #: kcmtwin/twinoptions/twinadvanced.desktop:13
 msgid "Configure advanced window management features"
-msgstr "ფ�ნჯრების მენეჯერის დ�მ�ტებითი ფუნქციების კ�ნფიგურ�ცი�"
+msgstr "ფ�ნჯრების მმ�რთველის დ�მ�ტებითი ფუნქციების მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinadvanced.desktop:15
 msgid "shading;border;hover;active borders;"
-msgstr ""
+msgstr "shading;border;hover;active borders;დ�ჩრდილვ�;გ�დ�ტ�რებ�;"
 
 #. Name
 #: kcmtwin/twinoptions/twinfocus.desktop:11
@@ -101,9 +109,8 @@ msgstr "ფ�კუსი"
 
 #. Comment
 #: kcmtwin/twinoptions/twinfocus.desktop:13
-#, fuzzy
 msgid "Configure the window focus policy"
-msgstr "ბრ�უზერის ქცევის კ�ნფიგურ�ცი�"
+msgstr "ფ�ნჯრის ფ�კუსის პ�ლიტიკის მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinfocus.desktop:15
@@ -111,6 +118,8 @@ msgid ""
 "focus;placement;auto raise;raise;click raise;keyboard;CDE;alt-tab;all "
 "desktop;"
 msgstr ""
+"focus;placement;auto raise;raise;click raise;keyboard;CDE;alt-tab;all "
+"desktop;ფ�კუსი;მ�თ�ვსებ�;�ვტ��მ�წევ�;კლ�ვი�ტურ�;"
 
 #. Name
 #: kcmtwin/twinoptions/twinmoving.desktop:11
@@ -120,12 +129,14 @@ msgstr "გ�დ��დგილებ�"
 #. Comment
 #: kcmtwin/twinoptions/twinmoving.desktop:13
 msgid "Configure the way that windows are moved"
-msgstr "ფ�ნჯრების გ�დ��დგილების კ�ნფიგურ�ცი�"
+msgstr "ფ�ნჯრების გ�დ��დგილების გზის მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinmoving.desktop:15
 msgid "moving;smart;cascade;maximize;maximise;snap zone;snap;border;"
 msgstr ""
+"moving;smart;cascade;maximize;maximise;snap "
+"zone;snap;border;გ�დ��დგილებ�;ჭკვი�ნი;გ�შლ�;მიმ�გრებ�;"
 
 #. Name
 #: kcmtwin/twinoptions/twinoptions.desktop:11
@@ -135,7 +146,7 @@ msgstr "ფ�ნჯრის ქცევ�"
 #. Comment
 #: kcmtwin/twinoptions/twinoptions.desktop:13
 msgid "Configure the window behavior"
-msgstr "ბრ�უზერის ქცევის კ�ნფიგურ�ცი�"
+msgstr "ფ�ნჯრის ქცევის მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinoptions.desktop:15
@@ -143,21 +154,26 @@ msgid ""
 "focus;placement;window behavior;animation;raise;auto raise;windows;frame;"
 "titlebar;doubleclick;"
 msgstr ""
+"focus;placement;window behavior;animation;raise;auto "
+"raise;windows;frame;titlebar;doubleclick;�რიწკ�პი;ფ�კუსი;მ�თ�ვსებ�;ფ�ნჯრის "
+"ქცევ�;�ნიმ�ცი�;�მ�წევ�;ჩ�რჩ�;ს�თ�ურის ზ�ლი;"
 
 #. Name
 #: kcmtwin/twinoptions/twintranslucency.desktop:11
 msgid "Translucency"
-msgstr "ნ�ხევრ�დგ�მჭირვ�ლე�ბ�"
+msgstr "ნ�ხევრ�დგ�მჭირვ�ლ�ბ�"
 
 #. Comment
 #: kcmtwin/twinoptions/twintranslucency.desktop:13
 msgid "Configure window translucency and shadow management"
-msgstr "ფ�ნჯრების გ�მჭირვ�ლ�ბის დ� ჩრდილების კ�ნფიგურ�ცი�"
+msgstr "ფ�ნჯრის გ�მჭირვ�ლ�ბის დ� ჩრდილის მ�რგებ�"
 
 #. Keywords
 #: kcmtwin/twinoptions/twintranslucency.desktop:15
 msgid "translucency;transparence;shadows;"
 msgstr ""
+"translucency;transparence;shadows;ნ�ხევრ�დგ�მჭვირვ�ლ�ბ�;გ�მჭვირვ�ლ�ბ�;ჩრდილებ"
+"ი;"
 
 #. Name
 #: kcmtwin/twinrules/twinrules.desktop:11
@@ -175,28 +191,33 @@ msgid ""
 "size;position;state;window behavior;windows;specific;workarounds;remember;"
 "rules;"
 msgstr ""
+"size;position;state;window behavior;windows;specific;workarounds;remember;rul"
+"es;წესები;ზ�მ�;მდებ�რე�ბ�;მდგ�მ�რე�ბ�;ფ�ნჯრის ქცევ�;ფ�ნჯრები;დ�იმ�ხს�ვრეთ;"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:2
 msgid "(Default) Disable focus stealing prevention for XV"
-msgstr ""
+msgstr "(ნ�გულისხმევი) ფ�კუსის მ�პ�რვის თ�ვიდ�ნ �ცილების გ�მ�რთვ� XV-სთვის"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr ""
+msgstr "(ნ�გულისხმევი) ეკრ�ნის დ�მბლ�კის მ�გიერ ფ�კუსის მ�პ�რვის დ�შვებ�"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
 msgstr ""
+"(ნ�გულისხმევი) ფ�კუსის მ�პ�რვის დ�შვებ� kdestop-ის გ�შვების დი�ლ�გისთვის"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
 msgid "(Default) Allow focus stealing by the settings test dialog"
 msgstr ""
+"(ნ�გულისხმევი) ფ�კუსის მ�პ�რვის დ�შვებ� პ�რ�მეტრების შემ�წმების დი�ლ�გი მიერ"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
 msgstr ""
+"(ნ�გულისხმევი) სისტემური მ�დ�ლის დი�ლ�გის კლ�სის დ�მ�ლვ� �მ�ც�ნების პ�ნელიდ�ნ"
diff --git a/translations/desktop_files/twin-desktops/nl.po b/translations/desktop_files/twin-desktops/nl.po
index db608b9e1..4cfbed986 100644
--- a/translations/desktop_files/twin-desktops/nl.po
+++ b/translations/desktop_files/twin-desktops/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-04 18:14+0000\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-01-10 22:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/twin-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -34,7 +35,7 @@ msgstr "Vensterdecoraties"
 #. Comment
 #: kcmtwin/twindecoration/twindecoration.desktop:13
 msgid "Configure the look and feel of window titles"
-msgstr "Hier kunt u het uiterlijk en gedrag van venstertitels instellen"
+msgstr "Stel het uiterlijk en gedrag van venstertitels in"
 
 #. Keywords
 #: kcmtwin/twindecoration/twindecoration.desktop:15
@@ -54,7 +55,7 @@ msgstr "Acties"
 #. Comment
 #: kcmtwin/twinoptions/twinactions.desktop:13
 msgid "Configure keyboard and mouse settings"
-msgstr "Hier kunt u de instellingen van toetsenbord en muis instellen"
+msgstr "Stel de instellingen van toetsenbord en muis in"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinactions.desktop:15
@@ -68,21 +69,19 @@ msgstr ""
 #. Name
 #: kcmtwin/twinoptions/twinactiveborders.desktop:11
 msgid "Active Borders"
-msgstr ""
+msgstr "Actieve randen"
 
 #. Comment
 #: kcmtwin/twinoptions/twinactiveborders.desktop:13
-#, fuzzy
-#| msgid "Configure advanced window management features"
 msgid "Configure active borders/corners feature"
-msgstr "Hier kunt u de geavanceerde vensterbeheermogelijkheden instellen"
+msgstr "Stel de actieve randen en hoeken in"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinactiveborders.desktop:15
 msgid ""
 "window behavior;windows;frame;titlebar;borders;corners;active borders;"
 "aerosnap;"
-msgstr ""
+msgstr "venstergedrag;vensters;frame;kader;rand;titelbalk;hoek;actief;aerosnap;"
 
 #. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
@@ -92,24 +91,23 @@ msgstr "Geavanceerd"
 #. Comment
 #: kcmtwin/twinoptions/twinadvanced.desktop:13
 msgid "Configure advanced window management features"
-msgstr "Hier kunt u de geavanceerde vensterbeheermogelijkheden instellen"
+msgstr "Stel de geavanceerde vensterbeheermogelijkheden in"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinadvanced.desktop:15
 msgid "shading;border;hover;active borders;"
 msgstr ""
-"oprollen;afrollen;rand;hoover;actieve randen;randen magnetisch;magnetische "
-"randen;"
+"oprollen;afrollen;rand;hoover;actieve randen;magnetisch;magnetische randen;"
 
 #. Name
 #: kcmtwin/twinoptions/twinfocus.desktop:11
 msgid "Focus"
-msgstr ""
+msgstr "Vensterfocus"
 
 #. Comment
 #: kcmtwin/twinoptions/twinfocus.desktop:13
 msgid "Configure the window focus policy"
-msgstr "Hier kunt u het vensterfocusbeleid instellen"
+msgstr "Stel het vensterfocusbeleid in"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinfocus.desktop:15
@@ -128,14 +126,14 @@ msgstr "Verplaatsing"
 #. Comment
 #: kcmtwin/twinoptions/twinmoving.desktop:13
 msgid "Configure the way that windows are moved"
-msgstr "Hier kunt u de wijze waarop vensters worden verplaatst instellen"
+msgstr "Stel de wijze waarop vensters worden verplaatst in"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinmoving.desktop:15
 msgid "moving;smart;cascade;maximize;maximise;snap zone;snap;border;"
 msgstr ""
-"verplaatsing;intelligent;plaatsing;trapsgewijs;maximaliseren;randen "
-"magnetisch;magnetisch veld;rand;magnetische randen;"
+"verplaatsing;intelligent;plaatsing;trapsgewijs;maximaliseren;randen;"
+"magnetisch veld;rand;magnetische randen;"
 
 #. Name
 #: kcmtwin/twinoptions/twinoptions.desktop:11
@@ -159,17 +157,17 @@ msgstr ""
 #. Name
 #: kcmtwin/twinoptions/twintranslucency.desktop:11
 msgid "Translucency"
-msgstr "Transparantie"
+msgstr "Doorzichtigheid"
 
 #. Comment
 #: kcmtwin/twinoptions/twintranslucency.desktop:13
 msgid "Configure window translucency and shadow management"
-msgstr "Venstertransparantie- en -schaduwbeheer instellen"
+msgstr "Stel de vensterdoorzichtigheid- en -schaduwen in"
 
 #. Keywords
 #: kcmtwin/twinoptions/twintranslucency.desktop:15
 msgid "translucency;transparence;shadows;"
-msgstr "translucency;transparantie;schaduwen;"
+msgstr "transparantie;schaduwen;doorzichtigheid;"
 
 #. Name
 #: kcmtwin/twinrules/twinrules.desktop:11
@@ -179,7 +177,7 @@ msgstr "Vensterspecifieke instellingen"
 #. Comment
 #: kcmtwin/twinrules/twinrules.desktop:13
 msgid "Configure settings specifically for a window"
-msgstr "Hier kunt u instellingen kiezen specifiek voor één venster"
+msgstr "Stel de instellingen van één specifiek venster in"
 
 #. Keywords
 #: kcmtwin/twinrules/twinrules.desktop:15
@@ -197,23 +195,20 @@ msgstr "(Standaard) Voorkomen van afpakken toetsenbordfocus voor XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Standaard) Voorkomen van afpakken toetsenbordfocus voor XV"
+msgstr "(Standaard) Focus afpakken door de schermvergrendeling voorkomen"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
-#, fuzzy
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
-msgstr "(Standaard) Voorkomen van afpakken toetsenbordfocus voor XV"
+msgstr "(Standaard) Focus afpakken door kdesktop-uitvoervenster voorkomen"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
-#, fuzzy
 msgid "(Default) Allow focus stealing by the settings test dialog"
-msgstr "(Standaard) Voorkomen van afpakken toetsenbordfocus voor XV"
+msgstr "(Standaard) Focus afpakken door instellingen-testvenster voorkomen"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
-msgstr ""
+msgstr "(Standaard) Modale dialoogvensterklassen niet tonen op taakbalk"
diff --git a/translations/desktop_files/twin-desktops/ru.po b/translations/desktop_files/twin-desktops/ru.po
index ec21e298c..76611bee5 100644
--- a/translations/desktop_files/twin-desktops/ru.po
+++ b/translations/desktop_files/twin-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-04 18:14+0000\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: 2024-05-13 16:01+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -42,6 +44,9 @@ msgid ""
 "twin;window;manager;border;style;theme;look;feel;layout;button;handle;edge;"
 "kwm;decoration;"
 msgstr ""
+"twin;window;manager;border;style;theme;look;feel;layout;button;handle;edge;kw"
+"m;decoration;окно;менеджер;рамка;границы;�тиль;тема;вид;�хема;кнопка;управлен"
+"ие;декораци�;"
 
 #. Name
 #: kcmtwin/twinoptions/twinactions.desktop:11
@@ -59,18 +64,19 @@ msgid ""
 "shade;maximise;maximize;minimize;minimise;lower;operations menu;titlebar;"
 "resize;"
 msgstr ""
+"shade;maximise;maximize;minimize;minimise;lower;operations "
+"menu;titlebar;resize;�вернуть;развернуть;меню дей�твией;заголовок;изменение "
+"размера;"
 
 #. Name
 #: kcmtwin/twinoptions/twinactiveborders.desktop:11
 msgid "Active Borders"
-msgstr ""
+msgstr "�ктивные границы"
 
 #. Comment
 #: kcmtwin/twinoptions/twinactiveborders.desktop:13
-#, fuzzy
-#| msgid "Configure advanced window management features"
 msgid "Configure active borders/corners feature"
-msgstr "�а�тройка дополнительных функций менеджера окон"
+msgstr "�а�тройка функции активных границ/углов"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinactiveborders.desktop:15
@@ -78,6 +84,8 @@ msgid ""
 "window behavior;windows;frame;titlebar;borders;corners;active borders;"
 "aerosnap;"
 msgstr ""
+"window behavior;windows;frame;titlebar;borders;corners;active "
+"borders;aerosnap;поведение;окна;границы;углы;активные границы;"
 
 #. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
@@ -93,6 +101,7 @@ msgstr "Ð�аÑ�тройка дополнительных функций менеÐ
 #: kcmtwin/twinoptions/twinadvanced.desktop:15
 msgid "shading;border;hover;active borders;"
 msgstr ""
+"shading;border;hover;active borders;затенение;граница;фоку�;активные границы;"
 
 #. Name
 #: kcmtwin/twinoptions/twinfocus.desktop:11
@@ -110,6 +119,8 @@ msgid ""
 "focus;placement;auto raise;raise;click raise;keyboard;CDE;alt-tab;all "
 "desktop;"
 msgstr ""
+"focus;placement;auto raise;raise;click raise;keyboard;CDE;alt-tab;all "
+"desktop;фоку�;размещение;клавиатура;ве�ь рабочий �тол;"
 
 #. Name
 #: kcmtwin/twinoptions/twinmoving.desktop:11
@@ -125,6 +136,9 @@ msgstr "�а�тройка �по�оба перемещени� окон"
 #: kcmtwin/twinoptions/twinmoving.desktop:15
 msgid "moving;smart;cascade;maximize;maximise;snap zone;snap;border;"
 msgstr ""
+"moving;smart;cascade;maximize;maximise;snap "
+"zone;snap;border;перемещение;умный;ка�кад;�вернуть;развернуть;зона "
+"прив�зки;прив�зка;граница;"
 
 #. Name
 #: kcmtwin/twinoptions/twinoptions.desktop:11
@@ -142,6 +156,9 @@ msgid ""
 "focus;placement;window behavior;animation;raise;auto raise;windows;frame;"
 "titlebar;doubleclick;"
 msgstr ""
+"focus;placement;window behavior;animation;raise;auto "
+"raise;windows;frame;titlebar;doubleclick;фоку�;размещение;поведение "
+"окна;анимаци�;окна;рамка;панель заголовка;двойной щелчок;"
 
 #. Name
 #: kcmtwin/twinoptions/twintranslucency.desktop:11
@@ -156,7 +173,7 @@ msgstr "�а�тройка полупрозрачно�ти и теней окн
 #. Keywords
 #: kcmtwin/twinoptions/twintranslucency.desktop:15
 msgid "translucency;transparence;shadows;"
-msgstr ""
+msgstr "translucency;transparence;shadows;прозрачно�ть;тени;"
 
 #. Name
 #: kcmtwin/twinrules/twinrules.desktop:11
@@ -174,6 +191,9 @@ msgid ""
 "size;position;state;window behavior;windows;specific;workarounds;remember;"
 "rules;"
 msgstr ""
+"size;position;state;window behavior;windows;specific;workarounds;remember;rul"
+"es;размер;положение;�о�то�ние;поведение окна;окна;�пецифиче�кие;обходные "
+"пути;запоминание;правила;"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:2
@@ -182,23 +202,23 @@ msgstr "(по умолчанию) отключить предотвращениÐ
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(по умолчанию) отключить предотвращение потери дл� XV"
+msgstr "(По умолчанию) Разрешить перехват фоку�а блокировщиком �крана"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
-#, fuzzy
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
-msgstr "(по умолчанию) отключить предотвращение потери дл� XV"
+msgstr ""
+"(По умолчанию) Разрешить перехват фоку�а диалоговым окном запу�ка kdesktop"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
-#, fuzzy
 msgid "(Default) Allow focus stealing by the settings test dialog"
-msgstr "(по умолчанию) отключить предотвращение потери дл� XV"
+msgstr ""
+"(По умолчанию) Разрешить перехват фоку�а диалоговым окном проверки на�троек"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
 msgstr ""
+"(По умолчанию) Скрыть кла�� �и�темного модального диалога � панели задач"
diff --git a/translations/desktop_files/twin-desktops/sv.po b/translations/desktop_files/twin-desktops/sv.po
index 8cc3b4b2d..06fd4d8f3 100644
--- a/translations/desktop_files/twin-desktops/sv.po
+++ b/translations/desktop_files/twin-desktops/sv.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Simon Stockhaus <simon.stockhaus.95@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-04 18:14+0000\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-06-09 23:14+0000\n"
+"Last-Translator: Simon Stockhaus <simon.stockhaus.95@gmail.com>\n"
+"Language-Team: Swedish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -65,14 +66,12 @@ msgstr "rulla upp;maximera;minimera;sänk;åtgärdsmeny;namnlist;ändra storlek;
 #. Name
 #: kcmtwin/twinoptions/twinactiveborders.desktop:11
 msgid "Active Borders"
-msgstr ""
+msgstr "Aktiva skärmkanter"
 
 #. Comment
 #: kcmtwin/twinoptions/twinactiveborders.desktop:13
-#, fuzzy
-#| msgid "Configure advanced window management features"
 msgid "Configure active borders/corners feature"
-msgstr "Anpassa avancerade fönsterhanteringsfunktioner"
+msgstr "Anpassa aktiva skärmkanter/hörn"
 
 #. Keywords
 #: kcmtwin/twinoptions/twinactiveborders.desktop:15
@@ -80,6 +79,8 @@ msgid ""
 "window behavior;windows;frame;titlebar;borders;corners;active borders;"
 "aerosnap;"
 msgstr ""
+"fönsterbeteende;fönster;ram;namnlist;kanter;hörn;aktiva skärmkanter;aero "
+"snap;"
 
 #. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
@@ -190,23 +191,20 @@ msgstr "(Förval) Inaktivera möjlighet att förhindra stöld av fokus för XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Förval) Inaktivera möjlighet att förhindra stöld av fokus för XV"
+msgstr "(Förval) Tillåt att skärmlåsningsprogrammet stjäl fokus"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
-#, fuzzy
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
-msgstr "(Förval) Inaktivera möjlighet att förhindra stöld av fokus för XV"
+msgstr "(Förval) Tillåt att Kör-rutan stjäl fokus"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
-#, fuzzy
 msgid "(Default) Allow focus stealing by the settings test dialog"
-msgstr "(Förval) Inaktivera möjlighet att förhindra stöld av fokus för XV"
+msgstr "(Förval) Tillåt att testdialogen i inställningarna stjäl fokus"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
-msgstr ""
+msgstr "(Förval) Dölj systemet modala dialoger från aktivitetsfältet"
diff --git a/translations/desktop_files/twin-eventsrc/de.po b/translations/desktop_files/twin-eventsrc/de.po
index d04b6167d..cf699dd39 100644
--- a/translations/desktop_files/twin-eventsrc/de.po
+++ b/translations/desktop_files/twin-eventsrc/de.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Etienne Ruedin <ruedin@gmx.net>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 21:20+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: 2024-08-11 04:10+0000\n"
+"Last-Translator: Etienne Ruedin <ruedin@gmx.net>\n"
+"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-events/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "The Window Manager"
-msgstr "Fenstermanager"
+msgstr "Fensterverwaltung"
 
 #. Name
 #: eventsrc:6
diff --git a/translations/desktop_files/twin-eventsrc/es_AR.po b/translations/desktop_files/twin-eventsrc/es_AR.po
new file mode 100644
index 000000000..7006f0262
--- /dev/null
+++ b/translations/desktop_files/twin-eventsrc/es_AR.po
@@ -0,0 +1,453 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-25 21:20+0200\n"
+"PO-Revision-Date: 2024-11-25 14:10+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/twin-events/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Comment
+#: eventsrc:3
+msgid "The Window Manager"
+msgstr "El gestor de ventanas"
+
+#. Name
+#: eventsrc:6
+#, fuzzy
+msgid "Change to Desktop 1"
+msgstr "Cambiar al escritorio 1"
+
+#. Comment
+#: eventsrc:7
+#, fuzzy
+msgid "Virtual desktop one is selected"
+msgstr "Seleccionado el escritorio virtual Uno"
+
+#. Name
+#: eventsrc:12
+#, fuzzy
+msgid "Change to Desktop 2"
+msgstr "Cambiar al escritorio 2"
+
+#. Comment
+#: eventsrc:13
+#, fuzzy
+msgid "Virtual desktop two is selected"
+msgstr "Seleccionado el escritorio virtual Dos"
+
+#. Name
+#: eventsrc:18
+#, fuzzy
+msgid "Change to Desktop 3"
+msgstr "Cambiar al escritorio 3"
+
+#. Comment
+#: eventsrc:19
+#, fuzzy
+msgid "Virtual desktop three is selected"
+msgstr "Seleccionado el escritorio virtual Tres"
+
+#. Name
+#: eventsrc:24
+#, fuzzy
+msgid "Change to Desktop 4"
+msgstr "Cambiar al escritorio 4"
+
+#. Comment
+#: eventsrc:25
+#, fuzzy
+msgid "Virtual desktop four is selected"
+msgstr "Seleccionado el escritorio virtual Cuatro"
+
+#. Name
+#: eventsrc:30
+#, fuzzy
+msgid "Change to Desktop 5"
+msgstr "Cambiar al escritorio 5"
+
+#. Comment
+#: eventsrc:31
+#, fuzzy
+msgid "Virtual desktop five is selected"
+msgstr "Seleccionado el escritorio virtual Cinco"
+
+#. Name
+#: eventsrc:36
+#, fuzzy
+msgid "Change to Desktop 6"
+msgstr "Cambiar al escritorio 6"
+
+#. Comment
+#: eventsrc:37
+#, fuzzy
+msgid "Virtual desktop six is selected"
+msgstr "Seleccionado el escritorio virtual Seis"
+
+#. Name
+#: eventsrc:42
+#, fuzzy
+msgid "Change to Desktop 7"
+msgstr "Cambiar al escritorio 7"
+
+#. Comment
+#: eventsrc:43
+#, fuzzy
+msgid "Virtual desktop seven is selected"
+msgstr "Seleccionado el escritorio virtual Siete"
+
+#. Name
+#: eventsrc:48
+#, fuzzy
+msgid "Change to Desktop 8"
+msgstr "Cambiar al escritorio 8"
+
+#. Comment
+#: eventsrc:49
+#, fuzzy
+msgid "Virtual desktop eight is selected"
+msgstr "Seleccionado el escritorio virtual Ocho"
+
+#. Name
+#: eventsrc:54
+#, fuzzy
+msgid "Change to Desktop 9"
+msgstr "Cambiar al escritorio 9"
+
+#. Comment
+#: eventsrc:55
+#, fuzzy
+msgid "Virtual desktop nine is selected"
+msgstr "Seleccionado el escritorio virtual Nueve"
+
+#. Name
+#: eventsrc:59
+#, fuzzy
+msgid "Change to Desktop 10"
+msgstr "Cambiar al escritorio 10"
+
+#. Comment
+#: eventsrc:60
+#, fuzzy
+msgid "Virtual desktop ten is selected"
+msgstr "Seleccionado el escritorio virtual Diez"
+
+#. Name
+#: eventsrc:64
+#, fuzzy
+msgid "Change to Desktop 11"
+msgstr "Cambiar al escritorio 11"
+
+#. Comment
+#: eventsrc:65
+#, fuzzy
+msgid "Virtual desktop eleven is selected"
+msgstr "Seleccionado el escritorio virtual Once"
+
+#. Name
+#: eventsrc:69
+#, fuzzy
+msgid "Change to Desktop 12"
+msgstr "Cambiar al escritorio 12"
+
+#. Comment
+#: eventsrc:70
+#, fuzzy
+msgid "Virtual desktop twelve is selected"
+msgstr "Seleccionado el escritorio virtual Doce"
+
+#. Name
+#: eventsrc:74
+#, fuzzy
+msgid "Change to Desktop 13"
+msgstr "Cambiar al escritorio 13"
+
+#. Comment
+#: eventsrc:75
+#, fuzzy
+msgid "Virtual desktop thirteen is selected"
+msgstr "Seleccionado el escritorio virtual Trece"
+
+#. Name
+#: eventsrc:79
+#, fuzzy
+msgid "Change to Desktop 14"
+msgstr "Cambiar al escritorio 14"
+
+#. Comment
+#: eventsrc:80
+#, fuzzy
+msgid "Virtual desktop fourteen is selected"
+msgstr "Seleccionado el escritorio virtual Catorce"
+
+#. Name
+#: eventsrc:84
+#, fuzzy
+msgid "Change to Desktop 15"
+msgstr "Cambiar al escritorio 15"
+
+#. Comment
+#: eventsrc:85
+msgid "Virtual desktop fifteen is selected"
+msgstr ""
+
+#. Name
+#: eventsrc:89
+msgid "Change to Desktop 16"
+msgstr ""
+
+#. Comment
+#: eventsrc:90
+msgid "Virtual desktop sixteen is selected"
+msgstr ""
+
+#. Name
+#: eventsrc:94
+msgid "Change to Desktop 17"
+msgstr ""
+
+#. Comment
+#: eventsrc:95
+msgid "Virtual desktop seventeen is selected"
+msgstr ""
+
+#. Name
+#: eventsrc:99
+msgid "Change to Desktop 18"
+msgstr ""
+
+#. Comment
+#: eventsrc:100
+msgid "Virtual desktop eighteen is selected"
+msgstr ""
+
+#. Name
+#: eventsrc:104
+msgid "Change to Desktop 19"
+msgstr ""
+
+#. Comment
+#: eventsrc:105
+msgid "Virtual desktop nineteen is selected"
+msgstr ""
+
+#. Name
+#: eventsrc:109
+msgid "Change to Desktop 20"
+msgstr ""
+
+#. Comment
+#: eventsrc:110
+msgid "Virtual desktop twenty is selected"
+msgstr ""
+
+#. Name
+#: eventsrc:114
+msgid "Activate Window"
+msgstr ""
+
+#. Comment
+#: eventsrc:115
+msgid "Another window is activated"
+msgstr ""
+
+#. Name
+#: eventsrc:119
+msgid "New Window"
+msgstr ""
+
+#. Comment
+#: eventsrc:120
+msgid "New window"
+msgstr ""
+
+#. Name
+#: eventsrc:125
+msgid "Delete Window"
+msgstr ""
+
+#. Comment
+#: eventsrc:126
+msgid "Delete window"
+msgstr ""
+
+#. Name
+#: eventsrc:129
+msgid "Window Close"
+msgstr ""
+
+#. Comment
+#: eventsrc:130
+msgid "A window closes"
+msgstr ""
+
+#. Name
+#: eventsrc:135
+msgid "Window Shade Up"
+msgstr ""
+
+#. Comment
+#: eventsrc:136
+msgid "A window is shaded up"
+msgstr ""
+
+#. Name
+#: eventsrc:141
+msgid "Window Shade Down"
+msgstr ""
+
+#. Comment
+#: eventsrc:142
+msgid "A window is shaded down"
+msgstr ""
+
+#. Name
+#: eventsrc:147
+msgid "Window Minimize"
+msgstr ""
+
+#. Comment
+#: eventsrc:148
+msgid "A window is minimized"
+msgstr ""
+
+#. Name
+#: eventsrc:153
+msgid "Window Unminimize"
+msgstr ""
+
+#. Comment
+#: eventsrc:154
+msgid "A Window is restored"
+msgstr ""
+
+#. Name
+#: eventsrc:159
+msgid "Window Maximize"
+msgstr ""
+
+#. Comment
+#: eventsrc:160
+msgid "A window is maximized"
+msgstr ""
+
+#. Name
+#: eventsrc:165
+msgid "Window Unmaximize"
+msgstr ""
+
+#. Comment
+#: eventsrc:166
+msgid "A window loses maximization"
+msgstr ""
+
+#. Name
+#: eventsrc:171
+msgid "Window On All Desktops"
+msgstr ""
+
+#. Comment
+#: eventsrc:172
+msgid "A window is made visible on all desktops"
+msgstr ""
+
+#. Name
+#: eventsrc:177
+msgid "Window Not On All Desktops"
+msgstr ""
+
+#. Comment
+#: eventsrc:178
+msgid "A Window is no longer visible on all desktops"
+msgstr ""
+
+#. Name
+#: eventsrc:183
+msgid "New Dialog"
+msgstr ""
+
+#. Comment
+#: eventsrc:184
+msgid "Transient window (a dialog) appears"
+msgstr ""
+
+#. Name
+#: eventsrc:189
+msgid "Delete Dialog"
+msgstr ""
+
+#. Comment
+#: eventsrc:190
+msgid "Transient window (a dialog) is removed"
+msgstr ""
+
+#. Name
+#: eventsrc:195
+msgid "Window Move Start"
+msgstr ""
+
+#. Comment
+#: eventsrc:196
+msgid "A window has begun moving"
+msgstr ""
+
+#. Name
+#: eventsrc:200
+msgid "Window Move End"
+msgstr ""
+
+#. Comment
+#: eventsrc:201
+msgid "A window has completed its moving"
+msgstr ""
+
+#. Name
+#: eventsrc:205
+msgid "Window Resize Start"
+msgstr ""
+
+#. Comment
+#: eventsrc:206
+msgid "A window has begun resizing"
+msgstr ""
+
+#. Name
+#: eventsrc:210
+msgid "Window Resize End"
+msgstr ""
+
+#. Comment
+#: eventsrc:211
+msgid "A window has finished resizing"
+msgstr ""
+
+#. Name
+#: eventsrc:215
+msgid "Window On Current Desktop Demands Attention"
+msgstr ""
+
+#. Comment
+#: eventsrc:216
+msgid "A window on the current virtual desktop demands attention"
+msgstr ""
+
+#. Name
+#: eventsrc:220
+msgid "Window On Other Desktop Demands Attention"
+msgstr ""
+
+#. Comment
+#: eventsrc:221
+msgid "A window on an inactive virtual desktop demands attention"
+msgstr ""
diff --git a/translations/desktop_files/twin-eventsrc/ka.po b/translations/desktop_files/twin-eventsrc/ka.po
index f2d55b740..0351f3a6f 100644
--- a/translations/desktop_files/twin-eventsrc/ka.po
+++ b/translations/desktop_files/twin-eventsrc/ka.po
@@ -1,125 +1,126 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 21:20+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-events/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "The Window Manager"
-msgstr "ფ�ნჯრის მენეჯერი"
+msgstr "ფ�ნჯრების მმ�რთველი"
 
 #. Name
 #: eventsrc:6
 msgid "Change to Desktop 1"
-msgstr "ს�მუშ�� დ�ფ� 1-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 1"
 
 #. Comment
 #: eventsrc:7
 msgid "Virtual desktop one is selected"
-msgstr "�რჩეული� პირველი ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� პირველი ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:12
 msgid "Change to Desktop 2"
-msgstr "ს�მუშ�� დ�ფ� 2-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 2"
 
 #. Comment
 #: eventsrc:13
 msgid "Virtual desktop two is selected"
-msgstr "�რჩეული� მე�რე ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მე�რე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:18
 msgid "Change to Desktop 3"
-msgstr "ს�მუშ�� დ�ფ� 3-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 3"
 
 #. Comment
 #: eventsrc:19
 msgid "Virtual desktop three is selected"
-msgstr "�რჩეული� მეს�მე ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეს�მე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:24
 msgid "Change to Desktop 4"
-msgstr "ს�მუშ�� დ�ფ� 4-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 4"
 
 #. Comment
 #: eventsrc:25
 msgid "Virtual desktop four is selected"
-msgstr "�რჩეული� მე�თხე ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მე�თხე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:30
 msgid "Change to Desktop 5"
-msgstr "ს�მუშ�� დ�ფ� 5-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 5"
 
 #. Comment
 #: eventsrc:31
 msgid "Virtual desktop five is selected"
-msgstr "�რჩეული� მეხუთე ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეხუთე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:36
 msgid "Change to Desktop 6"
-msgstr "ს�მუშ�� დ�ფ� 6-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 6"
 
 #. Comment
 #: eventsrc:37
 msgid "Virtual desktop six is selected"
-msgstr "�რჩეული� მეექვსე ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეექვსე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:42
 msgid "Change to Desktop 7"
-msgstr "ს�მუშ�� დ�ფ� 7-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 7"
 
 #. Comment
 #: eventsrc:43
 msgid "Virtual desktop seven is selected"
-msgstr "�რჩეული� მეშვიდე ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეშვიდე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:48
 msgid "Change to Desktop 8"
-msgstr "ს�მუშ�� დ�ფ� 8-ზე გ�დ�სვლ�"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 8"
 
 #. Comment
 #: eventsrc:49
 msgid "Virtual desktop eight is selected"
-msgstr "�რჩეული� მერვე ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მერვე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:54
 msgid "Change to Desktop 9"
-msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 9"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 9"
 
 #. Comment
 #: eventsrc:55
 msgid "Virtual desktop nine is selected"
-msgstr "�რჩეული� მეცხრე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეცხრე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:59
 msgid "Change to Desktop 10"
-msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 10"
+msgstr "გ�დ�სვლ� ს�მუშ�� მ�გიდ�ზე 10"
 
 #. Comment
 #: eventsrc:60
 msgid "Virtual desktop ten is selected"
-msgstr "�რჩეული� მე�თე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მე�თე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:64
@@ -129,7 +130,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 11"
 #. Comment
 #: eventsrc:65
 msgid "Virtual desktop eleven is selected"
-msgstr "�რჩეული� მეთერთმეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეთერთმეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:69
@@ -139,7 +140,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 12"
 #. Comment
 #: eventsrc:70
 msgid "Virtual desktop twelve is selected"
-msgstr "�რჩეული� მეთ�რმეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეთ�რმეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:74
@@ -149,7 +150,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 13"
 #. Comment
 #: eventsrc:75
 msgid "Virtual desktop thirteen is selected"
-msgstr "�რჩეული� მეც�მეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეც�მეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:79
@@ -159,7 +160,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 14"
 #. Comment
 #: eventsrc:80
 msgid "Virtual desktop fourteen is selected"
-msgstr "�რჩეული� მეთ�თხმეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეთ�თხმეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:84
@@ -169,7 +170,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 15"
 #. Comment
 #: eventsrc:85
 msgid "Virtual desktop fifteen is selected"
-msgstr "�რჩეული� მეთხუთმეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეთხუთმეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:89
@@ -179,7 +180,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 16"
 #. Comment
 #: eventsrc:90
 msgid "Virtual desktop sixteen is selected"
-msgstr "�რჩეული� მეთექვსმეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეთექვსმეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:94
@@ -189,7 +190,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 17"
 #. Comment
 #: eventsrc:95
 msgid "Virtual desktop seventeen is selected"
-msgstr "�რჩეული� მეჩვიდმეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეჩვიდმეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:99
@@ -199,7 +200,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 18"
 #. Comment
 #: eventsrc:100
 msgid "Virtual desktop eighteen is selected"
-msgstr "�რჩეული� მეთვრ�მეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეთვრ�მეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:104
@@ -209,7 +210,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 19"
 #. Comment
 #: eventsrc:105
 msgid "Virtual desktop nineteen is selected"
-msgstr "�რჩეული� მეცხრ�მეტე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მეცხრ�მეტე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:109
@@ -219,7 +220,7 @@ msgstr "გ�დ�სვლ� ს�მუშ�� დ�ფ�ზე 20"
 #. Comment
 #: eventsrc:110
 msgid "Virtual desktop twenty is selected"
-msgstr "�რჩეული� მე�ცე ვირტულური ს�მუშ�� დ�ფ�"
+msgstr "�რჩეული� მე�ცე ვირტუ�ლური ს�მუშ�� მ�გიდ�"
 
 #. Name
 #: eventsrc:114
@@ -229,7 +230,7 @@ msgstr "ფ�ნჯრის გ��ქტიურებ�"
 #. Comment
 #: eventsrc:115
 msgid "Another window is activated"
-msgstr "სხვ� ფ�ნჯ�რ�� �ქტიური"
+msgstr "გ��ქტიურდ� სხვ� ფ�ნჯ�რ�"
 
 #. Name
 #: eventsrc:119
@@ -268,30 +269,28 @@ msgstr "ფ�ნჯრის �კეცვ�"
 
 #. Comment
 #: eventsrc:136
-#, fuzzy
 msgid "A window is shaded up"
-msgstr "ფ�ნჯ�რ� მ�ქსიმიზირებული�"
+msgstr "ფ�ნჯ�რ� �კეცილი�"
 
 #. Name
 #: eventsrc:141
 msgid "Window Shade Down"
-msgstr "ფ�ნჯრის ჩ�მ�შლ�"
+msgstr "ფ�ნჯრის ჩ�მ�კეცვ�"
 
 #. Comment
 #: eventsrc:142
-#, fuzzy
 msgid "A window is shaded down"
-msgstr "ფ�ნჯრის ჩ�მ�შლ�"
+msgstr "ფ�ნჯრის ჩ�მ�კეცილი�"
 
 #. Name
 #: eventsrc:147
 msgid "Window Minimize"
-msgstr "ფ�ნჯრის მინიმიზებ�"
+msgstr "ფ�ნჯრის ჩ�კეცვ�"
 
 #. Comment
 #: eventsrc:148
 msgid "A window is minimized"
-msgstr "ფ�ნჯ�რ� მინიმიზირებული�"
+msgstr "ფ�ნჯ�რ� ჩ�კეცილი�"
 
 #. Name
 #: eventsrc:153
@@ -306,42 +305,42 @@ msgstr "ფ�ნჯრის ზ�მ� �ღდგენილი�"
 #. Name
 #: eventsrc:159
 msgid "Window Maximize"
-msgstr "ფ�ნჯრის მ�ხსიმიზებ�"
+msgstr "ფ�ნჯრის გ�შლ�"
 
 #. Comment
 #: eventsrc:160
 msgid "A window is maximized"
-msgstr "ფ�ნჯ�რ� მ�ქსიმიზირებული�"
+msgstr "ფ�ნჯ�რ� გ�შლილი�"
 
 #. Name
 #: eventsrc:165
 msgid "Window Unmaximize"
-msgstr "ფ�ნჯრის ზ�მ� �ღდგენილი�"
+msgstr "ფ�ნჯრის გ�შლის გ�უქმებ�"
 
 #. Comment
 #: eventsrc:166
 msgid "A window loses maximization"
-msgstr "ფ�ნჯ�რ� �ღ�რ�� მ�ქსიმიზირებული"
+msgstr "ფ�ნჯ�რ� დ�კ�რგ�ვს გ�შლ�ს"
 
 #. Name
 #: eventsrc:171
 msgid "Window On All Desktops"
-msgstr "ფ�ნჯ�რ� ყველ� ს�მუშ�� დ�ფ�ზე�"
+msgstr "ფ�ნჯ�რ� ყველ� ს�მუშ�� მ�გიდ�ზე"
 
 #. Comment
 #: eventsrc:172
 msgid "A window is made visible on all desktops"
-msgstr "ფ�ნჯ�რ� ყველ� ს�მუშ�� დ�ფ�ზე ჩ�ნს"
+msgstr "ფ�ნჯ�რ� �ხლ� ყველ� ს�მუშ�� მ�გიდ�ზე ჩ�ნს"
 
 #. Name
 #: eventsrc:177
 msgid "Window Not On All Desktops"
-msgstr "ფ�ნჯ�რ� �რ�� ყველ� ს�მუშ�� დ�ფ�ზე"
+msgstr "ფ�ნჯ�რ� �რ�� ყველ� ს�მუშ�� მ�გიდ�ზე"
 
 #. Comment
 #: eventsrc:178
 msgid "A Window is no longer visible on all desktops"
-msgstr "ფ�ნჯ�რ� �რ ჩ�ნს ყველ� ს�მუშ�� დ�ფ�ზე"
+msgstr "ფ�ნჯ�რ� �ღ�რ ჩ�ნს ყველ� ს�მუშ�� მ�გიდ�ზე"
 
 #. Name
 #: eventsrc:183
@@ -351,7 +350,7 @@ msgstr "�ხ�ლი დი�ლ�გი"
 #. Comment
 #: eventsrc:184
 msgid "Transient window (a dialog) appears"
-msgstr ""
+msgstr "გ�რდ�მ�ვ�ლი ფ�ნჯ�რ� (დი�ლ�გი) გ�მ�ჩნდებ�"
 
 #. Name
 #: eventsrc:189
@@ -361,12 +360,12 @@ msgstr "დი�ლ�გის წ�შლ�"
 #. Comment
 #: eventsrc:190
 msgid "Transient window (a dialog) is removed"
-msgstr ""
+msgstr "გ�რდ�მ�ვ�ლი ფ�ნჯ�რ� (დი�ლ�გი) წ�შლილი�"
 
 #. Name
 #: eventsrc:195
 msgid "Window Move Start"
-msgstr "ფ�ნჯრის მ�ძრ��ბ� დ�იწყ�"
+msgstr "ფ�ნჯრის მ�ძრ��ბის დ�ს�წყისი"
 
 #. Comment
 #: eventsrc:196
@@ -381,12 +380,12 @@ msgstr "ფáƒ�ნჯრის მáƒ�ძრáƒ�áƒ�ბის დáƒ�სáƒ�სრუá
 #. Comment
 #: eventsrc:201
 msgid "A window has completed its moving"
-msgstr "ფ�ნჯრის მ�ძრ��ბ� სრულდებ�"
+msgstr "ფ�ნჯ�რ�მ მ�ძრ��ბ� დ��სრულ�"
 
 #. Name
 #: eventsrc:205
 msgid "Window Resize Start"
-msgstr "ფ�ნჯრის ზ�მ� იზვლბ�"
+msgstr "ფ�ნჯრის ზ�მის შეცვლ� დ�იწყ�"
 
 #. Comment
 #: eventsrc:206
@@ -396,7 +395,7 @@ msgstr "ფ�ნჯ�რ�მ დ�იწყ� ზ�მის შეცვ
 #. Name
 #: eventsrc:210
 msgid "Window Resize End"
-msgstr "ფ�ნჯრის ზ�მ� შეიცვ�ლ�"
+msgstr "ფ�ნჯრის ზ�მის ცვლილების დ�ს�სრული"
 
 #. Comment
 #: eventsrc:211
@@ -406,20 +405,19 @@ msgstr "ფ�ნჯრის ზ�მის ცვლილებ� დ�ს
 #. Name
 #: eventsrc:215
 msgid "Window On Current Desktop Demands Attention"
-msgstr "მიმდინ�რე ს�მუშ�� დ�ფის ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
+msgstr "მიმდინ�რე ს�მუშ�� მ�გიდ�ზე ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
 
 #. Comment
 #: eventsrc:216
 msgid "A window on the current virtual desktop demands attention"
-msgstr "მიმდინ�რე ვირტუ�ლური ს�მუშ�� დ�ფის ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
+msgstr "მიმდინ�რე ვირტუ�ლური ს�მუშ�� მ�გიდის ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
 
 #. Name
 #: eventsrc:220
 msgid "Window On Other Desktop Demands Attention"
-msgstr "სხვ� ს�მუშ�� დ�ფის ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
+msgstr "სხვ� ს�მუშ�� მ�გიდის ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
 
 #. Comment
 #: eventsrc:221
-#, fuzzy
 msgid "A window on an inactive virtual desktop demands attention"
-msgstr "მიმდინ�რე ვირტუ�ლური ს�მუშ�� დ�ფის ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
+msgstr "�რ��ქტიური ვირტუ�ლური ს�მუშ�� მ�გიდის ფ�ნჯ�რ� ყურ�დღებ�ს მ�ითხ�ვს"
diff --git a/translations/desktop_files/twin-eventsrc/nl.po b/translations/desktop_files/twin-eventsrc/nl.po
index 95aaeaa26..db375812a 100644
--- a/translations/desktop_files/twin-eventsrc/nl.po
+++ b/translations/desktop_files/twin-eventsrc/nl.po
@@ -1,226 +1,226 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-25 21:20+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-01-10 22:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/twin-events/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: eventsrc:3
 msgid "The Window Manager"
-msgstr "De-windowmanager"
+msgstr "De vensterbeheerder"
 
 #. Name
 #: eventsrc:6
 msgid "Change to Desktop 1"
-msgstr "Ga naar bureaublad 1"
+msgstr "Ga naar werkblad 1"
 
 #. Comment
 #: eventsrc:7
 msgid "Virtual desktop one is selected"
-msgstr "Virtueel bureaublad een is geselecteerd"
+msgstr "Virtueel werkblad 1 is geselecteerd"
 
 #. Name
 #: eventsrc:12
 msgid "Change to Desktop 2"
-msgstr "Ga naar bureaublad 2"
+msgstr "Ga naar werkblad 2"
 
 #. Comment
 #: eventsrc:13
 msgid "Virtual desktop two is selected"
-msgstr "Virtueel bureaublad twee is geselecteerd"
+msgstr "Virtueel werkblad 2 is geselecteerd"
 
 #. Name
 #: eventsrc:18
 msgid "Change to Desktop 3"
-msgstr "Ga naar bureaublad 3"
+msgstr "Ga naar werkblad 3"
 
 #. Comment
 #: eventsrc:19
 msgid "Virtual desktop three is selected"
-msgstr "Virtueel bureaublad drie is geselecteerd"
+msgstr "Virtueel werkblad 3 is geselecteerd"
 
 #. Name
 #: eventsrc:24
 msgid "Change to Desktop 4"
-msgstr "Ga naar bureaublad 4"
+msgstr "Ga naar werkblad 4"
 
 #. Comment
 #: eventsrc:25
 msgid "Virtual desktop four is selected"
-msgstr "Virtueel bureaublad vier is geselecteerd"
+msgstr "Virtueel werkblad 4 is geselecteerd"
 
 #. Name
 #: eventsrc:30
 msgid "Change to Desktop 5"
-msgstr "Ga naar bureaublad 5"
+msgstr "Ga naar werkblad 5"
 
 #. Comment
 #: eventsrc:31
 msgid "Virtual desktop five is selected"
-msgstr "Virtueel bureaublad vijf is geselecteerd"
+msgstr "Virtueel werkblad 5 is geselecteerd"
 
 #. Name
 #: eventsrc:36
 msgid "Change to Desktop 6"
-msgstr "Ga naar bureaublad 6"
+msgstr "Ga naar werkblad 6"
 
 #. Comment
 #: eventsrc:37
 msgid "Virtual desktop six is selected"
-msgstr "Virtueel bureaublad zes is geselecteerd"
+msgstr "Virtueel werkblad 6 is geselecteerd"
 
 #. Name
 #: eventsrc:42
 msgid "Change to Desktop 7"
-msgstr "Ga naar bureaublad 7"
+msgstr "Ga naar werkblad 7"
 
 #. Comment
 #: eventsrc:43
 msgid "Virtual desktop seven is selected"
-msgstr "Virtueel bureaublad zeven is geselecteerd"
+msgstr "Virtueel werkblad 7 is geselecteerd"
 
 #. Name
 #: eventsrc:48
 msgid "Change to Desktop 8"
-msgstr "Ga naar bureaublad 8"
+msgstr "Ga naar werkblad 8"
 
 #. Comment
 #: eventsrc:49
 msgid "Virtual desktop eight is selected"
-msgstr "Virtueel bureaublad acht is geselecteerd"
+msgstr "Virtueel werkblad 8 is geselecteerd"
 
 #. Name
 #: eventsrc:54
 msgid "Change to Desktop 9"
-msgstr "Ga naar buraublad 9"
+msgstr "Ga naar werkblad 9"
 
 #. Comment
 #: eventsrc:55
 msgid "Virtual desktop nine is selected"
-msgstr "Virtueel bureaublad negen is geselecteerd"
+msgstr "Virtueel werkblad 9 is geselecteerd"
 
 #. Name
 #: eventsrc:59
 msgid "Change to Desktop 10"
-msgstr "Ga naar buraublad 10"
+msgstr "Ga naar werkblad 10"
 
 #. Comment
 #: eventsrc:60
 msgid "Virtual desktop ten is selected"
-msgstr "Virtueel bureaublad tien is geselecteerd"
+msgstr "Virtueel werkblad 10 is geselecteerd"
 
 #. Name
 #: eventsrc:64
 msgid "Change to Desktop 11"
-msgstr "Ga naar buraublad 11"
+msgstr "Ga naar werkblad 11"
 
 #. Comment
 #: eventsrc:65
 msgid "Virtual desktop eleven is selected"
-msgstr "Virtueel bureaublad elf is geselecteerd"
+msgstr "Virtueel werkblad 11 is geselecteerd"
 
 #. Name
 #: eventsrc:69
 msgid "Change to Desktop 12"
-msgstr "Ga naar buraublad 12"
+msgstr "Ga naar werkblad 12"
 
 #. Comment
 #: eventsrc:70
-#, fuzzy
 msgid "Virtual desktop twelve is selected"
-msgstr "Virtueel bureaublad elf is geselecteerd"
+msgstr "Virtueel werkblad 12 is geselecteerd"
 
 #. Name
 #: eventsrc:74
 msgid "Change to Desktop 13"
-msgstr "Ga naar buraublad 13"
+msgstr "Ga naar werkblad 13"
 
 #. Comment
 #: eventsrc:75
 msgid "Virtual desktop thirteen is selected"
-msgstr "Virtueel bureaublad dertien is geselecteerd"
+msgstr "Virtueel werkblad 13 is geselecteerd"
 
 #. Name
 #: eventsrc:79
 msgid "Change to Desktop 14"
-msgstr "Ga naar buraublad 14"
+msgstr "Ga naar werkblad 14"
 
 #. Comment
 #: eventsrc:80
 msgid "Virtual desktop fourteen is selected"
-msgstr "Virtueel bureaublad veertien is geselecteerd"
+msgstr "Virtueel werkblad 14 is geselecteerd"
 
 #. Name
 #: eventsrc:84
 msgid "Change to Desktop 15"
-msgstr "Ga naar buraublad 15"
+msgstr "Ga naar werkblad 15"
 
 #. Comment
 #: eventsrc:85
 msgid "Virtual desktop fifteen is selected"
-msgstr "Virtueel bureaublad vijftien is geselecteerd"
+msgstr "Virtueel werkblad 15 is geselecteerd"
 
 #. Name
 #: eventsrc:89
 msgid "Change to Desktop 16"
-msgstr "Ga naar buraublad 16"
+msgstr "Ga naar werkblad 16"
 
 #. Comment
 #: eventsrc:90
 msgid "Virtual desktop sixteen is selected"
-msgstr "Virtueel bureaublad zestien is geselecteerd"
+msgstr "Virtueel werkblad 16 is geselecteerd"
 
 #. Name
 #: eventsrc:94
 msgid "Change to Desktop 17"
-msgstr "Ga naar buraublad 17"
+msgstr "Ga naar werkblad 17"
 
 #. Comment
 #: eventsrc:95
 msgid "Virtual desktop seventeen is selected"
-msgstr "Virtueel bureaublad zeventien is geselecteerd"
+msgstr "Virtueel werkblad 17 is geselecteerd"
 
 #. Name
 #: eventsrc:99
 msgid "Change to Desktop 18"
-msgstr "Ga naar buraublad 18"
+msgstr "Ga naar werkblad 18"
 
 #. Comment
 #: eventsrc:100
 msgid "Virtual desktop eighteen is selected"
-msgstr "Virtueel bureaublad achttien is geselecteerd"
+msgstr "Virtueel werkblad 18 is geselecteerd"
 
 #. Name
 #: eventsrc:104
 msgid "Change to Desktop 19"
-msgstr "Ga naar bureaublad 19"
+msgstr "Ga naar werkblad 19"
 
 #. Comment
 #: eventsrc:105
 msgid "Virtual desktop nineteen is selected"
-msgstr "Virtueel bureaublad negentien is geselecteerd"
+msgstr "Virtueel werkblad 19 is geselecteerd"
 
 #. Name
 #: eventsrc:109
 msgid "Change to Desktop 20"
-msgstr "Ga naar bureaublad 20"
+msgstr "Ga naar werkblad 20"
 
 #. Comment
 #: eventsrc:110
 msgid "Virtual desktop twenty is selected"
-msgstr "Virtueel bureaublad 20 is geselecteerd"
+msgstr "Virtueel werkblad 20 is geselecteerd"
 
 #. Name
 #: eventsrc:114
@@ -260,7 +260,7 @@ msgstr "Venster sluiten"
 #. Comment
 #: eventsrc:130
 msgid "A window closes"
-msgstr "Een venster sluit"
+msgstr "Een venster is gesloten"
 
 #. Name
 #: eventsrc:135
@@ -295,7 +295,7 @@ msgstr "Een venster is geminimaliseerd"
 #. Name
 #: eventsrc:153
 msgid "Window Unminimize"
-msgstr "Minimalisatie van venster ongedaan maken"
+msgstr "Venster herstellen"
 
 #. Comment
 #: eventsrc:154
@@ -315,52 +315,52 @@ msgstr "Een venster is gemaximaliseerd"
 #. Name
 #: eventsrc:165
 msgid "Window Unmaximize"
-msgstr "Maximalisatie van venster ongedaan maken"
+msgstr "Venster demaximaliseren"
 
 #. Comment
 #: eventsrc:166
 msgid "A window loses maximization"
-msgstr "Een venster verliest maximalisatie"
+msgstr "Een venster is gedemaximaliseerd"
 
 #. Name
 #: eventsrc:171
 msgid "Window On All Desktops"
-msgstr "Venster op alle bureaubladen"
+msgstr "Venster op alle werkbladen"
 
 #. Comment
 #: eventsrc:172
 msgid "A window is made visible on all desktops"
-msgstr "Een venster is zichtbaar gemaakt op alle bureaubladen"
+msgstr "Een venster is zichtbaar gemaakt op alle werkbladen"
 
 #. Name
 #: eventsrc:177
 msgid "Window Not On All Desktops"
-msgstr "Venster niet op alle bureaubladen"
+msgstr "Venster niet op alle werkbladen"
 
 #. Comment
 #: eventsrc:178
 msgid "A Window is no longer visible on all desktops"
-msgstr "Een venster is niet langer zichtbaar op alle bureaubladen"
+msgstr "Een venster is niet langer zichtbaar op alle werkbladen"
 
 #. Name
 #: eventsrc:183
 msgid "New Dialog"
-msgstr "Nieuw dialoog"
+msgstr "Nieuw dialoogvenster"
 
 #. Comment
 #: eventsrc:184
 msgid "Transient window (a dialog) appears"
-msgstr "Een dialoog verschijnt"
+msgstr "Een dialoogvenster is verschenen"
 
 #. Name
 #: eventsrc:189
 msgid "Delete Dialog"
-msgstr "Dialoog verwijderen"
+msgstr "Dialoogvenster sluiten"
 
 #. Comment
 #: eventsrc:190
 msgid "Transient window (a dialog) is removed"
-msgstr "Een dialoog is gesloten"
+msgstr "Een dialoogvenster is gesloten"
 
 #. Name
 #: eventsrc:195
@@ -405,19 +405,19 @@ msgstr "Een venster is klaar met het wijzigen van grootte"
 #. Name
 #: eventsrc:215
 msgid "Window On Current Desktop Demands Attention"
-msgstr "Venster op huidig bureaublad vraagt om aandacht"
+msgstr "Venster op huidig werkblad vraagt om aandacht"
 
 #. Comment
 #: eventsrc:216
 msgid "A window on the current virtual desktop demands attention"
-msgstr "Een venster op het huidige virtuele bureaublad vraagt om aandacht"
+msgstr "Een venster op het huidige virtuele werkblad vraagt om aandacht"
 
 #. Name
 #: eventsrc:220
 msgid "Window On Other Desktop Demands Attention"
-msgstr "Venster op ander bureaublad vraagt om aandacht"
+msgstr "Venster op ander werkblad vraagt om aandacht"
 
 #. Comment
 #: eventsrc:221
 msgid "A window on an inactive virtual desktop demands attention"
-msgstr "Een venster op een inactief virtueel bureaublad vraagt om aandacht"
+msgstr "Een venster op een inactief virtueel werkblad vraagt om aandacht"
diff --git a/translations/desktop_files/wallpapers-desktops/es_AR.po b/translations/desktop_files/wallpapers-desktops/es_AR.po
new file mode 100644
index 000000000..3069cc5be
--- /dev/null
+++ b/translations/desktop_files/wallpapers-desktops/es_AR.po
@@ -0,0 +1,222 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2024.
+# Alejo Fernández <alejofernandez@hotmail.com.ar>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-22 19:13+0200\n"
+"PO-Revision-Date: 2025-01-24 17:12+0000\n"
+"Last-Translator: Alejo Fernández <alejofernandez@hotmail.com.ar>\n"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/wallpapers-desktop-files/es_AR/>\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Name
+#: All-Good-People-1.jpg.desktop:3
+msgid "All Good People"
+msgstr "Gente buena onda"
+
+#. Name
+#: Chicken-Songs-2.jpg.desktop:3
+#, fuzzy
+msgid "Chicken Songs"
+msgstr "Canciones de pollos"
+
+#. Name
+#: No-Ones-Laughing-3.jpg.desktop:3
+#, fuzzy
+msgid "No One's Laughing"
+msgstr "Nadie se ríe"
+
+#. Name
+#: Time-For-Lunch-2.jpg.desktop:3
+#, fuzzy
+msgid "Time For Lunch"
+msgstr "Hora de comer"
+
+#. Name
+#: Totally-New-Product-1.jpg.desktop:3
+#, fuzzy
+msgid "Totally New Product"
+msgstr "Producto totalmente nuevo"
+
+#. Name
+#: Trinity-lineart.svg.desktop:3
+msgid "Trinity Default"
+msgstr "Por omisión de Trinity"
+
+#. Name
+#: Trinity4.png.desktop:3
+msgid "Trinity Default (old)"
+msgstr "Por omisión de Trinity (viejo)"
+
+#. Name
+#: Won-Ton-Soup-3.jpg.desktop:3
+#, fuzzy
+msgid "Won Ton Soup"
+msgstr "Sopa Won Ton"
+
+#. Name
+#: aghi.jpg.desktop:3
+#, fuzzy
+msgid "Aghi"
+msgstr "Aghi"
+
+#. Name
+#: airplane.jpg.desktop:3
+#, fuzzy
+msgid "Airplane"
+msgstr "Airplane"
+
+#. Name
+#: alta-badia.jpg.desktop:3
+#, fuzzy
+msgid "Alta Badia"
+msgstr "Alta Badia"
+
+#. Name
+#: andes-venezolanos.svgz.desktop:3
+#, fuzzy
+msgid "Andes Venezolanos"
+msgstr "Andes Venezolanos"
+
+#. Name
+#: another-view.jpg.desktop:3
+#, fuzzy
+msgid "Another View"
+msgstr "Another View"
+
+#. Name
+#: aurora.svgz.desktop:3
+#, fuzzy
+msgid "Aurora"
+msgstr "Aurora"
+
+#. Name
+#: blue-bend.jpg.desktop:3
+#, fuzzy
+msgid "Blue Blend"
+msgstr "Azul claro"
+
+#. Name
+#: celtic.svgz.desktop:3
+#, fuzzy
+msgid "Celtic"
+msgstr "Céltico"
+
+#. Name
+#: default_blue.jpg.desktop:3
+msgid "Default Blue"
+msgstr "Azul por omisión"
+
+#. Name
+#: default_gears.jpg.desktop:3
+msgid "Default Gears"
+msgstr "Engranajes por omisión"
+
+#. Name
+#: floating-leaves.jpg.desktop:3
+#, fuzzy
+msgid "Floating Leaves"
+msgstr "Hojas en suspensión"
+
+#. Name
+#: globe.svgz.desktop:3
+#, fuzzy
+msgid "Geared Globe"
+msgstr "Globo dentado"
+
+#. Name
+#: green_curtain.jpg.desktop:3
+#, fuzzy
+msgid "Green Curtain"
+msgstr "Green Curtain"
+
+#. Name
+#: here-gear.svgz.desktop:3
+#, fuzzy
+msgid "We Are Gear"
+msgstr "Todos somos engranajes"
+
+#. Name
+#: horse-head-nebula.png.desktop:3
+#, fuzzy
+msgid "Horse Head Nebula"
+msgstr "Horse Head Nebula"
+
+#. Name
+#: isadora.png.desktop:3
+#, fuzzy
+msgid "Isadora"
+msgstr "Isadora"
+
+#. Name
+#: konqui.svgz.desktop:3
+#, fuzzy
+msgid "Konqui"
+msgstr "Konqui"
+
+#. Name
+#: lineart.svgz.desktop:3
+#, fuzzy
+msgid "Lineart Logo"
+msgstr "Logo artístico"
+
+#. Name
+#: moon.svgz.desktop:3
+#, fuzzy
+msgid "Moon"
+msgstr "Luna"
+
+#. Name
+#: mountain-lake.jpg.desktop:3
+#, fuzzy
+msgid "Mountain Lake"
+msgstr "Mountain Lake"
+
+#. Name
+#: seaofconero.jpg.desktop:3
+#, fuzzy
+msgid "Sea of Conero"
+msgstr "Mar de Conero"
+
+#. Name
+#: soft-green.jpg.desktop:3
+#, fuzzy
+msgid "Soft Green"
+msgstr "Verde suave"
+
+#. Name
+#: stelvio.jpg.desktop:3
+#, fuzzy
+msgid "Stelvio"
+msgstr "Stelvio"
+
+#. Name
+#: stripes.jpg.desktop:3
+msgid "Stripes"
+msgstr "Rayas"
+
+#. Name
+#: sunshine-after-the-rain.jpg.desktop:3
+#, fuzzy
+msgid "Sunshine After The Rain"
+msgstr "Sol tras la lluvia"
+
+#. Name
+#: triplegears.jpg.desktop:3
+#, fuzzy
+msgid "Triple Gears"
+msgstr "Triple engranaje"
+
+#. Name
+#: world-desktop.jpg.desktop:3
+msgid "World Desktop"
+msgstr "Escritorio mundial"
diff --git a/translations/desktop_files/wallpapers-desktops/ka.po b/translations/desktop_files/wallpapers-desktops/ka.po
index c37d390aa..6341f5755 100644
--- a/translations/desktop_files/wallpapers-desktops/ka.po
+++ b/translations/desktop_files/wallpapers-desktops/ka.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 19:13+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: 2024-11-27 06:10+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/wallpapers-desktop-files/ka/>\n"
 "Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -29,7 +30,7 @@ msgstr "წიწილების სიმღერ�"
 #. Name
 #: No-Ones-Laughing-3.jpg.desktop:3
 msgid "No One's Laughing"
-msgstr "�რ�ვინ �რ იცინის"
+msgstr "�რ�ვინ იცინის"
 
 #. Name
 #: Time-For-Lunch-2.jpg.desktop:3
@@ -44,27 +45,27 @@ msgstr "áƒ�ბსáƒ�ლუტურáƒ�დ áƒ�ხáƒ�ლი პრáƒ�დუქტá
 #. Name
 #: Trinity-lineart.svg.desktop:3
 msgid "Trinity Default"
-msgstr "TDE სტ�ნდ�რტული"
+msgstr "Trinity-ის ნ�გულისხმევი"
 
 #. Name
 #: Trinity4.png.desktop:3
 msgid "Trinity Default (old)"
-msgstr "TDE სტ�ნდ�რტული (old)"
+msgstr "Trinity-ის ნ�გულისხმევი (ძველი)"
 
 #. Name
 #: Won-Ton-Soup-3.jpg.desktop:3
 msgid "Won Ton Soup"
-msgstr "ვ�ნ ტ�ნი"
+msgstr "სუპი ვ�ნ ტ�ნი"
 
 #. Name
 #: aghi.jpg.desktop:3
 msgid "Aghi"
-msgstr ""
+msgstr "�ღი"
 
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr ""
+msgstr "თვითმფრინ�ვი"
 
 #. Name
 #: alta-badia.jpg.desktop:3
@@ -79,7 +80,7 @@ msgstr "ვენესუელის �ნდები"
 #. Name
 #: another-view.jpg.desktop:3
 msgid "Another View"
-msgstr ""
+msgstr "სხვ� ხედი"
 
 #. Name
 #: aurora.svgz.desktop:3
@@ -99,7 +100,7 @@ msgstr "კელტური"
 #. Name
 #: default_blue.jpg.desktop:3
 msgid "Default Blue"
-msgstr "თ�ვისთ�ვ�დი ლურჯი"
+msgstr "ნ�გულისხმევი ლურჯი"
 
 #. Name
 #: default_gears.jpg.desktop:3
@@ -119,7 +120,7 @@ msgstr "კბილ�ნ� გლ�ბუსი"
 #. Name
 #: green_curtain.jpg.desktop:3
 msgid "Green Curtain"
-msgstr ""
+msgstr "მწვ�ნე ფ�რდ�"
 
 #. Name
 #: here-gear.svgz.desktop:3
@@ -129,22 +130,22 @@ msgstr "ჩვენ კბილ�ნები ვ�რთ"
 #. Name
 #: horse-head-nebula.png.desktop:3
 msgid "Horse Head Nebula"
-msgstr ""
+msgstr "ცხენის თ�ვის თ�ნ�ვ�რსკვლ�ვედი"
 
 #. Name
 #: isadora.png.desktop:3
 msgid "Isadora"
-msgstr ""
+msgstr "იზ�დ�რ�"
 
 #. Name
 #: konqui.svgz.desktop:3
 msgid "Konqui"
-msgstr "კ�ნქი"
+msgstr "კ�ნქვი"
 
 #. Name
 #: lineart.svgz.desktop:3
 msgid "Lineart Logo"
-msgstr "გრ�ფიკული ლ�გ�"
+msgstr "ტ�ლღ�"
 
 #. Name
 #: moon.svgz.desktop:3
@@ -154,12 +155,12 @@ msgstr "მთვ�რე"
 #. Name
 #: mountain-lake.jpg.desktop:3
 msgid "Mountain Lake"
-msgstr ""
+msgstr "Mountain Lake"
 
 #. Name
 #: seaofconero.jpg.desktop:3
 msgid "Sea of Conero"
-msgstr "კ�ნერ� ზღვ�"
+msgstr "კ�ნერ�ს ზღვ�"
 
 #. Name
 #: soft-green.jpg.desktop:3
@@ -174,7 +175,7 @@ msgstr "სტელვი�"
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "ზ�ლები"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
@@ -189,4 +190,4 @@ msgstr "ს�მმ�გი კბილ�ნები"
 #. Name
 #: world-desktop.jpg.desktop:3
 msgid "World Desktop"
-msgstr ""
+msgstr "მს�ფლი� ს�მუშ�� მ�გიდ�"
diff --git a/translations/desktop_files/wallpapers-desktops/nl.po b/translations/desktop_files/wallpapers-desktops/nl.po
index 5a12815b3..74ec6657a 100644
--- a/translations/desktop_files/wallpapers-desktops/nl.po
+++ b/translations/desktop_files/wallpapers-desktops/nl.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Heimen Stoffels <vistausss@fastmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 19:13+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-01-07 19:11+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/wallpapers-desktop-files/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -34,7 +35,7 @@ msgstr "Niemand lacht"
 #. Name
 #: Time-For-Lunch-2.jpg.desktop:3
 msgid "Time For Lunch"
-msgstr "Tijd voor lunch"
+msgstr "Lunchtijd"
 
 #. Name
 #: Totally-New-Product-1.jpg.desktop:3
@@ -44,12 +45,12 @@ msgstr "Gloednieuw product"
 #. Name
 #: Trinity-lineart.svg.desktop:3
 msgid "Trinity Default"
-msgstr "Trinity Standaard"
+msgstr "Trinity (standaard)"
 
 #. Name
 #: Trinity4.png.desktop:3
 msgid "Trinity Default (old)"
-msgstr "Trinity Standaard (old)"
+msgstr "Trinity (standaard - verouderd)"
 
 #. Name
 #: Won-Ton-Soup-3.jpg.desktop:3
@@ -59,32 +60,32 @@ msgstr "Won Ton-soep"
 #. Name
 #: aghi.jpg.desktop:3
 msgid "Aghi"
-msgstr "Aghi"
+msgstr "Commotie"
 
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr "Airplane"
+msgstr "Vliegtuig"
 
 #. Name
 #: alta-badia.jpg.desktop:3
 msgid "Alta Badia"
-msgstr ""
+msgstr "Alta Badia"
 
 #. Name
 #: andes-venezolanos.svgz.desktop:3
 msgid "Andes Venezolanos"
-msgstr ""
+msgstr "Venezolaanse Andes"
 
 #. Name
 #: another-view.jpg.desktop:3
 msgid "Another View"
-msgstr "Another View"
+msgstr "Een andere kijk op zaken"
 
 #. Name
 #: aurora.svgz.desktop:3
 msgid "Aurora"
-msgstr ""
+msgstr "Poollicht"
 
 #. Name
 #: blue-bend.jpg.desktop:3
@@ -119,7 +120,7 @@ msgstr "Tandwielglobe"
 #. Name
 #: green_curtain.jpg.desktop:3
 msgid "Green Curtain"
-msgstr ""
+msgstr "Groen gordijn"
 
 #. Name
 #: here-gear.svgz.desktop:3
@@ -129,22 +130,22 @@ msgstr "Wij zijn tandwielen"
 #. Name
 #: horse-head-nebula.png.desktop:3
 msgid "Horse Head Nebula"
-msgstr ""
+msgstr "Paardenhoofdnevels"
 
 #. Name
 #: isadora.png.desktop:3
 msgid "Isadora"
-msgstr ""
+msgstr "Isadora"
 
 #. Name
 #: konqui.svgz.desktop:3
 msgid "Konqui"
-msgstr ""
+msgstr "Konqui"
 
 #. Name
 #: lineart.svgz.desktop:3
 msgid "Lineart Logo"
-msgstr "Lijnillustratie logo"
+msgstr "Lijnillustratielogo"
 
 #. Name
 #: moon.svgz.desktop:3
@@ -154,7 +155,7 @@ msgstr "Maan"
 #. Name
 #: mountain-lake.jpg.desktop:3
 msgid "Mountain Lake"
-msgstr "Mountain Lake"
+msgstr "Bergmeer"
 
 #. Name
 #: seaofconero.jpg.desktop:3
@@ -169,17 +170,17 @@ msgstr "Zachtgroen"
 #. Name
 #: stelvio.jpg.desktop:3
 msgid "Stelvio"
-msgstr ""
+msgstr "Stelvio"
 
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "Strepen"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
 msgid "Sunshine After The Rain"
-msgstr "Zonneschijn na regen"
+msgstr "Na regen komt zonneschijn"
 
 #. Name
 #: triplegears.jpg.desktop:3
@@ -189,4 +190,4 @@ msgstr "Drievoudige tandwielen"
 #. Name
 #: world-desktop.jpg.desktop:3
 msgid "World Desktop"
-msgstr ""
+msgstr "Wereldblad"
diff --git a/translations/desktop_files/wallpapers-desktops/ru.po b/translations/desktop_files/wallpapers-desktops/ru.po
index e0c92e03e..005fc8977 100644
--- a/translations/desktop_files/wallpapers-desktops/ru.po
+++ b/translations/desktop_files/wallpapers-desktops/ru.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-22 19:13+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: 2024-03-02 05:44+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/wallpapers-desktop-files/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -64,7 +66,7 @@ msgstr "Иголки"
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr "Airplane"
+msgstr "��роплан"
 
 #. Name
 #: alta-badia.jpg.desktop:3
@@ -79,7 +81,7 @@ msgstr "Вене�у�ла"
 #. Name
 #: another-view.jpg.desktop:3
 msgid "Another View"
-msgstr "Another View"
+msgstr "Другой вид"
 
 #. Name
 #: aurora.svgz.desktop:3
@@ -134,7 +136,7 @@ msgstr "Туманно�ть Кон�ка� Голова"
 #. Name
 #: isadora.png.desktop:3
 msgid "Isadora"
-msgstr ""
+msgstr "Изадора"
 
 #. Name
 #: konqui.svgz.desktop:3
@@ -174,7 +176,7 @@ msgstr "�ациональный парк Стельвио"
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "Поло�ы"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
diff --git a/translations/desktop_files/wallpapers-desktops/zh_CN.po b/translations/desktop_files/wallpapers-desktops/zh_CN.po
index 69c495fee..85f8262fe 100644
--- a/translations/desktop_files/wallpapers-desktops/zh_CN.po
+++ b/translations/desktop_files/wallpapers-desktops/zh_CN.po
@@ -1,20 +1,21 @@
 # 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-06-22 19:13+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-02-16 20:12+0000\n"
+"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/wallpapers-desktop-files/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.17\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -64,7 +65,7 @@ msgstr ""
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr ""
+msgstr "飞机"
 
 #. Name
 #: alta-badia.jpg.desktop:3
@@ -129,7 +130,7 @@ msgstr "齿轮在此(SVG)"
 #. Name
 #: horse-head-nebula.png.desktop:3
 msgid "Horse Head Nebula"
-msgstr ""
+msgstr "马头星云"
 
 #. Name
 #: isadora.png.desktop:3
@@ -154,7 +155,7 @@ msgstr "月亮(SVG)"
 #. Name
 #: mountain-lake.jpg.desktop:3
 msgid "Mountain Lake"
-msgstr ""
+msgstr "山湖"
 
 #. Name
 #: seaofconero.jpg.desktop:3
@@ -189,4 +190,4 @@ msgstr "三�齿轮"
 #. Name
 #: world-desktop.jpg.desktop:3
 msgid "World Desktop"
-msgstr ""
+msgstr "世界地图"
diff --git a/tsak/CMakeLists.txt b/tsak/CMakeLists.txt
index 4490636db..185816b94 100644
--- a/tsak/CMakeLists.txt
+++ b/tsak/CMakeLists.txt
@@ -23,6 +23,6 @@ link_directories(
 
 tde_add_executable( tsak
   SOURCES main.cpp
-  LINK udev
+  LINK ${UDEV_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/twin/CMakeLists.txt b/twin/CMakeLists.txt
index 33a2302e4..261e0eb34 100644
--- a/twin/CMakeLists.txt
+++ b/twin/CMakeLists.txt
@@ -15,7 +15,6 @@ add_subdirectory( lib )
 add_subdirectory( killer )
 add_subdirectory( resumer )
 add_subdirectory( kcmtwin )
-add_subdirectory( pics )
 add_subdirectory( clients )
 add_subdirectory( oldheaders )
 add_subdirectory( data )
@@ -40,10 +39,18 @@ link_directories(
 install( FILES KWinInterface.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### other data ################################
+##### icons #####################################
 
 tde_install_icons( twin )
 
+install(
+    DIRECTORY pics/
+    DESTINATION ${DATA_INSTALL_DIR}/twin/pics
+    FILES_MATCHING PATTERN *.png
+)
+
+##### other data ################################
+
 tde_create_translated_desktop(
   SOURCE eventsrc
   DESTINATION ${DATA_INSTALL_DIR}/twin
diff --git a/twin/KWinInterface.h b/twin/KWinInterface.h
index dbc132888..37fe2d9b6 100644
--- a/twin/KWinInterface.h
+++ b/twin/KWinInterface.h
@@ -18,7 +18,8 @@ class KWinInterface : virtual public DCOPObject
     virtual bool isResumeableWindowID(unsigned long winId) = 0;
     virtual void refresh() = 0;
     virtual void doNotManage(TQString)= 0;
-    virtual void showWindowMenuAt(unsigned long winId, int x, int y)= 0;
+    virtual void showWindowMenuAt(unsigned long winId, int x, int y) = 0;
+    virtual void showWindowMenu(unsigned long winId) = 0;
     virtual void kDestopResized() = 0;
     virtual void setDesktopLayout(int orientation, int x, int y)= 0;
     virtual bool setCurrentDesktop(int)= 0;
@@ -28,6 +29,10 @@ class KWinInterface : virtual public DCOPObject
     virtual void circulateDesktopApplications() = 0;
     virtual void updateOverlappingShadows(unsigned long window) = 0;
     virtual void setShadowed(unsigned long window, bool shadowed) = 0;
+    virtual void tileWindowToBorder(unsigned long w1, int location) = 0;
+    virtual void tileTwoWindowsHorizontally(unsigned long w1, unsigned long w2) = 0;
+    virtual void tileTwoWindowsVertically(unsigned long w1, unsigned long w2) = 0;
+    virtual void tileFourWindowsInGrid(unsigned long w1, unsigned long w2, unsigned long w3, unsigned long w4) = 0;
 
     // kompmgr stuff
     virtual void startKompmgr() = 0;
diff --git a/twin/activation.cpp b/twin/activation.cpp
index 0deb81798..69af35576 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -166,7 +166,7 @@ namespace KWinInternal
             be used, and it's old; also, creation timestamp is changed to
             the time the instance starts (re-)initializing the window,
             this ensures creation timestamp will still work somewhat even in this case
-    - KUniqueApplication - when the window is already visible, and the new instance
+    - TDEUniqueApplication - when the window is already visible, and the new instance
         wants it to activate
         - without focus stealing prevention - _NET_ACTIVE_WINDOW - no problem
         - with ASN - ASN is forwarded, and set on the already visible window, KWin
@@ -727,7 +727,7 @@ void Client::demandAttention( bool set )
         if( demandAttentionKNotifyTimer == NULL )
             {
             demandAttentionKNotifyTimer = new TQTimer( this );
-            connect( demandAttentionKNotifyTimer, TQT_SIGNAL( timeout()), TQT_SLOT( demandAttentionKNotify()));
+            connect( demandAttentionKNotifyTimer, TQ_SIGNAL( timeout()), TQ_SLOT( demandAttentionKNotify()));
             }
         demandAttentionKNotifyTimer->start( 1000, true );
         }
diff --git a/twin/client.cpp b/twin/client.cpp
index 75aa896d4..028c32c12 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -18,9 +18,9 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqdatetime.h>
 #include <tqimage.h>
 #include <tqfile.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <unistd.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tqwhatsthis.h>
 #include <twin.h>
 #include <kiconloader.h>
@@ -130,37 +130,37 @@ Client::Client( Workspace *ws )
     shadeHoverTimer = 0;
 
     configureRequestTimer = new TQTimer(this);
-    connect(configureRequestTimer, TQT_SIGNAL(timeout()), TQT_SLOT(configureRequestTimeout()));
+    connect(configureRequestTimer, TQ_SIGNAL(timeout()), TQ_SLOT(configureRequestTimeout()));
 
     shadowDelayTimer = new TQTimer(this);
     opacityCache = &activeOpacityCache;
     shadowAfterClient = NULL;
     shadowWidget = NULL;
     shadowMe = true;
-    connect(shadowDelayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(drawShadow()));
+    connect(shadowDelayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(drawShadow()));
 
     // set the initial mapping state
     mapping_state = WithdrawnState;
     desk = 0; // no desktop yet
 
     mode = PositionCenter;
-    buttonDown = FALSE;
-    moveResizeMode = FALSE;
+    buttonDown = false;
+    moveResizeMode = false;
 
     info = NULL;
 
     shade_mode = ShadeNone;
-    active = FALSE;
+    active = false;
     deleting = false;
-    keep_above = FALSE;
-    keep_below = FALSE;
-    is_shape = FALSE;
+    keep_above = false;
+    keep_below = false;
+    is_shape = false;
     motif_noborder = false;
-    motif_may_move = TRUE;
-    motif_may_resize = TRUE;
-    motif_may_close = TRUE;
+    motif_may_move = true;
+    motif_may_resize = true;
+    motif_may_close = true;
     fullscreen_mode = FullScreenNone;
-    skip_taskbar = FALSE;
+    skip_taskbar = false;
     original_skip_taskbar = false;
     minimized = false;
     hidden = false;
@@ -177,8 +177,8 @@ Client::Client( Workspace *ws )
     Ptakeactivity = 0;
     Pcontexthelp = 0;
     Pping = 0;
-    input = FALSE;
-    skip_pager = FALSE;
+    input = false;
+    skip_pager = false;
 
     max_mode = MaximizeRestore;
     maxmode_restore = MaximizeRestore;
@@ -224,7 +224,7 @@ void Client::releaseWindow( bool on_shutdown )
     deleting = true;
     workspace()->discardUsedWindowRules( this, true ); // remove ForceTemporarily rules
     StackingUpdatesBlocker blocker( workspace());
-    if (!custom_opacity) setOpacity(FALSE);
+    if (!custom_opacity) setOpacity(false);
     if (moveResizeMode)
        leaveMoveResize();
     removeShadow();
@@ -445,7 +445,7 @@ void Client::detectShapable()
         case NET::Menu :
         case NET::Dialog :
         case NET::Utility :
-            setShapable(FALSE);
+            setShapable(false);
           break;
         default:
             assert( false );
@@ -522,9 +522,9 @@ bool Client::isModalSystemNotification() const
     result = XGetWindowProperty(tqt_xdisplay(), window(), atoms->net_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data);
     if (result == Success && data && format == 32 )
         {
-        return TRUE;
+        return true;
         }
-    return FALSE;
+    return false;
     }
 
 void Client::updateShape()
@@ -541,7 +541,7 @@ void Client::updateShape()
         XShapeCombineShape(tqt_xdisplay(), frameId(), ShapeBounding,
                            clientPos().x(), clientPos().y(),
                            window(), ShapeBounding, ShapeSet);
-        setShapable(TRUE);
+        setShapable(true);
         }
     // !shape() mask setting is done in setMask() when the decoration
     // calls it or when the decoration is created/destroyed
@@ -709,7 +709,7 @@ void Client::unminimize( bool avoid_animation )
     if( isOnCurrentDesktop() && isShown( true ))
         {
         if( mainClients().isEmpty() && !avoid_animation )
-            animateMinimizeOrUnminimize( FALSE );
+            animateMinimizeOrUnminimize( false );
         }
     updateVisibility();
     updateAllowedActions();
@@ -778,7 +778,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
     float diff;
 
     TQPainter p ( workspace()->desktopWidget() );
-    bool need_to_clear = FALSE;
+    bool need_to_clear = false;
     TQPixmap pm3;
     do
         {
@@ -790,7 +790,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
             if ( need_to_clear )
                 {
                 p.drawPixmap( area2.x(), area2.y(), pm3 );
-                need_to_clear = FALSE;
+                need_to_clear = false;
                 }
             area2 = area;
             }
@@ -810,7 +810,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
             else
                 { // no overlap, we can clear later to avoid flicker
                 pm3 = pm2;
-                need_to_clear = TRUE;
+                need_to_clear = true;
                 }
             }
         } while ( t.elapsed() < step);
@@ -897,7 +897,7 @@ void Client::setShade( ShadeMode mode )
         XSelectInput( tqt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
         //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it
         //done xcompmgr workaround
-// FRAME       repaint( FALSE );
+// FRAME       repaint( false );
 //        bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
         int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1;
@@ -938,7 +938,7 @@ void Client::setShade( ShadeMode mode )
             resizeDecoration( TQSize( s.width(), h ));
             // assume a border
             // we do not have time to wait for X to send us paint events
-// FRAME           repaint( 0, h - step-5, width(), step+5, TRUE);
+// FRAME           repaint( 0, h - step-5, width(), step+5, true);
             TQApplication::syncX();
             } while ( h < s.height() - step );
 //        if ( !wasStaticContents )
@@ -946,7 +946,7 @@ void Client::setShade( ShadeMode mode )
         shade_geometry_change = false;
         plainResize( s );
         if( shade_mode == ShadeHover || shade_mode == ShadeActivated )
-            setActive( TRUE );
+            setActive( true );
         XMapWindow( tqt_xdisplay(), wrapperId());
         XMapWindow( tqt_xdisplay(), window());
         XDeleteProperty (tqt_xdisplay(), client, atoms->net_wm_window_shade);
@@ -1210,7 +1210,7 @@ void Client::drawDelayedShadow()
 void Client::drawShadowAfter(Client *after)
 {
     shadowAfterClient = after;
-    connect(after, TQT_SIGNAL(shadowDrawn()), TQT_SLOT(drawShadow()));
+    connect(after, TQ_SIGNAL(shadowDrawn()), TQ_SLOT(drawShadow()));
 }
 
 /*!
@@ -1224,7 +1224,7 @@ void Client::drawShadow()
 
     // If we are waiting for another Client's shadow to be drawn, stop waiting now
     if (shadowAfterClient != NULL) {
-        disconnect(shadowAfterClient, TQT_SIGNAL(shadowDrawn()), this, TQT_SLOT(drawShadow()));
+        disconnect(shadowAfterClient, TQ_SIGNAL(shadowDrawn()), this, TQ_SLOT(drawShadow()));
         shadowAfterClient = NULL;
     }
 
@@ -1791,7 +1791,7 @@ void Client::pingWindow()
     if( ping_timer != NULL )
         return; // pinging already
     ping_timer = new TQTimer( this );
-    connect( ping_timer, TQT_SIGNAL( timeout()), TQT_SLOT( pingTimeout()));
+    connect( ping_timer, TQ_SIGNAL( timeout()), TQ_SLOT( pingTimeout()));
     ping_timer->start( options->killPingTimeout, true );
     ping_timestamp = get_tqt_x_time();
     workspace()->sendPingToWindow( window(), ping_timestamp );
@@ -1850,8 +1850,8 @@ void Client::killProcess( bool ask, Time timestamp )
             << "--applicationname" << resourceClass()
             << "--wid" << TQCString().setNum( window())
             << "--timestamp" << TQCString().setNum( timestamp );
-        connect( process_killer, TQT_SIGNAL( processExited( TDEProcess* )),
-            TQT_SLOT( processKillerExited()));
+        connect( process_killer, TQ_SIGNAL( processExited( TDEProcess* )),
+            TQ_SLOT( processKillerExited()));
         if( !process_killer->start( TDEProcess::NotifyOnExit ))
             {
             delete process_killer;
@@ -1897,7 +1897,7 @@ bool Client::isSuspendable() const
             tcomm = basename(tbuf);
 #else /* default */
             TQString statString(statRaw);
-            TQStringList statFields = TQStringList::split(" ", statString, TRUE);
+            TQStringList statFields = TQStringList::split(" ", statString, true);
             TQString tcomm = statFields[1];
             TQString state = statFields[2];
 #endif /* default */
@@ -1967,7 +1967,7 @@ bool Client::isResumeable() const
             TQString state(TQChar(inf->pr_sname));
 #else /* default */
             TQString statString(statRaw);
-            TQStringList statFields = TQStringList::split(" ", statString, TRUE);
+            TQStringList statFields = TQStringList::split(" ", statString, true);
             TQString tcomm = statFields[1];
             TQString state = statFields[2];
 #endif /* default */
@@ -2002,8 +2002,8 @@ bool Client::queryUserSuspendedResume()
                 << "--windowname" << caption().utf8()
                 << "--applicationname" << resourceClass()
                 << "--wid" << TQCString().setNum( window());
-            connect( process_resumer, TQT_SIGNAL( processExited( TDEProcess* )),
-                TQT_SLOT( processResumerExited()));
+            connect( process_resumer, TQ_SIGNAL( processExited( TDEProcess* )),
+                TQ_SLOT( processResumerExited()));
             if( !process_resumer->start( TDEProcess::NotifyOnExit ))
                 {
                 delete process_resumer;
@@ -2422,11 +2422,11 @@ void Client::readIcons( Window win, TQPixmap* icon, TQPixmap* miniicon )
     {
     // get the icons, allow scaling
     if( icon != NULL )
-        *icon = KWin::icon( win, 32, 32, TRUE, KWin::NETWM | KWin::WMHints );
+        *icon = KWin::icon( win, 32, 32, true, KWin::NETWM | KWin::WMHints );
     if( miniicon != NULL )
         {
         if( icon == NULL || !icon->isNull())
-            *miniicon = KWin::icon( win, 16, 16, TRUE, KWin::NETWM | KWin::WMHints );
+            *miniicon = KWin::icon( win, 16, 16, true, KWin::NETWM | KWin::WMHints );
         else
             *miniicon = TQPixmap();
         }
@@ -2454,8 +2454,8 @@ void Client::getIcons()
         }
     if( icon_pix.isNull())
         { // and if nothing else, load icon from classhint or xapp icon
-        icon_pix = KWin::icon( window(), 32, 32, TRUE, KWin::ClassHint | KWin::XApp );
-        miniicon_pix = KWin::icon( window(), 16, 16, TRUE, KWin::ClassHint | KWin::XApp );
+        icon_pix = KWin::icon( window(), 32, 32, true, KWin::ClassHint | KWin::XApp );
+        miniicon_pix = KWin::icon( window(), 16, 16, true, KWin::ClassHint | KWin::XApp );
         }
     if( isManaged() && decoration != NULL )
         decoration->iconChange();
@@ -3022,9 +3022,9 @@ bool Client::getWindowOpacity() //query translucency settings from X, returns tr
         custom_opacity = true;
 //         setOpacity(opacity_ < 0xFFFFFFFF, opacity_);
         XFree ((char*)data);
-        return TRUE;
+        return true;
         }
-    return FALSE;
+    return false;
     }
 
 void Client::setCustomOpacityFlag(bool custom)
@@ -3046,14 +3046,14 @@ bool Client::touches(const Client* c)
 // checks if this client borders c, needed to test beep media player window state
     {
     if (y() == c->y() + c->height()) // this bottom to c
-        return TRUE;
+        return true;
     if (y() + height() == c->y()) // this top to c
-        return TRUE;
+        return true;
     if (x() == c->x() + c->width()) // this right to c
-        return TRUE;
+        return true;
     if (x() + width() == c->x()) // this left to c
-        return TRUE;
-    return FALSE;
+        return true;
+    return false;
     }
 
 void Client::setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth)
diff --git a/twin/client.h b/twin/client.h
index 944b837f6..178c718c4 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -233,13 +233,16 @@ class Client : public TQObject, public KDecorationDefines
         void resizeWithChecks( const TQSize& s, ForceGeometry_t force = NormalGeometrySet );
         void keepInArea( TQRect area, bool partial = false );
         void setActiveBorderMode( ActiveMaximizingMode mode );
+        void setActiveBorderPos( TQPoint pos );
         void setActiveBorder( ActiveBorder border);
         ActiveMaximizingMode activeBorderMode() const;
+        TQPoint activeBorderPos() const;
         ActiveBorder activeBorder() const;
         void setActiveBorderMaximizing(bool maximizing);
         void cancelActiveBorderMaximizing();
         bool isActiveBorderMaximizing() const;
         TQRect activeBorderMaximizeGeometry();
+        void tileToBorder(ActiveBorder border);
 
         void growHorizontal();
         void shrinkHorizontal();
@@ -613,8 +616,8 @@ class Client : public TQObject, public KDecorationDefines
 
         bool activeMaximizing;
         bool activeTiled;
-        TQRect activeTiledOrigGeom;
         ActiveMaximizingMode activeMode;
+        TQPoint activePos;
         ActiveBorder currentActiveBorder;
 
         friend bool performTransiencyCheck();
@@ -758,7 +761,7 @@ inline bool Client::isOnAllDesktops() const
     }
 /*!
   Returns whether the client is on the virtual desktop \a d.
-  This is always TRUE for onAllDesktops clients.
+  This is always true for onAllDesktops clients.
  */
 inline bool Client::isOnDesktop( int d ) const
     {
diff --git a/twin/clients/PORTING b/twin/clients/PORTING
index 199ddb9de..3db8af576 100644
--- a/twin/clients/PORTING
+++ b/twin/clients/PORTING
@@ -84,7 +84,7 @@ inline const KDecorationOptions* options() { return KDecoration::options(); }
 - Replace 'contextHelp()' with 'showContextHelp()'.
 - WindowWrapperShowEvent() is gone, simply use showEvent() filtered by the event filter if needed.
 - Change 'animateIconifyOrDeiconify()' to 'animateMinize()', if it's empty, simply remove it.
-  Make sure it doesn't reenter the event loop (no kapp->processEvents()).
+  Make sure it doesn't reenter the event loop (no tdeApp->processEvents()).
 - Buttons should use explicit setCursor() if they don't want cursor set by mousePosition().
   I.e. usually call setCursor( ArrowCursor ) in your MyButton.
 - In the part where you insert windowWrapper() into the layout, i.e. something like
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 6339402b7..571b16909 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -82,7 +82,7 @@ static bool drawSmallBorders = false;
 
 // =====================================
 
-extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+extern "C" TDE_EXPORT KDecorationFactory* create_factory()
 {
     return new B2::B2ClientFactory();
 }
@@ -444,9 +444,9 @@ bool B2Client::isModalSystemNotification()
     result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data);
     if (result == Success && data != None && format == 32 )
         {
-        return TRUE;
+        return true;
         }
-    return FALSE;
+    return false;
 }
 
 void B2Client::addButtons(const TQString& s, const TQString tips[],
@@ -464,8 +464,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 			TQt::LeftButton | TQt::RightButton);
 		button[BtnMenu]->setPixmaps(P_MENU);
 		button[BtnMenu]->setUseMiniIcon();
-		connect(button[BtnMenu], TQT_SIGNAL(pressed()),
-			this, TQT_SLOT(menuButtonPressed()));
+		connect(button[BtnMenu], TQ_SIGNAL(pressed()),
+			this, TQ_SLOT(menuButtonPressed()));
 		titleLayout->addWidget(button[BtnMenu]);
 	    }
 	  }
@@ -477,8 +477,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 		button[BtnSticky]->setPixmaps(P_PINUP);
 		button[BtnSticky]->setToggle();
 		button[BtnSticky]->setDown(isOnAllDesktops());
-		connect(button[BtnSticky], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(toggleOnAllDesktops()));
+		connect(button[BtnSticky], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(toggleOnAllDesktops()));
 		titleLayout->addWidget(button[BtnSticky]);
 	    }
 	  }
@@ -487,8 +487,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (providesContextHelp() && (!button[BtnHelp])) {
 		button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]);
 		button[BtnHelp]->setPixmaps(P_HELP);
-		connect(button[BtnHelp], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(showContextHelp()));
+		connect(button[BtnHelp], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(showContextHelp()));
 		titleLayout->addWidget(button[BtnHelp]);
 	    }
 	    break;
@@ -496,8 +496,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (isMinimizable() && (!button[BtnIconify])) {
 		button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]);
 		button[BtnIconify]->setPixmaps(P_ICONIFY);
-		connect(button[BtnIconify], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(minimize()));
+		connect(button[BtnIconify], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(minimize()));
 		titleLayout->addWidget(button[BtnIconify]);
 	    }
 	    break;
@@ -507,8 +507,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 			TQt::LeftButton | TQt::MidButton | TQt::RightButton);
 		button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ?
 			P_NORMALIZE : P_MAX);
-		connect(button[BtnMax], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(maxButtonClicked()));
+		connect(button[BtnMax], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(maxButtonClicked()));
 		titleLayout->addWidget(button[BtnMax]);
 	    }
 	    break;
@@ -516,8 +516,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (isCloseable() && !button[BtnClose]) {
 		button[BtnClose] = new B2Button(this, tb, tips[BtnClose]);
 		button[BtnClose]->setPixmaps(P_CLOSE);
-		connect(button[BtnClose], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(closeWindow()));
+		connect(button[BtnClose], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(closeWindow()));
 		titleLayout->addWidget(button[BtnClose]);
 	    }
 	    break;
@@ -525,8 +525,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (isShadeable() && !button[BtnShade]) {
 		button[BtnShade] = new B2Button(this, tb, tips[BtnShade]);
 		button[BtnShade]->setPixmaps(P_SHADE);
-		connect(button[BtnShade], TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(shadeButtonClicked()));
+		connect(button[BtnShade], TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(shadeButtonClicked()));
 		titleLayout->addWidget(button[BtnShade]);
 	    }
 	    break;
@@ -534,8 +534,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	    if (resizable && !button[BtnResize]) {
 		button[BtnResize] = new B2Button(this, tb, tips[BtnResize]);
 		button[BtnResize]->setPixmaps(P_RESIZE);
-		connect(button[BtnResize], TQT_SIGNAL(pressed()),
-			this, TQT_SLOT(resizeButtonPressed()));
+		connect(button[BtnResize], TQ_SIGNAL(pressed()),
+			this, TQ_SLOT(resizeButtonPressed()));
 		titleLayout->addWidget(button[BtnResize]);
 	    }
 	    break;
diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp
index 5b7a29e0f..70942bce1 100644
--- a/twin/clients/b2/config/config.cpp
+++ b/twin/clients/b2/config/config.cpp
@@ -15,7 +15,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
+	TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new B2Config(conf, parent));
 	}
@@ -70,12 +70,12 @@ B2Config::B2Config( TDEConfig* conf, TQWidget* parent )
 	load(conf);
 
 	// Ensure we track user changes properly
-	connect(cbColorBorder, TQT_SIGNAL(clicked()),
-			this, TQT_SLOT(slotSelectionChanged()));
-    connect(showGrabHandleCb, TQT_SIGNAL(clicked()),
-		    this, TQT_SLOT(slotSelectionChanged()));
-    connect(menuDblClickOp, TQT_SIGNAL(activated(int)),
-		    this, TQT_SLOT(slotSelectionChanged()));
+	connect(cbColorBorder, TQ_SIGNAL(clicked()),
+			this, TQ_SLOT(slotSelectionChanged()));
+    connect(showGrabHandleCb, TQ_SIGNAL(clicked()),
+		    this, TQ_SLOT(slotSelectionChanged()));
+    connect(menuDblClickOp, TQ_SIGNAL(activated(int)),
+		    this, TQ_SLOT(slotSelectionChanged()));
 	// Make the widgets visible in twindecoration
 	gb->show();
 }
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp
index 886077925..054279fc0 100644
--- a/twin/clients/default/config/config.cpp
+++ b/twin/clients/default/config/config.cpp
@@ -17,7 +17,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
+	TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new KDEDefaultConfig(conf, parent));
 	}
@@ -61,13 +61,13 @@ KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( cbShowStipple, TQT_SIGNAL(clicked()), 
-			 this, TQT_SLOT(slotSelectionChanged()) );
-	connect( cbShowGrabBar, TQT_SIGNAL(clicked()), 
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbShowStipple, TQ_SIGNAL(clicked()), 
+			 this, TQ_SLOT(slotSelectionChanged()) );
+	connect( cbShowGrabBar, TQ_SIGNAL(clicked()), 
+			 this, TQ_SLOT(slotSelectionChanged()) );
 	if (highcolor)
-		connect( cbUseGradients, TQT_SIGNAL(clicked()), 
-				 this, TQT_SLOT(slotSelectionChanged()) );
+		connect( cbUseGradients, TQ_SIGNAL(clicked()), 
+				 this, TQ_SLOT(slotSelectionChanged()) );
 
 	// Make the widgets visible in twindecoration
 	gb->show();
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 3513ca5df..33eb46f4d 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -1060,7 +1060,7 @@ TQRegion KDEDefaultClient::cornerShape(WindowCorner corner)
 } // namespace
 
 // Extended KWin plugin interface
-extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+extern "C" TDE_EXPORT KDecorationFactory* create_factory()
 {
     return new Default::KDEDefaultHandler();
 }
diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp
index dfd5e20aa..408c5a38a 100644
--- a/twin/clients/keramik/config/config.cpp
+++ b/twin/clients/keramik/config/config.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
+	TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return ( new KeramikConfig( conf, parent ) );
 	}
@@ -55,10 +55,10 @@ KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent )
 	c = new TDEConfig( "twinkeramikrc" );
 	
 	ui = new KeramikConfigUI( parent );
-	connect( ui->showAppIcons,    TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
-	connect( ui->smallCaptions,   TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
-	connect( ui->largeGrabBars,   TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
-	connect( ui->useShadowedText, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
+	connect( ui->showAppIcons,    TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
+	connect( ui->smallCaptions,   TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
+	connect( ui->largeGrabBars,   TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
+	connect( ui->useShadowedText, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) );
 
 	load( conf );
 	ui->show();
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index fe7cc37d7..d5c441a26 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -907,8 +907,8 @@ KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* fac
 
 void KeramikClient::init()
 {
-	connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool )));
-	connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool )));
+	connect( this, TQ_SIGNAL( keepAboveChanged( bool )), TQ_SLOT( keepAboveChange( bool )));
+	connect( this, TQ_SIGNAL( keepBelowChanged( bool )), TQ_SLOT( keepBelowChange( bool )));
 
         createMainWidget( (WFlags)(WStaticContents | WResizeNoErase | WRepaintNoErase) );
 	widget()->installEventFilter( this );
@@ -1035,9 +1035,9 @@ bool KeramikClient::isModalSystemNotification()
     result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data);
     if (result == Success && data != None && format == 32 )
         {
-        return TRUE;
+        return true;
         }
-    return FALSE;
+    return false;
 }
 
 void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
@@ -1051,7 +1051,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 				if (!isModalSystemNotification()) {
 					if ( !button[MenuButton] ) {
 						button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton );
-						connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) );
+						connect( button[MenuButton], TQ_SIGNAL( pressed() ), TQ_SLOT( menuButtonPressed() ) );
 						layout->addWidget( button[MenuButton] );
 					}
 				}
@@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 								OnAllDesktopsButton, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops") );
 						if(isOnAllDesktops())
 							button[OnAllDesktopsButton]->toggle();
-						connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) );
+						connect( button[OnAllDesktopsButton], TQ_SIGNAL( clicked() ), TQ_SLOT( toggleOnAllDesktops() ) );
 						layout->addWidget( button[OnAllDesktopsButton] );
 					}
 				}
@@ -1075,7 +1075,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'H' :
 				if ( !button[HelpButton] && providesContextHelp() ) {
 					button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") );
-					connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) );
+					connect( button[HelpButton], TQ_SIGNAL( clicked() ), TQ_SLOT( showContextHelp() ) );
 					layout->addWidget( button[HelpButton] );
 				}
 				break;
@@ -1084,7 +1084,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'I' :
 				if ( !button[MinButton] && isMinimizable() ) {
 					button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") );
-					connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) );
+					connect( button[MinButton], TQ_SIGNAL( clicked() ), TQ_SLOT( minimize() ) );
 					layout->addWidget( button[MinButton] );
 				}
 				break;
@@ -1093,7 +1093,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'A' :
 				if ( !button[MaxButton] && isMaximizable() ) {
 					button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton );
-					connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) );
+					connect( button[MaxButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotMaximize() ) );
 					layout->addWidget( button[MaxButton] );
 				}
 				break;
@@ -1102,7 +1102,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'X' :
 				if ( !button[CloseButton] && isCloseable() ) {
 					button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") );
-					connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) );
+					connect( button[CloseButton], TQ_SIGNAL( clicked() ), TQ_SLOT( closeWindow() ) );
 					layout->addWidget( button[CloseButton] );
 				}
 				break;
@@ -1111,7 +1111,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'F' :
 				if ( !button[AboveButton]) {
 					button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") );
-					connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) );
+					connect( button[AboveButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotAbove() ) );
 					layout->addWidget( button[AboveButton] );
 				}
 				break;
@@ -1120,7 +1120,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'B' :
 				if ( !button[BelowButton]) {
 					button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") );
-					connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) );
+					connect( button[BelowButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotBelow() ) );
 					layout->addWidget( button[BelowButton] );
 				}
 				break;
@@ -1130,7 +1130,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 				if ( !button[ShadeButton] && isShadeable() ) {
 					button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton,
                                             isSetShade() ? i18n("Unshade") : i18n( "Shade" ));
-					connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) );
+					connect( button[ShadeButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotShade() ) );
 					layout->addWidget( button[ShadeButton] );
 				}
 				break;
@@ -1662,7 +1662,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 			widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4,
 							titlebar->geometry().bottom() ) ) );
 			// Titlebar needs no paint event
-			TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) );
+			TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) );
 		}
 	}
 }
@@ -1836,7 +1836,7 @@ bool KeramikClient::eventFilter( TQObject* o, TQEvent* e )
 
 extern "C"
 {
-	KDE_EXPORT KDecorationFactory *create_factory()
+	TDE_EXPORT KDecorationFactory *create_factory()
 	{
 		Keramik::clientHandler = new Keramik::KeramikHandler();
                 return Keramik::clientHandler;
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 27af172e1..3f0e209ec 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -1,10 +1,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeglobal.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
 
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
         TQDir().mkdir(localDirStr);
 
     TQFileInfo fi(f);
-    KSimpleConfig input(fi.absFilePath());
+    TDESimpleConfig input(fi.absFilePath());
     srcStr = fi.dirPath(true) + "/";
     TDEConfig *output = TDEGlobal::config();
     input.setGroup("Window Border");
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 4daffae7c..b0473261b 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -5,7 +5,7 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 #include <kpixmapeffect.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tqbitmap.h>
@@ -293,8 +293,8 @@ void KWMThemeClient::init()
             iconChange();
             hb->addWidget(mnuBtn);
             mnuBtn->setFixedSize(20, 20);
-            connect(mnuBtn, TQT_SIGNAL(pressed()), this,
-                    TQT_SLOT(menuButtonPressed()));
+            connect(mnuBtn, TQ_SIGNAL(pressed()), this,
+                    TQ_SLOT(menuButtonPressed()));
         }
         else if(val == "Sticky"){
             stickyBtn = new MyButton(widget(), "sticky");
@@ -303,7 +303,7 @@ void KWMThemeClient::init()
                 stickyBtn->setPixmap(*pindownPix);
             else
                 stickyBtn->setPixmap(*pinupPix);
-            connect(stickyBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(toggleOnAllDesktops()));
+            connect(stickyBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT(toggleOnAllDesktops()));
             hb->addWidget(stickyBtn);
             stickyBtn->setFixedSize(20, 20);
         }
@@ -311,7 +311,7 @@ void KWMThemeClient::init()
             btn = new MyButton(widget(), "iconify");
             TQToolTip::add( btn, i18n("Minimize"));
             btn->setPixmap(*iconifyPix);
-            connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize()));
+            connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize()));
             hb->addWidget(btn);
             btn->setFixedSize(20, 20);
         }
@@ -319,7 +319,7 @@ void KWMThemeClient::init()
             maxBtn = new MyButton(widget(), "max");
             TQToolTip::add( maxBtn, i18n("Maximize"));
             maxBtn->setPixmap(*maxPix);
-            connect(maxBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(maximize()));
+            connect(maxBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(maximize()));
             hb->addWidget(maxBtn);
             maxBtn->setFixedSize(20, 20);
         }
@@ -327,7 +327,7 @@ void KWMThemeClient::init()
             btn = new MyButton(widget(), "close");
             TQToolTip::add( btn, i18n("Close"));
             btn->setPixmap(*closePix);
-            connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow()));
+            connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow()));
             hb->addWidget(btn);
             btn->setFixedSize(20, 20);
         }
@@ -927,7 +927,7 @@ TODO
 
 extern "C"
 {
-	KDE_EXPORT KDecorationFactory *create_factory()
+	TDE_EXPORT KDecorationFactory *create_factory()
 	{
                 return new KWMTheme::KWMThemeFactory();
 	}
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 30fb76b3a..b0bc659dd 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -65,7 +65,7 @@ static bool pixmaps_created = false;
 
 // =====================================
 
-extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+extern "C" TDE_EXPORT KDecorationFactory* create_factory()
 {
     return new Laptop::LaptopClientFactory();
 }
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 4512203c4..c353abc1b 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -12,7 +12,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent)
+	TDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent)
 	{
 		return(new ModernSysConfig(conf, parent));
 	}
@@ -44,7 +44,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p
 			"easier, especially for trackballs and other mouse replacements "
 			"on laptops."));
         layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1);
-	connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()));
+	connect(cbShowHandle, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()));
 
 	sliderBox = new TQVBox(handleBox);
 	handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox);
@@ -52,12 +52,12 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p
 			i18n("Here you can change the size of the resize handle."));
 	handleSizeSlider->setTickInterval(1);
 	handleSizeSlider->setTickmarks(TQSlider::Below);
-	connect(handleSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSelectionChanged()));
+	connect(handleSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSelectionChanged()));
 
 	hbox = new TQHBox(sliderBox);
 	hbox->setSpacing(6);
 
-	bool rtl = kapp->reverseLayout();
+	bool rtl = tdeApp->reverseLayout();
 	label1 = new TQLabel(i18n("Small"), hbox);
 	label1->setAlignment(rtl ? AlignRight : AlignLeft);
 	label2 = new TQLabel(i18n("Medium"), hbox);
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index 94615b190..3777df9d8 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -731,7 +731,7 @@ bool ModernSysFactory::supports( Ability ability )
 }
 
 // KWin extended plugin interface
-extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+extern "C" TDE_EXPORT KDecorationFactory* create_factory()
 {
     return new ModernSystem::ModernSysFactory();
 }
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index 04658796c..0fdc126e2 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -49,16 +49,16 @@ PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent)
     load(config);
 
     // setup the connections
-    connect(m_dialog->titleAlign, TQT_SIGNAL(clicked(int)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->animateButtons, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->menuClose, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->titleShadow, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->coloredBorder, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
+    connect(m_dialog->titleAlign, TQ_SIGNAL(clicked(int)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->animateButtons, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->menuClose, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->titleShadow, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->coloredBorder, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
 }
 
 PlastikConfig::~PlastikConfig()
@@ -115,7 +115,7 @@ void PlastikConfig::defaults()
 
 extern "C"
 {
-    KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
+    TDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
         return (new PlastikConfig(config, parent));
     }
 }
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index b5a4808d7..6f835fde8 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -590,7 +590,7 @@ PlastikHandler* Handler()
 
 extern "C"
 {
-    KDE_EXPORT KDecorationFactory *create_factory()
+    TDE_EXPORT KDecorationFactory *create_factory()
     {
         KWinPlastik::handler = new KWinPlastik::PlastikHandler();
         return KWinPlastik::handler;
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 5fdadc8e1..3f3f81f62 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -51,7 +51,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent, const char
     // no need to reset here as the button will be resetted on first resize.
 
     animTmr = new TQTimer(this);
-    connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) );
+    connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) );
     animProgress = 0;
 }
 
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index 70dc87965..f6bd853b1 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -15,7 +15,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
+	TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new QuartzConfig(conf, parent));
 	}
@@ -49,8 +49,8 @@ QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
-	connect( cbExtraSmall,  TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbColorBorder, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) );
+	connect( cbExtraSmall,  TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) );
 
 	// Make the widgets visible in twindecoration
 	gb->show();
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index dff79ff4b..31a0dbcf1 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -783,7 +783,7 @@ void QuartzClient::paintEvent( TQPaintEvent* )
 /////////////////////////////////
 extern "C"
 {
-	KDE_EXPORT KDecorationFactory *create_factory()
+	TDE_EXPORT KDecorationFactory *create_factory()
 	{
 		Quartz::clientHandler = new Quartz::QuartzHandler();
 		return Quartz::clientHandler;
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index 6deddeaee..006f19122 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -688,7 +688,7 @@ TQValueList< RedmondDecoFactory::BorderSize > RedmondDecoFactory::borderSizes()
 
 }
 
-extern "C" KDE_EXPORT KDecorationFactory *create_factory()
+extern "C" TDE_EXPORT KDecorationFactory *create_factory()
 {
 	return new Redmond::RedmondDecoFactory();
 }
diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index e306520d5..113254f98 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/clients/test/test.cpp
@@ -24,7 +24,7 @@ void Decoration::init()
         button->show();
         button->setCursor( TQt::arrowCursor );
 	button->move( 0, 0 );
-        connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow()));
+        connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( closeWindow()));
 	TQToolTip::add( button, "Zelva Mana" );
 	}
     }
@@ -333,7 +333,7 @@ bool Factory::reset( unsigned long changed )
 extern "C"
 {
 
-KDE_EXPORT KDecorationFactory *create_factory()
+TDE_EXPORT KDecorationFactory *create_factory()
     {
     return new KWinTest::Factory();
     }
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 5c2457e1c..f40dc552b 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -29,7 +29,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KDecorationFactory *create_factory()
+  TDE_EXPORT KDecorationFactory *create_factory()
   {
     return new Web::WebFactory();
   }
diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt
index d432b533f..8e29dd12c 100644
--- a/twin/compton-tde/CMakeLists.txt
+++ b/twin/compton-tde/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
   ${XINERAMA_INCLUDE_DIRS}
   ${XRANDR_INCLUDE_DIRS}
   ${GL_INCLUDE_DIRS}
-  ${LIBPCRE_INCLUDE_DIRS}
+  ${LIBPCRE2_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -33,7 +33,7 @@ link_directories(
   ${XINERAMA_LIBRARY_DIRS}
   ${XRANDR_LIBRARY_DIRS}
   ${GL_LIBRARY_DIRS}
-  ${LIBPCRE_LIBRARY_DIRS}
+  ${LIBPCRE2_LIBRARY_DIRS}
 )
 
 
@@ -46,8 +46,8 @@ link_directories(
 #  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL
 #  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL_GLSL
 #  WITH_OPENGL            -> CONFIG_VSYNC_OPENGL_FBO
-#  WITH_PCRE              -> CONFIG_REGEX_PCRE
-#  WITH_PCRE              -> CONFIG_REGEX_PCRE_JIT
+#  WITH_PCRE2             -> CONFIG_REGEX_PCRE2
+#  WITH_PCRE2             -> CONFIG_REGEX_PCRE2_JIT
 #  WITH_LIBCONFIG         -> CONFIG_LIBCONFIG
 #
 #  HAVE_LIBCONFIG_OLD_API -> CONFIG_LIBCONFIG_LEGACY (set up in compton_config.h)
@@ -90,10 +90,10 @@ if( WITH_XRANDR )
   list( APPEND compton_LIBRARIES ${XRANDR_LIBRARIES} )
 endif( )
 
-if( WITH_PCRE )
-  set( CONFIG_REGEX_PCRE        ${WITH_PCRE} )
-  set( CONFIG_REGEX_PCRE_JIT    ${WITH_PCRE} )
-  list( APPEND compton_LIBRARIES ${LIBPCRE_LIBRARIES} )
+if( WITH_PCRE2 )
+  set( CONFIG_REGEX_PCRE2        ${WITH_PCRE2} )
+  set( CONFIG_REGEX_PCRE2_JIT    ${WITH_PCRE2} )
+  list( APPEND compton_LIBRARIES ${LIBPCRE2_LIBRARIES} )
 endif( )
 
 configure_file( compton_config.h.cmake compton_config.h )
diff --git a/twin/compton-tde/c2.c b/twin/compton-tde/c2.c
index 6baf1337e..147cb781d 100644
--- a/twin/compton-tde/c2.c
+++ b/twin/compton-tde/c2.c
@@ -785,33 +785,34 @@ c2_l_postprocess(session_t *ps, c2_l_t *pleaf) {
 
   // PCRE patterns
   if (C2_L_PTSTRING == pleaf->ptntype && C2_L_MPCRE == pleaf->match) {
-#ifdef CONFIG_REGEX_PCRE
-    const char *error = NULL;
-    int erroffset = 0;
-    int options = 0;
+#ifdef CONFIG_REGEX_PCRE2
+    int errorCode;
+    PCRE2_SIZE errorOffset;
+    uint32_t options = 0;
 
     // Ignore case flag
     if (pleaf->match_ignorecase)
-      options |= PCRE_CASELESS;
+      options |= PCRE2_CASELESS;
 
-    // Compile PCRE expression
-    pleaf->regex_pcre = pcre_compile(pleaf->ptnstr, options,
-        &error, &erroffset, NULL);
+    // Compile PCRE2 expression
+    pleaf->regex_pcre = pcre2_compile((PCRE2_SPTR)pleaf->ptnstr, PCRE2_ZERO_TERMINATED,
+            options, &errorCode, &errorOffset, NULL);
     if (!pleaf->regex_pcre)
-      c2_error("Pattern \"%s\": PCRE regular expression parsing failed on "
-          "offset %d: %s", pleaf->ptnstr, erroffset, error);
-#ifdef CONFIG_REGEX_PCRE_JIT
-    pleaf->regex_pcre_extra = pcre_study(pleaf->regex_pcre,
-        PCRE_STUDY_JIT_COMPILE, &error);
-    if (!pleaf->regex_pcre_extra) {
-      printf("Pattern \"%s\": PCRE regular expression study failed: %s",
-          pleaf->ptnstr, error);
+    {
+      PCRE2_UCHAR errorMsg[256];
+      pcre2_get_error_message(errorCode, errorMsg, sizeof(errorMsg));
+      c2_error("Pattern \"%s\": PCRE2 regular expression parsing failed on "
+          "offset %zu: %s", pleaf->ptnstr, errorOffset, errorMsg);
+    }
+#ifdef CONFIG_REGEX_PCRE2_JIT
+    int jit_res = pcre2_jit_compile(pleaf->regex_pcre, PCRE2_JIT_COMPLETE);
+    if (jit_res < 0)
+    {
+      printf("Pattern \"%s\": PCRE2 regular expression JIT compilation failed with error code %d",
+          pleaf->ptnstr, jit_res);
     }
 #endif
 
-    // Free the target string
-    // free(pleaf->tgt);
-    // pleaf->tgt = NULL;
 #else
     c2_error("PCRE regular expression support not compiled in.");
 #endif
@@ -844,9 +845,8 @@ c2_free(c2_ptr_t p) {
 
     free(pleaf->tgt);
     free(pleaf->ptnstr);
-#ifdef CONFIG_REGEX_PCRE
-    pcre_free(pleaf->regex_pcre);
-    LPCRE_FREE_STUDY(pleaf->regex_pcre_extra);
+#ifdef CONFIG_REGEX_PCRE2
+    pcre2_code_free(pleaf->regex_pcre);
 #endif
     free(pleaf);
   }
@@ -1180,10 +1180,9 @@ c2_match_once_leaf(session_t *ps, win *w, const c2_l_t *pleaf,
                 }
                 break;
               case C2_L_MPCRE:
-#ifdef CONFIG_REGEX_PCRE
-                *pres = (pcre_exec(pleaf->regex_pcre,
-                      pleaf->regex_pcre_extra,
-                      tgt, strlen(tgt), 0, 0, NULL, 0) >= 0);
+#ifdef CONFIG_REGEX_PCRE2
+                *pres = (pcre2_match(pleaf->regex_pcre, (PCRE2_SPTR)tgt, PCRE2_ZERO_TERMINATED,
+                         0, 0, NULL, NULL) >= 0);
 #else
                 assert(0);
 #endif
diff --git a/twin/compton-tde/c2.h b/twin/compton-tde/c2.h
index 9e04c09a8..c84836c25 100644
--- a/twin/compton-tde/c2.h
+++ b/twin/compton-tde/c2.h
@@ -13,18 +13,10 @@
 #include <fnmatch.h>
 #include <ctype.h>
 
-// libpcre
-#ifdef CONFIG_REGEX_PCRE
-#include <pcre.h>
-
-// For compatiblity with <libpcre-8.20
-#ifndef PCRE_STUDY_JIT_COMPILE
-#define PCRE_STUDY_JIT_COMPILE    0
-#define LPCRE_FREE_STUDY(extra)   pcre_free(extra)
-#else
-#define LPCRE_FREE_STUDY(extra)   pcre_free_study(extra)
-#endif
-
+// libpcre2
+#ifdef CONFIG_REGEX_PCRE2
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 #endif
 
 #define C2_MAX_LEVELS 10
@@ -139,9 +131,8 @@ struct _c2_l {
   } ptntype;
   char *ptnstr;
   long ptnint;
-#ifdef CONFIG_REGEX_PCRE
-  pcre *regex_pcre;
-  pcre_extra *regex_pcre_extra;
+#ifdef CONFIG_REGEX_PCRE2
+  pcre2_code *regex_pcre;
 #endif
 };
 
diff --git a/twin/compton-tde/common.h b/twin/compton-tde/common.h
index 9091fc582..d92396cdf 100644
--- a/twin/compton-tde/common.h
+++ b/twin/compton-tde/common.h
@@ -38,12 +38,10 @@
 // #define MONITOR_REPAINT  1
 // #define DEBUG_FADE       1
 
-// Whether to enable PCRE regular expression support in blacklists, enabled
-// by default
-// #define CONFIG_REGEX_PCRE 1
-// Whether to enable JIT support of libpcre. This may cause problems on PaX
-// kernels.
-// #define CONFIG_REGEX_PCRE_JIT 1
+// Whether to enable PCRE2 regular expression support in blacklists, enabled by default
+// #define CONFIG_REGEX_PCRE2 1
+// Whether to enable JIT support of libpcre2. This may cause problems on PaX kernels.
+// #define CONFIG_REGEX_PCRE2_JIT 1
 // Whether to enable parsing of configuration files using libconfig.
 // #define CONFIG_LIBCONFIG 1
 // Whether we are using a legacy version of libconfig (1.3.x).
diff --git a/twin/compton-tde/compton_config.h.cmake b/twin/compton-tde/compton_config.h.cmake
index bf3f22543..b534b1b80 100644
--- a/twin/compton-tde/compton_config.h.cmake
+++ b/twin/compton-tde/compton_config.h.cmake
@@ -1,11 +1,9 @@
 #include "config.h"
 
-// Whether to enable PCRE regular expression support in blacklists, enabled
-// by default
-#cmakedefine CONFIG_REGEX_PCRE 1
-// Whether to enable JIT support of libpcre. This may cause problems on PaX
-// kernels.
-#cmakedefine CONFIG_REGEX_PCRE_JIT 1
+// Whether to enable PCRE2 regular expression support in blacklists, enabled by default
+#cmakedefine CONFIG_REGEX_PCRE2 1
+// Whether to enable JIT support of libpcre2. This may cause problems on PaX kernels.
+#cmakedefine CONFIG_REGEX_PCRE2_JIT 1
 
 // Whether to enable parsing of configuration files using libconfig.
 #cmakedefine CONFIG_LIBCONFIG 1
diff --git a/twin/compton-tde/man/compton-tde.1.html b/twin/compton-tde/man/compton-tde.1.html
index 26d2a3b21..34243b08e 100644
--- a/twin/compton-tde/man/compton-tde.1.html
+++ b/twin/compton-tde/man/compton-tde.1.html
@@ -1422,7 +1422,7 @@ compton(1) Manual Page
 <div class="paragraph"><p><em>FORMAT</em> (optional) specifies the format of the property, 8, 16, or 32. On absence we use format X reports. Do not specify it for predefined or string targets.</p></div>

 <div class="paragraph"><p><em>TYPE</em> is a single character representing the type of the property to match for: <tt>c</tt> for <em>CARDINAL</em>, <tt>a</tt> for <em>ATOM</em>, <tt>w</tt> for <em>WINDOW</em>, <tt>d</tt> for <em>DRAWABLE</em>, <tt>s</tt> for <em>STRING</em> (and any other string types, such as <em>UTF8_STRING</em>). Do not specify it for predefined targets.</p></div>

 <div class="paragraph"><p><em>OP QUALIFIER</em> (optional), applicable only for equals operator, could be <tt>?</tt> (ignore-case).</p></div>

-<div class="paragraph"><p><em>MATCH TYPE</em> (optional), applicable only for equals operator, could be nothing (exact match), <tt>*</tt> (match anywhere), <tt>^</tt> (match from start), <tt>%</tt> (wildcard), or <tt>~</tt> (PCRE regular expression).</p></div>

+<div class="paragraph"><p><em>MATCH TYPE</em> (optional), applicable only for equals operator, could be nothing (exact match), <tt>*</tt> (match anywhere), <tt>^</tt> (match from start), <tt>%</tt> (wildcard), or <tt>~</tt> (PCRE2 regular expression).</p></div>

 <div class="paragraph"><p><em>OPERATOR</em> is one of <tt>=</tt> (equals), <tt>&lt;</tt>, <tt>&gt;</tt>, <tt>&lt;=</tt>, <tt>=&gt;</tt>, or nothing (exists). Exists operator checks whether a property exists on a window (but for predefined targets, exists means != 0 then).</p></div>

 <div class="paragraph"><p><em>PATTERN</em> is either an integer or a string enclosed by single or double quotes. Python-3-style escape sequences and raw string are supported in the string format.</p></div>

 <div class="paragraph"><p>Supported logical operators are <tt>&amp;&amp;</tt> (and) and <tt>||</tt> (or). <tt>&amp;&amp;</tt> has higher precedence than <tt>||</tt>, left-to-right associativity. Use parentheses to change precedence.</p></div>

@@ -1468,7 +1468,7 @@ name = r"\x64\x64\o64"</tt></pre>
 <pre><tt>condition = TARGET:TYPE[FLAGS]:PATTERN</tt></pre>

 </div></div>

 <div class="paragraph"><p><em>TARGET</em> is one of "n" (window name), "i" (window class instance), "g" (window general class), and "r" (window role).</p></div>

-<div class="paragraph"><p><em>TYPE</em> is one of "e" (exact match), "a" (match anywhere), "s" (match from start), "w" (wildcard), and "p" (PCRE regular expressions, if compiled with the support).</p></div>

+<div class="paragraph"><p><em>TYPE</em> is one of "e" (exact match), "a" (match anywhere), "s" (match from start), "w" (wildcard), and "p" (PCRE2 regular expressions, if compiled with the support).</p></div>

 <div class="paragraph"><p><em>FLAGS</em> could be a series of flags. Currently the only defined flag is "i" (ignore case).</p></div>

 <div class="paragraph"><p><em>PATTERN</em> is the actual pattern string.</p></div>

 </div>

diff --git a/twin/compton-tde/man/compton.1 b/twin/compton-tde/man/compton.1
index 964c4158d..a4e4dd7d9 100644
--- a/twin/compton-tde/man/compton.1
+++ b/twin/compton-tde/man/compton.1
@@ -659,7 +659,7 @@ With greater\-than/less\-than operators it looks like:
 .sp
 \fIOP QUALIFIER\fR (optional), applicable only for equals operator, could be ? (ignore\-case)\&.
 .sp
-\fIMATCH TYPE\fR (optional), applicable only for equals operator, could be nothing (exact match), * (match anywhere), ^ (match from start), % (wildcard), or ~ (PCRE regular expression)\&.
+\fIMATCH TYPE\fR (optional), applicable only for equals operator, could be nothing (exact match), * (match anywhere), ^ (match from start), % (wildcard), or ~ (PCRE2 regular expression)\&.
 .sp
 \fIOPERATOR\fR is one of = (equals), <, >, <=, =>, or nothing (exists)\&. Exists operator checks whether a property exists on a window (but for predefined targets, exists means != 0 then)\&.
 .sp
@@ -720,7 +720,7 @@ condition = TARGET:TYPE[FLAGS]:PATTERN
 .sp
 \fITARGET\fR is one of "n" (window name), "i" (window class instance), "g" (window general class), and "r" (window role)\&.
 .sp
-\fITYPE\fR is one of "e" (exact match), "a" (match anywhere), "s" (match from start), "w" (wildcard), and "p" (PCRE regular expressions, if compiled with the support)\&.
+\fITYPE\fR is one of "e" (exact match), "a" (match anywhere), "s" (match from start), "w" (wildcard), and "p" (PCRE2 regular expressions, if compiled with the support)\&.
 .sp
 \fIFLAGS\fR could be a series of flags\&. Currently the only defined flag is "i" (ignore case)\&.
 .sp
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index 1afde0bee..c37abc81d 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -13,8 +13,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdeinstance.h>
+#include <tdestandarddirs.h>
 
 int main( int argc, char* argv[] )
     {
diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp
index e52f8c760..d4b525691 100644
--- a/twin/data/update_window_settings.cpp
+++ b/twin/data/update_window_settings.cpp
@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <netwm_def.h>
 #include <tdeconfig.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <dcopclient.h>
 
 struct SessionInfo
@@ -82,14 +82,14 @@ void loadFakeSessionInfo( TDEConfig* config )
         info->maximized = config->readNumEntry( TQString("maximize")+n, 0 );
         info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 );
         info->desktop = config->readNumEntry( TQString("desktop")+n, 0 );
-        info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE );
-        info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE );
-        info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE );
-        info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE  );
-        info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE  );
-        info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE  );
-        info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE  );
-        info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE  );
+        info->minimized = config->readBoolEntry( TQString("iconified")+n, false );
+        info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false );
+        info->shaded = config->readBoolEntry( TQString("shaded")+n, false );
+        info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false  );
+        info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false  );
+        info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false  );
+        info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false  );
+        info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false  );
         info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1());
         info->active = false;
         info->fake = true;
diff --git a/twin/events.cpp b/twin/events.cpp
index 166767239..5158df40b 100644
--- a/twin/events.cpp
+++ b/twin/events.cpp
@@ -196,7 +196,7 @@ bool Workspace::workspaceEvent( XEvent * e )
     {
     if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) )
         {
-        mouse_emulation = FALSE;
+        mouse_emulation = false;
         XUngrabKeyboard( tqt_xdisplay(), get_tqt_x_time() );
         }
 
@@ -221,7 +221,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             if ( tab_grab || control_grab )
                 {
                 tab_box->handleMouseEvent( e );
-                return TRUE;
+                return true;
                 }
             break;
         case KeyPress:
@@ -323,7 +323,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                         addSystemTrayWin( w );
                         }
                     }
-                return TRUE;
+                return true;
                 }
 
             return ( e->xunmap.event != e->xunmap.window ); // hide wm typical event from Qt
@@ -336,12 +336,12 @@ bool Workspace::workspaceEvent( XEvent * e )
             {
         //do not confuse Qt with these events. After all, _we_ are the
         //window manager who does the reparenting.
-            return TRUE;
+            return true;
             }
         case DestroyNotify:
             {
             if ( removeSystemTrayWin( e->xdestroywindow.window, false ) )
-                return TRUE;
+                return true;
             return false;
             }
         case MapRequest:
@@ -362,7 +362,7 @@ bool Workspace::workspaceEvent( XEvent * e )
 // this code doesn't check the parent to be root.
 //            if ( e->xmaprequest.parent == root ) { //###TODO store previously destroyed client ids
                 if ( addSystemTrayWin( e->xmaprequest.window ) )
-                    return TRUE;
+                    return true;
                 c = createClient( e->xmaprequest.window, false );
                 if ( c != NULL && root != tqt_xrootwin() )
                     { // TODO what is this?
@@ -428,7 +428,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             break;
         case KeyRelease:
             if ( mouse_emulation )
-                return FALSE;
+                return false;
             break;
         case FocusIn:
             if( e->xfocus.window == rootWin() && TQCString( getenv("TDE_MULTIHEAD")).lower() != "true"
@@ -460,7 +460,7 @@ bool Workspace::workspaceEvent( XEvent * e )
         default:
             break;
         }
-    return FALSE;
+    return false;
     }
 
 // Some events don't have the actual window which caused the event
@@ -733,7 +733,7 @@ void Client::destroyNotifyEvent( XDestroyWindowEvent* e )
     }
 
 
-bool         blockAnimation = FALSE;
+bool         blockAnimation = false;
 
 /*!
    Handles client messages for the client window
@@ -886,8 +886,8 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
             {
             delete shadeHoverTimer;
             shadeHoverTimer = new TQTimer( this );
-            connect( shadeHoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( shadeHover() ));
-            shadeHoverTimer->start( options->shadeHoverInterval, TRUE );
+            connect( shadeHoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( shadeHover() ));
+            shadeHoverTimer->start( options->shadeHoverInterval, true );
             }
 
         if ( options->focusPolicy == Options::ClickToFocus )
@@ -899,8 +899,8 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
             {
             delete autoRaiseTimer;
             autoRaiseTimer = new TQTimer( this );
-            connect( autoRaiseTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoRaise() ) );
-            autoRaiseTimer->start( options->autoRaiseInterval, TRUE  );
+            connect( autoRaiseTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoRaise() ) );
+            autoRaiseTimer->start( options->autoRaiseInterval, true  );
             }
 
         TQPoint currentPos( e->x_root, e->y_root );
@@ -979,7 +979,7 @@ void Client::grabButton( int modifier )
          ++i )
         XGrabButton( tqt_xdisplay(), AnyButton,
             modifier | mods[ i ],
-            wrapperId(),  FALSE, ButtonPressMask,
+            wrapperId(),  false, ButtonPressMask,
             GrabModeSync, GrabModeAsync, None, None );
     }
 
@@ -1425,7 +1425,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
             bool replay = performMouseCommand( com, TQPoint( x_root, y_root), perform_handled );
 
             if ( isSpecialWindow())
-                replay = TRUE;
+                replay = true;
 
             if( w == wrapperId()) // these can come only from a grab
                 XAllowEvents(tqt_xdisplay(), replay? ReplayPointer : SyncPointer, CurrentTime ); //tqt_x_time);
@@ -1453,7 +1453,7 @@ void Client::processDecorationButtonPress( int button, int /*state*/, int x, int
     Options::MouseCommand com = Options::MouseNothing;
     bool active = isActive();
     if ( !wantsInput() ) // we cannot be active, use it anyway
-        active = TRUE;
+        active = true;
 
     if ( button == Button1 )
         com = active ? options->commandActiveTitlebar1() : options->commandInactiveTitlebar1();
@@ -1466,7 +1466,7 @@ void Client::processDecorationButtonPress( int button, int /*state*/, int x, int
         && com != Options::MouseMinimize )  // mouse release event
         {
         mode = mousePosition( TQPoint( x, y ));
-        buttonDown = TRUE;
+        buttonDown = true;
         moveOffset = TQPoint( x, y );
         invertedMoveOffset = rect().bottomRight() - moveOffset;
         unrestrictedMoveResize = false;
@@ -1517,7 +1517,7 @@ bool Client::buttonReleaseEvent( Window w, int /*button*/, int state, int x, int
     y = this->y();
     if ( (state & ( Button1Mask & Button2Mask & Button3Mask )) == 0 )
         {
-        buttonDown = FALSE;
+        buttonDown = false;
         if ( moveResizeMode )
             {
             finishMoveResize( false );
@@ -1604,7 +1604,7 @@ void Client::focusInEvent( XFocusInEvent* e )
     bool activate =  workspace()->allowClientActivation( this, -1U, true );
     workspace()->gotFocusIn( this ); // remove from should_get_focus list
     if( activate )
-        setActive( TRUE );
+        setActive( true );
     else
         {
         workspace()->restoreFocus();
@@ -1673,7 +1673,7 @@ void Client::focusOutEvent( XFocusOutEvent* e )
     if ( TQApplication::activePopupWidget() )
         return;
     if( !check_follows_focusin( this ))
-        setActive( FALSE );
+        setActive( false );
     }
 
 // performs _NET_WM_MOVERESIZE
@@ -1684,7 +1684,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
     else if( moveResizeMode && direction == NET::MoveResizeCancel )
     {
         finishMoveResize( true );
-        buttonDown = FALSE;
+        buttonDown = false;
         setCursor( mode );
     }
     else if( direction >= NET::TopLeft && direction <= NET::Left )
@@ -1704,7 +1704,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
             return;
         if( moveResizeMode )
             finishMoveResize( false );
-        buttonDown = TRUE;
+        buttonDown = true;
         moveOffset = TQPoint( x_root - x(), y_root - y()); // map from global
         invertedMoveOffset = rect().bottomRight() - moveOffset;
         unrestrictedMoveResize = false;
@@ -1756,12 +1756,12 @@ void Client::keyPressEvent( uint key_code )
         case Key_Return:
         case Key_Enter:
             finishMoveResize( false );
-            buttonDown = FALSE;
+            buttonDown = false;
             setCursor( mode );
             break;
         case Key_Escape:
             finishMoveResize( true );
-            buttonDown = FALSE;
+            buttonDown = false;
             setCursor( mode );
             break;
         default:
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index f729c702c..6adad44fe 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -223,12 +223,12 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co
     {
     if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 )
         desktop = currentDesktop();
-    TQDesktopWidget *desktopwidget = kapp->desktop();
+    TQDesktopWidget *desktopwidget = tdeApp->desktop();
     TQRect sarea = screenarea // may be NULL during KWin initialization
         ? screenarea[ desktop ][ screen ]
         : desktopwidget->screenGeometry( screen );
     TQRect warea = workarea[ desktop ].isNull()
-        ? kapp->desktop()->geometry()
+        ? tdeApp->desktop()->geometry()
         : workarea[ desktop ];
     switch (opt)
         {
@@ -802,7 +802,7 @@ TQRect Client::adjustedClientArea( const TQRect &desktopArea, const TQRect& area
     // HACK: workarea handling is not xinerama aware, so if this strut
     // reserves place at a xinerama edge that's inside the virtual screen,
     // ignore the strut for workspace setting.
-    if( area == kapp->desktop()->geometry())
+    if( area == tdeApp->desktop()->geometry())
         {
         if( stareaL.left() < screenarea.left())
             stareaL = TQRect();
@@ -1692,7 +1692,7 @@ bool Client::isMaximizable() const
             return false;
         }
     if ( maximizeMode() != MaximizeRestore )
-        return TRUE;
+        return true;
     TQSize max = maxSize();
 #if 0
     if( max.width() < 32767 || max.height() < 32767 ) // sizes are 16bit with X
@@ -1915,12 +1915,12 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
     TQRect clientArea = workspace()->clientArea( MaximizeArea, this );
 
     // save sizes for restoring, if maximalizing
-    if( !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
+    if( !activeTiled && !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
         {
         geom_restore.setTop( y());
         geom_restore.setHeight( height());
         }
-    if( !adjust && !( x() == clientArea.left() && width() == clientArea.width()))
+    if( !activeTiled && !adjust && !( x() == clientArea.left() && width() == clientArea.width()))
         {
         geom_restore.setLeft( x());
         geom_restore.setWidth( width());
@@ -2328,26 +2328,19 @@ bool Client::startMoveResize()
     moveResizeMode = true;
     initialMoveResizeGeom = geometry();
 
-    if (activeTiled)
+    if ( maximizeMode() != MaximizeRestore )
     {
-        // Restore original geometry
-        activeTiled = false;
         if (options->resetMaximizedWindowGeometry() && isMove()) {
             /* Original geometry might be smaller than the tiled one, so the
              * mouse pointer might appear off-window when untiling.
              * Here we center the window horizontally under the mouse pointer.
              * This should work with most window decorations.
              */
-            activeTiledOrigGeom.moveLeft(TQCursor::pos().x() - (activeTiledOrigGeom.width() / 2));
-            moveOffset.setX(TQCursor::pos().x() - activeTiledOrigGeom.x());
+            geom_restore.moveLeft(TQCursor::pos().x() - (geom_restore.width() / 2));
+            moveOffset.setX(TQCursor::pos().x() - geom_restore.x());
 
-            setGeometry(activeTiledOrigGeom);
-        }
-    }
+            setGeometry(geom_restore);
 
-    if ( maximizeMode() != MaximizeRestore )
-    {
-        if (options->resetMaximizedWindowGeometry() && isMove()) {
             maximize(MaximizeRestore);
         }
         else {
@@ -2376,14 +2369,14 @@ bool Client::startMoveResize()
       || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) )
     {
         grabXServer();
-        kapp->sendPostedEvents();
+        tdeApp->sendPostedEvents();
         // we have server grab -> nothing should cause paint events
         // unfortunately, that's not completely true, Qt may generate
         // paint events on some widgets due to FocusIn(?)
         // eat them, otherwise XOR painting will be broken (#58054)
         // paint events for the geometrytip need to be allowed, though
         // eater = new EatAllPaintEvents;
-// not needed anymore?        kapp->installEventFilter( eater );
+// not needed anymore?        tdeApp->installEventFilter( eater );
     }
     Notify::raise( isResize() ? Notify::ResizeStart : Notify::MoveStart );
 
@@ -2411,7 +2404,7 @@ void Client::finishMoveResize( bool cancel )
         kdDebug() <<"finishing moveresize in active mode, cancel is " << cancel << endl;
         activeMaximizing = false;
         activeTiled = true;
-        activeTiledOrigGeom = initialMoveResizeGeom;
+        geom_restore = initialMoveResizeGeom;
         switch (activeMode)
         {
             case ActiveMaximizeMode: {
@@ -2425,7 +2418,6 @@ void Client::finishMoveResize( bool cancel )
                 setGeometry(cancel ? initialMoveResizeGeom
                                    : activeBorderMaximizeGeometry());
         }
-        activeTiledOrigGeom.moveTopLeft(rect().topLeft());
     }
 
     checkMaximizeGeometry();
@@ -2726,6 +2718,16 @@ ActiveMaximizingMode Client::activeBorderMode() const
     return activeMode;
 }
 
+void Client::setActiveBorderPos( TQPoint pos )
+{
+    activePos = pos;
+}
+
+TQPoint Client::activeBorderPos() const
+{
+    return activePos;
+}
+
 void Client::setActiveBorder(ActiveBorder border) {
     currentActiveBorder = border;
 }
@@ -2766,7 +2768,7 @@ void Client::cancelActiveBorderMaximizing() {
 TQRect Client::activeBorderMaximizeGeometry()
 {
     TQRect ret;
-    TQRect max = workspace()->clientArea(MaximizeArea, TQCursor::pos(), workspace()->currentDesktop());
+    TQRect max = workspace()->clientArea(MaximizeArea, activePos, workspace()->currentDesktop());
     switch (activeBorderMode())
     {
         case ActiveMaximizeMode:
@@ -2828,4 +2830,19 @@ TQRect Client::activeBorderMaximizeGeometry()
     return ret;
 }
 
+void Client::tileToBorder(ActiveBorder border) {
+    if (!isResizable()) return;
+    activeTiled = true;
+    if (maximizeMode() == MaximizeRestore)
+        geom_restore = geometry();
+    setActiveBorderMode(ActiveTilingMode);
+    setActiveBorderPos(TQCursor().pos());
+    setActiveBorder(border);
+    TQRect geo = activeBorderMaximizeGeometry();
+    if (geo.isValid() && !geo.isEmpty()) {
+        setGeometry(geo);
+    }
+    workspace()->raiseClient(this);
+}
+
 } // namespace
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index 40f63d981..36534f806 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -84,9 +84,9 @@ bool ButtonDrag::decode( TQDropEvent* e, Button& btn )
 		int supported;
 		stream >> supported;
 		btn.supported = supported;
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 
@@ -267,7 +267,7 @@ ButtonDropSite::ButtonDropSite( TQWidget* parent, const char* name )
 	: TQFrame( parent, name ),
 	  m_selected(0)
 {
-	setAcceptDrops( TRUE );
+	setAcceptDrops( true );
 	setFrameShape( WinPanel );
 	setFrameShadow( Raised );
 	setMinimumHeight( 26 );
@@ -689,11 +689,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name)
 	layout->addWidget(m_dropSite);
 	layout->addWidget(m_buttonSource);
 
-	connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) );
-	connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) );
-	connect( m_buttonSource, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQT_SLOT(removeSelectedButton()) );
+	connect( m_dropSite, TQ_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQ_SLOT(hideButton(TQChar)) );
+	connect( m_dropSite, TQ_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQ_SLOT(showButton(TQChar)) );
+	connect( m_buttonSource, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQ_SLOT(removeSelectedButton()) );
 
-	connect( m_dropSite, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()) );
+	connect( m_dropSite, TQ_SIGNAL(changed()), TQ_SIGNAL(changed()) );
 
 	// insert all possible buttons into the source (backwards to keep the preferred order...)
 	bool dummy;
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 062ff6ac7..408bd563c 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -47,14 +47,14 @@
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
-#include <kstandarddirs.h>
+#include <tdedesktopfile.h>
+#include <tdestandarddirs.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <dcopclient.h>
 
 #include "twindecoration.h"
@@ -193,32 +193,32 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 
 	cbShadowDocks = new TQCheckBox(i18n("Docks and &panels"),
 			whichShadowSettings);
-	connect(cbShadowDocks, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbShadowDocks, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 	cbShadowOverrides = new TQCheckBox(i18n("O&verride windows"),
 			whichShadowSettings);
-	connect(cbShadowOverrides, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbShadowOverrides, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 	cbShadowTopMenus = new TQCheckBox(i18n("&Top menu"),
 			whichShadowSettings);
-	connect(cbShadowTopMenus, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbShadowTopMenus, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 	cbInactiveShadow = new TQCheckBox(
 			i18n("Draw shadow under &inactive windows"), inactiveShadowSettings);
-	connect(cbInactiveShadow, TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(cbInactiveShadow, TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowColourHBox = new TQHBox(activeShadowSettings);
 	shadowColourHBox->setSpacing(KDialog::spacingHint());
 	shadowColourLabel = new TQLabel(i18n("Colour:"), shadowColourHBox);
 	shadowColourButton = new KColorButton(shadowColourHBox);
-	connect(shadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged()));
+	connect(shadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowColourHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowColourHBox->setSpacing(KDialog::spacingHint());
 	inactiveShadowColourLabel = new TQLabel(i18n("Colour:"), inactiveShadowColourHBox);
 	inactiveShadowColourButton = new KColorButton(inactiveShadowColourHBox);
-	connect(inactiveShadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged()));
 
 	shadowOpacityHBox = new TQHBox(activeShadowSettings);
 	shadowOpacityHBox->setSpacing(KDialog::spacingHint());
@@ -229,12 +229,12 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	shadowOpacitySlider->setTickInterval(10);
 	shadowOpacitySpinBox = new TQSpinBox(1, 100, 1, shadowOpacityHBox);
 	shadowOpacitySpinBox->setSuffix(" %");
-	connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), shadowOpacitySpinBox,
-			TQT_SLOT(setValue(int)));
-	connect(shadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)), shadowOpacitySlider,
-			TQT_SLOT(setValue(int)));
-	connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), shadowOpacitySpinBox,
+			TQ_SLOT(setValue(int)));
+	connect(shadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)), shadowOpacitySlider,
+			TQ_SLOT(setValue(int)));
+	connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowOpacityHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowOpacityHBox->setSpacing(KDialog::spacingHint());
@@ -247,14 +247,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	inactiveShadowOpacitySpinBox = new TQSpinBox(1, 100, 1,
 			inactiveShadowOpacityHBox);
 	inactiveShadowOpacitySpinBox->setSuffix(" %");
-	connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
+	connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
 			inactiveShadowOpacitySpinBox,
-			TQT_SLOT(setValue(int)));
-	connect(inactiveShadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)),
+			TQ_SLOT(setValue(int)));
+	connect(inactiveShadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)),
 			inactiveShadowOpacitySlider,
-			TQT_SLOT(setValue(int)));
-	connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+			TQ_SLOT(setValue(int)));
+	connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowXOffsetHBox = new TQHBox(activeShadowSettings);
 	shadowXOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -263,8 +263,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 			shadowXOffsetHBox);
 	shadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowXOffsetHBox);
 	shadowXOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(shadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowXOffsetHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowXOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -274,8 +274,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	inactiveShadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1,
 			inactiveShadowXOffsetHBox);
 	inactiveShadowXOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(inactiveShadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowYOffsetHBox = new TQHBox(activeShadowSettings);
 	shadowYOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -284,8 +284,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 			shadowYOffsetHBox);
 	shadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowYOffsetHBox);
 	shadowYOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(shadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowYOffsetHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowYOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -295,8 +295,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	inactiveShadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1,
 			inactiveShadowYOffsetHBox);
 	inactiveShadowYOffsetSpinBox->setSuffix(i18n(" pixels"));
-	connect(inactiveShadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	shadowThicknessHBox = new TQHBox(activeShadowSettings);
 	shadowThicknessHBox->setSpacing(KDialog::spacingHint());
@@ -306,8 +306,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	shadowThicknessSpinBox = new TQSpinBox(1, 100, 1,
 			shadowThicknessHBox);
 	shadowThicknessSpinBox->setSuffix(i18n(" pixels"));
-	connect(shadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(shadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	inactiveShadowThicknessHBox = new TQHBox(inactiveShadowSettings);
 	inactiveShadowThicknessHBox->setSpacing(KDialog::spacingHint());
@@ -317,8 +317,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	inactiveShadowThicknessSpinBox = new TQSpinBox(1, 100, 1,
 			inactiveShadowThicknessHBox);
 	inactiveShadowThicknessSpinBox->setSuffix(i18n(" pixels"));
-	connect(inactiveShadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotSelectionChanged()));
+	connect(inactiveShadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotSelectionChanged()));
 
 	// Page 4 (WM selector)
 	windowmanagerPage = new TQWidget( tabWidget );
@@ -355,25 +355,25 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	tabWidget->insertTab( shadowPage, i18n("&Shadows") );
 	tabWidget->insertTab( windowmanagerPage, i18n("&Window Manager") );
 
-	connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotButtonsChanged()) ); // update preview etc.
-	connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); // emit changed()...
-	connect( decorationList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
-	connect( decorationList, TQT_SIGNAL(activated(const TQString&)),
-								TQT_SLOT(slotChangeDecoration(const TQString&)) );
-	connect( cbUseCustomButtonPositions, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), buttonPositionWidget, TQT_SLOT(setEnabled(bool)));
-	connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsChanged()) );
- 	connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), activeShadowSettings, TQT_SLOT(setEnabled(bool)));
- 	connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), inactiveShadowSettings, TQT_SLOT(setEnabled(bool)));
- 	connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), whichShadowSettings, TQT_SLOT(setEnabled(bool)));
-
-	connect( cbShowToolTips, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect( cbWindowShadow, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int )));
-//	connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-
-	connect( thirdpartyWMList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
-	connect( thirdpartyWMArguments, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
+	connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotButtonsChanged()) ); // update preview etc.
+	connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) ); // emit changed()...
+	connect( decorationList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
+	connect( decorationList, TQ_SIGNAL(activated(const TQString&)),
+								TQ_SLOT(slotChangeDecoration(const TQString&)) );
+	connect( cbUseCustomButtonPositions, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), buttonPositionWidget, TQ_SLOT(setEnabled(bool)));
+	connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotButtonsChanged()) );
+ 	connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), activeShadowSettings, TQ_SLOT(setEnabled(bool)));
+ 	connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), inactiveShadowSettings, TQ_SLOT(setEnabled(bool)));
+ 	connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), whichShadowSettings, TQ_SLOT(setEnabled(bool)));
+
+	connect( cbShowToolTips, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect( cbWindowShadow, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect( cBorder, TQ_SIGNAL( activated( int )), TQ_SLOT( slotBorderChanged( int )));
+//	connect( cbUseMiniWindows, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+
+	connect( thirdpartyWMList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
+	connect( thirdpartyWMArguments, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
 
 	// Allow twin dcop signal to update our selection list
 	connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
@@ -409,9 +409,9 @@ void KWinDecorationModule::findDecorations()
 			for (TQFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it)
 			{
 				TQString filename(it.current()->absFilePath());
-				if (KDesktopFile::isDesktopFile(filename))
+				if (TDEDesktopFile::isDesktopFile(filename))
 				{
-					KDesktopFile desktopFile(filename);
+					TDEDesktopFile desktopFile(filename);
 					TQString libName = desktopFile.readEntry("X-TDE-Library");
 
 					if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_"))
@@ -660,10 +660,10 @@ void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& current
 			pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget ));
 
 			// connect required signals and slots together...
-			connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) );
-			connect( this, TQT_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQT_SLOT(load(TDEConfig*)) );
-			connect( this, TQT_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQT_SLOT(save(TDEConfig*)) );
-			connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) );
+			connect( pluginObject, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) );
+			connect( this, TQ_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQ_SLOT(load(TDEConfig*)) );
+			connect( this, TQ_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQ_SLOT(save(TDEConfig*)) );
+			connect( this, TQ_SIGNAL(pluginDefaults()), pluginObject, TQ_SLOT(defaults()) );
 			pluginConfigWidget->show();
 			return;
 		}
@@ -753,11 +753,11 @@ void KWinDecorationModule::readConfig( TDEConfig* conf )
 	int swm;
 	for ( swm = 0; swm < thirdpartyWMList->count(); ++swm ) {
 		if ( thirdpartyWMList->text( swm ).startsWith(selectedWM + " ") ) {
-			found = TRUE;
+			found = true;
 			break;
 		}
 	}
-	if (found == FALSE) {
+	if (found == false) {
 		thirdpartyWMList->setCurrentItem(0);
 	}
 	else {
@@ -970,7 +970,7 @@ TQString KWinDecorationModule::handbookSection() const
 
 void KWinDecorationModule::resetKWin()
 {
-	bool ok = kapp->dcopClient()->send("twin*", "KWinInterface",
+	bool ok = tdeApp->dcopClient()->send("twin*", "KWinInterface",
                         "reconfigure()", TQByteArray());
 	if (!ok)
 		kdDebug() << "kcmtwindecoration: Could not reconfigure twin" << endl;
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index e55d5a15f..0bc9c942c 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -36,7 +36,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_twinfocus(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_twinfocus(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
@@ -44,14 +44,14 @@ extern "C"
 		return new KFocusConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_twinactions(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_twinactions(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
 		return new TDEActionsOptions( parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
@@ -59,14 +59,14 @@ extern "C"
 		return new KMovingConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_twinaborders(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_twinaborders(TQWidget *parent, const char *name)
 	{
 	   TDEGlobal::locale()->insertCatalogue("kcmkwm");
 	   TDEConfig *c = new TDEConfig("twinrc", false, true);
 	   return new KActiveBorderConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
@@ -74,7 +74,7 @@ extern "C"
 		return new KAdvancedConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name)
+	TDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
@@ -82,7 +82,7 @@ extern "C"
 		return new KTranslucencyConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_twinoptions ( TQWidget *parent, const char* name)
+	TDE_EXPORT TDECModule *create_twinoptions ( TQWidget *parent, const char* name)
 	{
 		//CT there's need for decision: kwm or twin?
 		TDEGlobal::locale()->insertCatalogue("kcmkwm");
@@ -102,37 +102,37 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name)
   mFocus = new KFocusConfig(false, mConfig, this, "TWin Focus Config");
   mFocus->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mFocus, i18n("&Focus"));
-  connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mFocus, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions");
   mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
-  connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions");
   mWindowActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mWindowActions, i18n("Window Actio&ns"));
-  connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mMoving = new KMovingConfig(false, mConfig, this, "TWin Moving");
   mMoving->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mMoving, i18n("&Moving"));
-  connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mMoving, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mABorders = new KActiveBorderConfig(false, mConfig, this, "TWin Active Borders");
   mABorders->layout()->setMargin(KDialog::marginHint());
   tab->addTab(mABorders, i18n("Active &Borders"));
-  connect(mABorders, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mABorders, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mAdvanced = new KAdvancedConfig(false, mConfig, this, "TWin Advanced");
   mAdvanced->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mAdvanced, i18n("Ad&vanced"));
-  connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mAdvanced, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mTranslucency = new KTranslucencyConfig(false, mConfig, this, "TWin Translucency");
   mTranslucency->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTranslucency, i18n("&Translucency"));
-  connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mTranslucency, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"),
@@ -183,9 +183,9 @@ void KWinOptions::save()
   emit TDECModule::changed( false );
   // Send signal to twin
   mConfig->sync();
-  if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-  kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+  if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 }
 
 
@@ -266,12 +266,12 @@ TDEActionsOptions::TDEActionsOptions(TQWidget *parent, const char *name)
   mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions");
   mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
-  connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions");
   mWindowActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mWindowActions, i18n("Window Actio&ns"));
-  connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 }
 
 TDEActionsOptions::~TDEActionsOptions()
@@ -295,9 +295,9 @@ void TDEActionsOptions::save()
   emit TDECModule::changed( false );
   // Send signal to twin
   mConfig->sync();
-  if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-  kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+  if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+  tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 }
 
 
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 3314604e7..8ed44e79e 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -164,7 +164,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   combo->insertItem(i18n("On All Desktops"));
   combo->insertItem(i18n("Nothing"));
   combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hlayout->addWidget(combo);
   coTiDbl = combo;
   TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar."));
@@ -189,14 +189,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   comboW->insertItem(i18n("Change Opacity"));
   comboW->insertItem(i18n("Nothing"));
   comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
-  connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(comboW, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   hlayoutW->addWidget(comboW);
   coTiW = comboW;
   TQWhatsThis::add(comboW, txtButton4);
   label->setBuddy(comboW);
 
   cbTiRevW = new TQCheckBox(i18n("Reverse wheel direction"), this);
-  connect(cbTiRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  connect(cbTiRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
   TQWhatsThis::add( cbTiRevW, i18n("Use this to reverse the action of the mouse wheel.") );
   hlayoutW->addWidget(cbTiRevW);
 
@@ -266,21 +266,21 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   // Titlebar and frame, active, mouse button 1
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiAct1 = combo;
   TQWhatsThis::add(combo, txtButton1);
 
   // Titlebar and frame, active, mouse button 2
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiAct2 = combo;
   TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window."));
 
   // Titlebar and frame, active, mouse button 3
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiAct3 =  combo;
   TQWhatsThis::add(combo, txtButton3 );
 
@@ -310,19 +310,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiInAct1 = combo;
   TQWhatsThis::add(combo, txtButton1);
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiInAct2 = combo;
   TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window."));
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coTiInAct3 = combo;
   TQWhatsThis::add(combo, txtButton3);
 
@@ -362,13 +362,13 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
 
     coMax[b] = new ToolTipComboBox(box, tbl_Max);
     for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]);
-    connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-    connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed()));
+    connect(coMax[b], TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+    connect(coMax[b], TQ_SIGNAL(activated(int)), coMax[b], TQ_SLOT(changed()));
     TQWhatsThis::add( coMax[b], txtButton[b] );
     coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
   }
 
-  connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+  connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
 
   layout->addStretch();
 
@@ -567,9 +567,9 @@ void KTitleBarActionsConfig::save()
   if (standAlone)
   {
     config->sync();
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
 }
 
@@ -655,19 +655,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
 
   TQComboBox* combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coWin1 = combo;
   TQWhatsThis::add( combo, strWin1 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coWin2 = combo;
   TQWhatsThis::add( combo, strWin2 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coWin3 = combo;
   TQWhatsThis::add( combo, strWin3 );
 
@@ -727,7 +727,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   combo = new TQComboBox(grid);
   combo->insertItem(i18n("Meta"));
   combo->insertItem(i18n("Alt"));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAllKey = combo;
   TQWhatsThis::add( combo, strAllKey );
 
@@ -743,19 +743,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAll1 = combo;
   TQWhatsThis::add( combo, strAll1 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAll2 = combo;
   TQWhatsThis::add( combo, strAll2 );
 
   combo = new TQComboBox(grid);
   combo->insertStringList(items);
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAll3 =  combo;
   TQWhatsThis::add( combo, strAll3 );
 
@@ -767,12 +767,12 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   combo->insertItem(i18n("Move to Previous/Next Desktop"));
   combo->insertItem(i18n("Change Opacity"));
   combo->insertItem(i18n("Nothing"));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
   coAllW =  combo;
   TQWhatsThis::add( combo, strAllW );
 
   cbAllRevW = new TQCheckBox(i18n("Reverse wheel direction"), grid);
-  connect(cbAllRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  connect(cbAllRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
   TQWhatsThis::add( cbAllRevW, i18n("Use this to reverse the action of the mouse wheel.") );
 
   layout->addStretch();
@@ -850,9 +850,9 @@ void KWindowActionsConfig::save()
   if (standAlone)
   {
     config->sync();
-    if ( !kapp->dcopClient()->isAttached() )
-      kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if ( !tdeApp->dcopClient()->isAttached() )
+      tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
 }
 
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 30d565716..53c55f90c 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -45,7 +45,7 @@
 #include <kdialog.h>
 #include <dcopclient.h>
 #include <tdeglobal.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tqtabwidget.h>
 
 #include <X11/X.h>
@@ -169,12 +169,12 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     TQWhatsThis::add( focusCombo, wtstr);
     TQWhatsThis::add(fLabel, wtstr);
 
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAutoRaiseEnabled()) );
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setAutoRaiseEnabled()) );
 
     // autoraise delay
     autoRaiseOn = new TQCheckBox(i18n("Auto &raise"), fcsBox);
     fLay->addWidget(autoRaiseOn);
-    connect(autoRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(autoRaiseOnTog(bool)));
+    connect(autoRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(autoRaiseOnTog(bool)));
 
     autoRaise = new KIntNumInput(500, fcsBox);
     autoRaise->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
@@ -183,11 +183,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     autoRaise->setSuffix(i18n(" msec"));
     fLay->addWidget(autoRaise);
 
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDelayFocusEnabled()) );
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDelayFocusEnabled()) );
 
     delayFocusOn = new TQCheckBox(i18n("Delay focus"), fcsBox);
     fLay->addWidget(delayFocusOn);
-    connect(delayFocusOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(delayFocusOnTog(bool)));
+    connect(delayFocusOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(delayFocusOnTog(bool)));
 
     delayFocus = new KIntNumInput(500, fcsBox);
     delayFocus->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
@@ -197,7 +197,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     fLay->addWidget(delayFocus);
 
     clickRaiseOn = new TQCheckBox(i18n("Click &raises active window"), fcsBox);
-    connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
+    connect(clickRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(clickRaiseOnTog(bool)));
     fLay->addWidget(clickRaiseOn);
 
 //     fLay->addColSpacing(0,TQMAX(autoRaiseOn->sizeHint().width(),
@@ -263,7 +263,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
                   " with the focused window. This option is by default disabled for Click to focus and"
                   " enabled for other focus policies." );
     TQWhatsThis::add( activeMouseScreen, wtstr );
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateActiveMouseScreen()));
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateActiveMouseScreen()));
 
     if (!TQApplication::desktop()->isVirtualDesktop() ||
         TQApplication::desktop()->numScreens() == 1) // No Ximerama
@@ -291,7 +291,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
                  " is pressed, with no popup widget.  In addition, the previously"
                  " activated window will be sent to the back in this mode.");
     TQWhatsThis::add( altTabPopup, wtstr );
-    connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAltTabMode()));
+    connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateAltTabMode()));
 
     traverseAll = new TQCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox );
     kLay->addWidget( traverseAll );
@@ -319,17 +319,17 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     lay->addStretch();
 
     // Any changes goes to slotChanged()
-    connect(focusCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-    connect(fcsBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()));
-    connect(autoRaise, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect(delayFocus, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect(separateScreenFocus, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(activeMouseScreen, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(altTabPopup, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(traverseAll, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(rollOverDesktops, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(showPopupinfo, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect(focusStealing, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+    connect(focusCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+    connect(fcsBox, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed()));
+    connect(autoRaise, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect(delayFocus, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect(separateScreenFocus, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(activeMouseScreen, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(altTabPopup, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(traverseAll, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(rollOverDesktops, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(showPopupinfo, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect(focusStealing, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
 
     load();
 }
@@ -585,9 +585,9 @@ void KFocusConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -656,7 +656,7 @@ KActiveBorderConfig::KActiveBorderConfig(bool _standAlone, TDEConfig *_config, T
                                        " satisfying on slow machines."));
 
     delays = new KIntNumInput(10, active_box);
-    delays->setRange(0, MAX_EDGE_RES, 50, true);
+    delays->setRange(0, MAX_EDGE_RES, 10, true);
     delays->setSuffix(i18n(" msec"));
     delays->setLabel(i18n("Border &activation delay:"));
     TQWhatsThis::add( delays, i18n("Here you can set a delay for the activation of"
@@ -664,7 +664,7 @@ KActiveBorderConfig::KActiveBorderConfig(bool _standAlone, TDEConfig *_config, T
        " has been pushed against a screen border for the specified number of milliseconds.") );
 
     distance = new KIntNumInput(10, active_box);
-    distance->setRange(1, 100, 1, true);
+    distance->setRange(1, 300, 1, true);
     distance->setSuffix(i18n(" px"));
     distance->setLabel(i18n("Border &activation distance:"));
     TQWhatsThis::add( distance, i18n("The distance from which an active border can"
@@ -686,15 +686,15 @@ KActiveBorderConfig::KActiveBorderConfig(bool _standAlone, TDEConfig *_config, T
     active_vbox->addSpacing(15);
     active_vbox->addWidget(tilingOpaque);
 
-    connect(active_box, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateActiveBorders()));
+    connect(active_box, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateActiveBorders()));
 
     // Any changes go to slotChanged()
-    connect(active_box,      TQT_SIGNAL(clicked(int)),      this, TQT_SLOT(changed()));
-    connect(active_move,     TQT_SIGNAL(clicked()),         this, TQT_SLOT(changed()));
-    connect(active_maximize, TQT_SIGNAL(clicked()),         this, TQT_SLOT(changed()));
-    connect(delays,          TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(distance,        TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
-    connect(tilingOpaque,    TQT_SIGNAL(clicked()),         this, TQT_SLOT(changed()));
+    connect(active_box,      TQ_SIGNAL(clicked(int)),      this, TQ_SLOT(changed()));
+    connect(active_move,     TQ_SIGNAL(clicked()),         this, TQ_SLOT(changed()));
+    connect(active_maximize, TQ_SIGNAL(clicked()),         this, TQ_SLOT(changed()));
+    connect(delays,          TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(distance,        TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+    connect(tilingOpaque,    TQ_SIGNAL(clicked()),         this, TQ_SLOT(changed()));
 
     lay->addWidget(active_box);
     lay->addStretch();
@@ -748,9 +748,9 @@ void KActiveBorderConfig::save() {
     if (standAlone)
     {
         config->sync();
-        if (!kapp->dcopClient()->isAttached())
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if (!tdeApp->dcopClient()->isAttached())
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -860,7 +860,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget
 
     shadeHoverOn = new TQCheckBox(i18n("&Enable hover"), shBox);
 
-    connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shadeHoverChanged(bool)));
+    connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shadeHoverChanged(bool)));
 
     shadeHover = new KIntNumInput(500, shBox);
     shadeHover->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
@@ -878,16 +878,16 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget
     lay->addWidget(shBox);
 
     // Any changes goes to slotChanged()
-    connect(animateShade, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-    connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-    connect(shadeHover, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
+    connect(animateShade, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect(shadeHover, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
 
     hideUtilityWindowsForInactive = new TQCheckBox( i18n( "Hide utility windows for inactive applications" ), this );
     TQWhatsThis::add( hideUtilityWindowsForInactive,
         i18n( "When turned on, utility windows (tool windows, torn-off menus,…) of inactive applications will be"
               " hidden and will be shown only when the application becomes active. Note that applications"
               " have to mark the windows with the proper window type for this feature to work." ));
-    connect(hideUtilityWindowsForInactive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+    connect(hideUtilityWindowsForInactive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
     lay->addWidget( hideUtilityWindowsForInactive );
 
     lay->addStretch();
@@ -954,9 +954,9 @@ void KAdvancedConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -1027,8 +1027,8 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
     minimizeAnimSlider->setTickmarks(TQSlider::Below);
     rLay->addMultiCellWidget(minimizeAnimSlider,0,0,1,2);
 
-    connect(minimizeAnimOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setMinimizeAnim(bool)));
-    connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int)));
+    connect(minimizeAnimOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setMinimizeAnim(bool)));
+    connect(minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMinimizeAnimSpeed(int)));
 
     minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox);
     minimizeAnimSlowLabel->setAlignment(TQt::AlignTop|TQt::AlignLeft);
@@ -1143,19 +1143,19 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
     load();
 
     // Any changes goes to slotChanged()
-    connect( moveOpaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( resizeOpaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed()));
-    connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-    connect( resetMaximizedWindowGeometry, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-    connect( placementCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-    connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotBrdrSnapChanged(int)));
-    connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-    connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWndwSnapChanged(int)));
-    connect( OverlapSnap, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+    connect( moveOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect( resizeOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect( geometryTipOn, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
+    connect( minimizeAnimOn, TQ_SIGNAL(clicked() ), TQ_SLOT(changed()));
+    connect( minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect( moveResizeMaximized, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect( resetMaximizedWindowGeometry, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+    connect( placementCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+    connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotBrdrSnapChanged(int)));
+    connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+    connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWndwSnapChanged(int)));
+    connect( OverlapSnap, TQ_SIGNAL(clicked()), TQ_SLOT(changed()));
 
     // To get suffix to BrdrSnap and WndwSnap inputs with default values.
     slotBrdrSnapChanged(BrdrSnap->value());
@@ -1382,9 +1382,9 @@ void KMovingConfig::save( void )
     if (standAlone)
     {
         config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit TDECModule::changed(false);
 }
@@ -1436,7 +1436,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
     : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
   kompmgr = 0L;
-  resetKompmgr_ = FALSE;
+  resetKompmgr_ = false;
   TQVBoxLayout *lay = new TQVBoxLayout (this);
   kompmgrAvailable_ = kompmgrAvailable();
   if (!kompmgrAvailable_){
@@ -1523,7 +1523,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
   tabW->addTab(tGroup, i18n("Opacity"));
 
   TQWidget *sGroup = new TQWidget(tabW);
-//   sGroup->setCheckable(TRUE);
+//   sGroup->setCheckable(true);
   TQVBoxLayout *vLay2 = new TQVBoxLayout (sGroup,11,6);
   vLay2->addSpacing(11); // to get the proper gb top offset
   useShadows = new TQCheckBox(i18n("Use shadows on windows (standard effects should be disabled in the Styles module if this is checked)"),sGroup);
@@ -1640,84 +1640,84 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
   lay->addWidget(useTranslucency);
   lay->addWidget(tabW);
 
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), tabW, TQT_SLOT(setEnabled(bool)));
-
-  connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), activeWindowOpacity, TQT_SLOT(setEnabled(bool)));
-  connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQT_SLOT(setEnabled(bool)));
-  connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), movingWindowOpacity, TQT_SLOT(setEnabled(bool)));
-  connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), dockWindowOpacity, TQT_SLOT(setEnabled(bool)));
-
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(onlyDecoTranslucent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(keepAboveAsActive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), blurBackground, TQT_SLOT(setEnabled(bool)));
-  connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), greyscaleBackground, TQT_SLOT(setEnabled(bool)));
-  connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(removeShadowsOnResize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(removeShadowsOnMove, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-
-  connect(activeWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(inactiveWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(movingWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(dockWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(dockWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(menuWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(activeWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(changed()));
-  connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-  connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-
-  connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
-  connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
-  connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
-  connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts()));
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), tabW, TQ_SLOT(setEnabled(bool)));
+
+  connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), activeWindowOpacity, TQ_SLOT(setEnabled(bool)));
+  connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQ_SLOT(setEnabled(bool)));
+  connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), movingWindowOpacity, TQ_SLOT(setEnabled(bool)));
+  connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), dockWindowOpacity, TQ_SLOT(setEnabled(bool)));
+
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(onlyDecoTranslucent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(keepAboveAsActive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), blurBackground, TQ_SLOT(setEnabled(bool)));
+  connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), greyscaleBackground, TQ_SLOT(setEnabled(bool)));
+  connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(removeShadowsOnResize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(removeShadowsOnMove, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+
+  connect(activeWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(inactiveWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(movingWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(dockWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(dockWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(menuWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(activeWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(changed()));
+  connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+  connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
+
+  connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
+  connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
+  connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
+  connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts()));
 
   load();
 
   tabW->setEnabled(useTranslucency->isChecked());
 
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showWarning(bool)));
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showWarning(bool)));
 
   // handle kompmgr restarts if necessary
-  connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr()));
-  connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
-  connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr()));
+  connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr()));
+  connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
+  connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr()));
 
   }
 }
@@ -1738,7 +1738,7 @@ void KTranslucencyConfig::processShadowLockouts()
 
 void KTranslucencyConfig::resetKompmgr()
 {
-    resetKompmgr_ = TRUE;
+    resetKompmgr_ = true;
 }
 
 void KTranslucencyConfig::load( void )
@@ -1778,17 +1778,17 @@ void KTranslucencyConfig::load( void )
   TDEConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc");
   conf_.setGroup("xcompmgr");
 
-  disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE));
-  useOpenGL->setChecked(conf_.readBoolEntry("useOpenGL",FALSE));
-  blurBackground->setChecked(conf_.readBoolEntry("blurBackground",FALSE));
+  disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",false));
+  useOpenGL->setChecked(conf_.readBoolEntry("useOpenGL",false));
+  blurBackground->setChecked(conf_.readBoolEntry("blurBackground",false));
   blurBackground->setEnabled(useOpenGL->isChecked());
-  greyscaleBackground->setChecked(conf_.readBoolEntry("greyscaleBackground",FALSE));
+  greyscaleBackground->setChecked(conf_.readBoolEntry("greyscaleBackground",false));
   greyscaleBackground->setEnabled(useOpenGL->isChecked());
 
   useShadows->setChecked(conf_.readEntry("Compmode","").compare("CompClientShadows") == 0);
-  useShadowsOnMenuWindows->setChecked(conf_.readBoolEntry("ShadowsOnMenuWindows",TRUE));
-  useShadowsOnToolTipWindows->setChecked(conf_.readBoolEntry("ShadowsOnToolTipWindows",TRUE));
-  useShadowsOnDockWindows->setChecked(conf_.readBoolEntry("ShadowsOnDockWindows",FALSE));
+  useShadowsOnMenuWindows->setChecked(conf_.readBoolEntry("ShadowsOnMenuWindows",true));
+  useShadowsOnToolTipWindows->setChecked(conf_.readBoolEntry("ShadowsOnToolTipWindows",true));
+  useShadowsOnDockWindows->setChecked(conf_.readBoolEntry("ShadowsOnDockWindows",false));
   shadowTopOffset->setValue(-1*(conf_.readNumEntry("ShadowOffsetY",0)));
   shadowLeftOffset->setValue(-1*(conf_.readNumEntry("ShadowOffsetX",0)));
 
@@ -1808,10 +1808,10 @@ void KTranslucencyConfig::load( void )
   else
     shadowColor->setColor(TQColor(r,g,b));
 
-  fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",FALSE));
-  fadeInMenuWindows->setChecked(conf_.readBoolEntry("FadeMenuWindows",TRUE));
-  fadeInToolTipWindows->setChecked(conf_.readBoolEntry("FadeToolTipWindows",TRUE));
-  fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",FALSE));
+  fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",false));
+  fadeInMenuWindows->setChecked(conf_.readBoolEntry("FadeMenuWindows",true));
+  fadeInToolTipWindows->setChecked(conf_.readBoolEntry("FadeToolTipWindows",true));
+  fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",false));
   fadeInSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeInStep",0.070)*1000.0));
   fadeOutSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeOutStep",0.070)*1000.0));
 
@@ -1965,9 +1965,9 @@ void KTranslucencyConfig::save( void )
   if (standAlone)
   {
     config->sync();
-        if ( !kapp->dcopClient()->isAttached() )
-            kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+        if ( !tdeApp->dcopClient()->isAttached() )
+            tdeApp->dcopClient()->attach();
+        tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
   if (useTranslucency->isChecked())
     startKompmgr();
@@ -2006,17 +2006,17 @@ void KTranslucencyConfig::defaults()
   inactiveWindowOpacity->setEnabled(false);
   movingWindowOpacity->setEnabled(false);
   dockWindowOpacity->setEnabled(false);
-  useShadows->setChecked(FALSE);
-  useShadowsOnMenuWindows->setChecked(TRUE);
-  useShadowsOnToolTipWindows->setChecked(TRUE);
-  useShadowsOnDockWindows->setChecked(FALSE);
-  removeShadowsOnMove->setChecked(FALSE);
-  removeShadowsOnResize->setChecked(FALSE);
+  useShadows->setChecked(false);
+  useShadowsOnMenuWindows->setChecked(true);
+  useShadowsOnToolTipWindows->setChecked(true);
+  useShadowsOnDockWindows->setChecked(false);
+  removeShadowsOnMove->setChecked(false);
+  removeShadowsOnResize->setChecked(false);
   shadowColor->setColor(TQt::black);
-  fadeInWindows->setChecked(FALSE);
-  fadeInMenuWindows->setChecked(TRUE);
-  fadeInToolTipWindows->setChecked(TRUE);
-  fadeOnOpacityChange->setChecked(FALSE);
+  fadeInWindows->setChecked(false);
+  fadeInMenuWindows->setChecked(true);
+  fadeInToolTipWindows->setChecked(true);
+  fadeOnOpacityChange->setChecked(false);
   fadeInSpeed->setValue(70);
   fadeOutSpeed->setValue(70);
   emit TDECModule::changed(true);
@@ -2035,12 +2035,12 @@ bool KTranslucencyConfig::kompmgrAvailable()
 
 void KTranslucencyConfig::startKompmgr()
 {
-    kapp->dcopClient()->send("twin*", "", "startKompmgr()", TQString(""));
+    tdeApp->dcopClient()->send("twin*", "", "startKompmgr()", TQString(""));
 }
 
 void KTranslucencyConfig::stopKompmgr()
 {
-    kapp->dcopClient()->send("twin*", "", "stopKompmgr()", TQString(""));
+    tdeApp->dcopClient()->send("twin*", "", "stopKompmgr()", TQString(""));
 }
 
 void KTranslucencyConfig::showWarning(bool alphaActivated)
diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui
index 793784c42..8a9339c16 100644
--- a/twin/kcmtwin/twinrules/editshortcutbase.ui
+++ b/twin/kcmtwin/twinrules/editshortcutbase.ui
@@ -155,10 +155,10 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
         <slot>clearShortcut()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">editShortcut()</slot>
     <slot access="protected" specifier="pure virtual">clearShortcut()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 2f28bc5dd..7e2cac86c 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -28,7 +28,7 @@
 #include "ruleslist.h"
 
 extern "C"
-    KDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name )
+    TDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name )
     {
     //CT there's need for decision: kwm or twin?
     TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" );
@@ -44,8 +44,8 @@ KCMRules::KCMRules( TQWidget *parent, const char *name )
     {
     TQVBoxLayout *layout = new TQVBoxLayout( this );
     widget = new KCMRulesList( this );
-    layout->addWidget( TQT_TQWIDGET(widget) );
-    connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
+    layout->addWidget( widget );
+    connect( widget, TQ_SIGNAL( changed( bool )), TQ_SLOT( moduleChanged( bool )));
     TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ),
         I18N_NOOP( "Window-Specific Settings Configuration Module" ),
         0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
@@ -66,9 +66,9 @@ void KCMRules::save()
     emit TDECModule::changed( false );
     // Send signal to twin
     config.sync();
-    if( !kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if( !tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
 
 void KCMRules::defaults()
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index 21cb007ec..ef8a30956 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -256,9 +256,9 @@ static int edit( Window wid, bool whole_app )
         delete orig_rule;
         }
     saveRules( rules );
-    if( !kapp->dcopClient()->isAttached())
-        kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    if( !tdeApp->dcopClient()->isAttached())
+        tdeApp->dcopClient()->attach();
+    tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     return 0;
     }
     
@@ -273,7 +273,7 @@ static const TDECmdLineOptions options[] =
     };
 
 extern "C"
-KDE_EXPORT int kdemain( int argc, char* argv[] )
+TDE_EXPORT int kdemain( int argc, char* argv[] )
     {
     TDELocale::setMainCatalogue( "kcmtwinrules" );
     TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ),
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index 8961874ae..a9238c178 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -33,22 +33,22 @@ KCMRulesList::KCMRulesList( TQWidget* parent, const char* name )
 : KCMRulesListBase( parent, name )
     {
     // connect both current/selected, so that current==selected (stupid TQListBox :( )
-    connect( rules_listbox, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
-        TQT_SLOT( activeChanged( TQListBoxItem*)));
-    connect( rules_listbox, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
-        TQT_SLOT( activeChanged( TQListBoxItem*)));
-    connect( new_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( newClicked()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( modifyClicked()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( deleteClicked()));
-    connect( moveup_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( moveupClicked()));
-    connect( movedown_button, TQT_SIGNAL( clicked()),
-        TQT_SLOT( movedownClicked()));
-    connect( rules_listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
-            TQT_SLOT( modifyClicked()));
+    connect( rules_listbox, TQ_SIGNAL( currentChanged( TQListBoxItem* )),
+        TQ_SLOT( activeChanged( TQListBoxItem*)));
+    connect( rules_listbox, TQ_SIGNAL( selectionChanged( TQListBoxItem* )),
+        TQ_SLOT( activeChanged( TQListBoxItem*)));
+    connect( new_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( newClicked()));
+    connect( modify_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( modifyClicked()));
+    connect( delete_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( deleteClicked()));
+    connect( moveup_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( moveupClicked()));
+    connect( movedown_button, TQ_SIGNAL( clicked()),
+        TQ_SLOT( movedownClicked()));
+    connect( rules_listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
+            TQ_SLOT( modifyClicked()));
     load();
     }
 
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index 334001bf7..116ac8b41 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -41,9 +41,9 @@ namespace KWinInternal
 {
 
 #define SETUP( var, type ) \
-    connect( enable_##var, TQT_SIGNAL( toggled( bool )), rule_##var, TQT_SLOT( setEnabled( bool ))); \
-    connect( enable_##var, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( updateEnable##var())); \
-    connect( rule_##var, TQT_SIGNAL( activated( int )), this, TQT_SLOT( updateEnable##var())); \
+    connect( enable_##var, TQ_SIGNAL( toggled( bool )), rule_##var, TQ_SLOT( setEnabled( bool ))); \
+    connect( enable_##var, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( updateEnable##var())); \
+    connect( rule_##var, TQ_SIGNAL( activated( int )), this, TQ_SLOT( updateEnable##var())); \
     TQWhatsThis::add( enable_##var, enableDesc ); \
     TQWhatsThis::add( rule_##var, type##RuleDesc );
 
@@ -550,7 +550,7 @@ void RulesWidget::detectClicked()
     {
     assert( detect_dlg == NULL );
     detect_dlg = new DetectDialog;
-    connect( detect_dlg, TQT_SIGNAL( detectionDone( bool )), this, TQT_SLOT( detected( bool )));
+    connect( detect_dlg, TQ_SIGNAL( detectionDone( bool )), this, TQ_SLOT( detected( bool )));
     detect_dlg->detect( 0 );
     }
 
@@ -702,7 +702,7 @@ Rules* RulesDialog::edit( Rules* r, WId window, bool show_hints )
     if( window != 0 )
         widget->prepareWindowSpecific( window );
     if( show_hints )
-        TQTimer::singleShot( 0, this, TQT_SLOT( displayHints()));
+        TQTimer::singleShot( 0, this, TQ_SLOT( displayHints()));
     exec();
     return rules;
     }
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index b3812d394..356a99676 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -2509,7 +2509,7 @@
     <tabstop>rule_disableglobalshortcuts</tabstop>
     <tabstop>disableglobalshortcuts</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected" specifier="pure virtual">detectClicked()</slot>
     <slot access="protected" specifier="pure virtual">wmclassMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">roleMatchChanged()</slot>
@@ -2517,7 +2517,7 @@
     <slot access="protected" specifier="pure virtual">extraMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">machineMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">shortcutEditClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index bf763e7c1..6cbd6baa0 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <unistd.h>
 #include <twin.h>
diff --git a/twin/killwindow.cpp b/twin/killwindow.cpp
index c67ab50a0..8bc1abb57 100644
--- a/twin/killwindow.cpp
+++ b/twin/killwindow.cpp
@@ -81,7 +81,7 @@ void KillWindow::start()
                 button_released = (ev.xbutton.button == Button1);
                 if ( ev.xbutton.button == Button3 ) 
                     {
-                    escape_pressed = TRUE;
+                    escape_pressed = true;
                     break;
                     }
                 if( ev.xbutton.button == Button1 || ev.xbutton.button == Button2 )
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 7d219ae7f..a31471611 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -122,8 +122,8 @@ void KCommonDecoration::init()
 
     resetLayout();
 
-    connect(this, TQT_SIGNAL(keepAboveChanged(bool) ), TQT_SLOT(keepAboveChange(bool) ) );
-    connect(this, TQT_SIGNAL(keepBelowChanged(bool) ), TQT_SLOT(keepBelowChange(bool) ) );
+    connect(this, TQ_SIGNAL(keepAboveChanged(bool) ), TQ_SLOT(keepAboveChange(bool) ) );
+    connect(this, TQ_SIGNAL(keepBelowChanged(bool) ), TQ_SLOT(keepBelowChange(bool) ) );
 
     updateCaption();
 }
@@ -332,9 +332,9 @@ bool KCommonDecoration::isModalSystemNotification()
     result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data);
     if (result == Success && data != None && format == 32 )
         {
-        return TRUE;
+        return true;
         }
-    return FALSE;
+    return false;
 }
 
 void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString& s, bool isLeft)
@@ -350,8 +350,8 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                           if (!btn) break;
                           btn->setTipText(i18n("Menu") );
                           btn->setRealizeButtons(TQt::LeftButton|TQt::RightButton);
-                          connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()));
-                          connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased()));
+                          connect(btn, TQ_SIGNAL(pressed()), TQ_SLOT(menuButtonPressed()));
+                          connect(btn, TQ_SIGNAL(released()), this, TQ_SLOT(menuButtonReleased()));
 
                           m_button[MenuButton] = btn;
                       }
@@ -366,7 +366,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                           btn->setTipText(oad?i18n("Not on all desktops"):i18n("On all desktops") );
                           btn->setToggleButton(true);
                           btn->setOn( oad );
-                          connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(toggleOnAllDesktops()));
+                          connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(toggleOnAllDesktops()));
 
                           m_button[OnAllDesktopsButton] = btn;
                       }
@@ -377,7 +377,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn = createButton(HelpButton);
                       if (!btn) break;
                       btn->setTipText(i18n("Help") );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(showContextHelp()));
 
                       m_button[HelpButton] = btn;
                   }
@@ -387,7 +387,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn = createButton(MinButton);
                       if (!btn) break;
                       btn->setTipText(i18n("Minimize") );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(minimize()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(minimize()));
 
                       m_button[MinButton] = btn;
                   }
@@ -401,7 +401,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn->setTipText(max?i18n("Restore"):i18n("Maximize") );
                       btn->setToggleButton(true);
                       btn->setOn( max );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaximize()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaximize()));
 
                       m_button[MaxButton] = btn;
                   }
@@ -411,7 +411,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn = createButton(CloseButton);
                       if (!btn) break;
                       btn->setTipText(i18n("Close") );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(closeWindow()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(closeWindow()));
 
                       m_button[CloseButton] = btn;
                   }
@@ -424,7 +424,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn->setTipText(above?i18n("Do not keep above others"):i18n("Keep above others") );
                       btn->setToggleButton(true);
                       btn->setOn( above );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepAbove()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepAbove()));
 
                       m_button[AboveButton] = btn;
                   }
@@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn->setTipText(below?i18n("Do not keep below others"):i18n("Keep below others") );
                       btn->setToggleButton(true);
                       btn->setOn( below );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBelow()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepBelow()));
 
                       m_button[BelowButton] = btn;
                   }
@@ -450,7 +450,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                       btn->setTipText(shaded?i18n("Unshade"):i18n("Shade") );
                       btn->setToggleButton(true);
                       btn->setOn( shaded );
-                      connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotShade()));
+                      connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotShade()));
 
                       m_button[ShadeButton] = btn;
                   }
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index 622362e9e..b9a8e7a36 100644
--- a/twin/lib/kdecoration.cpp
+++ b/twin/lib/kdecoration.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqapplication.h>
 #include <tdeglobal.h>
 #include <assert.h>
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
index 03e1c863e..03daebc28 100644
--- a/twin/lib/kdecoration.h
+++ b/twin/lib/kdecoration.h
@@ -37,7 +37,7 @@ class KDecorationBridge;
 class KDecorationPrivate;
 class KDecorationFactory;
 
-#define KWIN_EXPORT KDE_EXPORT
+#define KWIN_EXPORT TDE_EXPORT
 
 /**
  * This class provides a namespace for all decoration related classes.
@@ -659,7 +659,7 @@ class KWIN_EXPORT KDecoration
 	 * This function may be reimplemented to provide custom minimize/restore animations
 	 * The reimplementation is allowed to perform X server grabs if necessary
          * (only using the functions provided by this API, no direct Xlib calls), but no
-	 * futher event processing is allowed (i.e. no kapp->processEvents()).
+	 * futher event processing is allowed (i.e. no tdeApp->processEvents()).
 	 * @a False should be returned if the default implementation should be used.
 	 * Note that you should not use this function to force disabling of the animation.
 	 *
diff --git a/twin/main.cpp b/twin/main.cpp
index 4af065a8a..c988b53f2 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -45,13 +45,13 @@ Atoms* atoms;
 int screen_number = -1;
 bool disable_twin_composition_manager = false;
 
-static bool initting = FALSE;
+static bool initting = false;
 
 static
 int x11ErrorHandler(Display *d, XErrorEvent *e)
     {
     char msg[80], req[80], number[80];
-    bool ignore_badwindow = TRUE; //maybe temporary
+    bool ignore_badwindow = true; //maybe temporary
 
     if (initting &&
         (
@@ -146,12 +146,12 @@ Application::Application( )
             ::exit(1);
             }
         }
-    connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection()));
+    connect( &owner, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection()));
     
     // if there was already twin running, it saved its configuration after loosing the selection -> reread
     config()->reparseConfiguration();
 
-    initting = TRUE; // startup....
+    initting = true; // startup....
 
     // install X11 error handler
     XSetErrorHandler( x11ErrorHandler );
@@ -176,7 +176,7 @@ Application::Application( )
     DCOPRef ref( "kded", "kded" );
     ref.send( "unloadModule", TQCString( "kdetrayproxy" ));
     
-    initting = FALSE; // startup done, we are up and running now.
+    initting = false; // startup done, we are up and running now.
        
     dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("wm started"));
     XEvent e;
@@ -216,7 +216,7 @@ void Application::lostSelection()
 bool Application::x11EventFilter( XEvent *e )
     {
     if ( Workspace::self()->workspaceEvent( e ) )
-             return TRUE;
+             return true;
     return TDEApplication::x11EventFilter( e );
     }
     
@@ -240,7 +240,7 @@ static TDECmdLineOptions args[] =
     };
 
 extern "C"
-KDE_EXPORT int kdemain( int argc, char * argv[] )
+TDE_EXPORT int kdemain( int argc, char * argv[] )
     {
     bool restored = false;
     for (int arg = 1; arg < argc; arg++) 
diff --git a/twin/manage.cpp b/twin/manage.cpp
index 8b96c070e..394d7fc20 100644
--- a/twin/manage.cpp
+++ b/twin/manage.cpp
@@ -190,7 +190,7 @@ bool Client::manage( Window w, bool isMapped )
 //    onAllDesktopsChange(); decoration doesn't exist here yet
 
     TQRect geom( attr.x, attr.y, attr.width, attr.height );
-    bool placementDone = FALSE;
+    bool placementDone = false;
 
     if ( session )
         geom = session->geometry;
@@ -269,7 +269,7 @@ bool Client::manage( Window w, bool isMapped )
         if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) ||
              (xSizeHint.flags & USPosition) ) 
             {
-            placementDone = TRUE;
+            placementDone = true;
             // disobey xinerama placement option for now (#70943)
             area = workspace()->clientArea( PlacementArea, geom.center(), desktop());
             }
@@ -290,7 +290,7 @@ bool Client::manage( Window w, bool isMapped )
     if( isMovable())
         {
         if( geom.x() > area.right() || geom.y() > area.bottom())
-            placementDone = FALSE; // weird, do not trust.
+            placementDone = false; // weird, do not trust.
         }
 
     if ( placementDone )
@@ -312,7 +312,7 @@ bool Client::manage( Window w, bool isMapped )
     if( !placementDone ) 
         { // placement needs to be after setting size
         workspace()->place( this, area );
-        placementDone = TRUE;
+        placementDone = true;
         }
 
     if(( !isSpecialWindow() || isToolbar()) && isMovable())
@@ -358,7 +358,7 @@ bool Client::manage( Window w, bool isMapped )
     // probably should be replaced by something better
     bool doNotShow = false;
     if ( workspace()->isNotManaged( caption() ) )
-        doNotShow = TRUE;
+        doNotShow = true;
 
     // other settings from the previous session
     if ( session ) 
diff --git a/twin/notifications.cpp b/twin/notifications.cpp
index 5a83e9bce..43ae37cdf 100644
--- a/twin/notifications.cpp
+++ b/twin/notifications.cpp
@@ -92,7 +92,7 @@ TQString Notify::eventToName( Event e )
     return event;
     }
 
-static bool forgetIt = FALSE;
+static bool forgetIt = false;
 TQValueList< Notify::EventData > Notify::pending_events;
 
 bool Notify::raise( Event e, const TQString& message, Client* c )
diff --git a/twin/options.cpp b/twin/options.cpp
index 46c557b4a..c9411f6de 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -77,7 +77,7 @@ unsigned long Options::updateSettings()
     separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", false );
     activeMouseScreen = config->readBoolEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus );
 
-    rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE);
+    rollOverDesktops = config->readBoolEntry("RollOverDesktops", true);
 
 //    focusStealingPreventionLevel = config->readNumEntry( "FocusStealingPreventionLevel", 2 );
     // TODO use low level for now
@@ -99,8 +99,8 @@ unsigned long Options::updateSettings()
     xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ),
         -1, tqApp->desktop()->numScreens() - 1 );
 
-    animateShade = config->readBoolEntry("AnimateShade", TRUE );
-    animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE );
+    animateShade = config->readBoolEntry("AnimateShade", true );
+    animateMinimize = config->readBoolEntry("AnimateMinimize", true );
     animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 );
 
     if( focusPolicy == ClickToFocus )
@@ -112,21 +112,21 @@ unsigned long Options::updateSettings()
         }
     else
         {
-        autoRaise = config->readBoolEntry("AutoRaise", FALSE );
+        autoRaise = config->readBoolEntry("AutoRaise", false );
         autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 );
-        delayFocus = config->readBoolEntry("DelayFocus", FALSE );
+        delayFocus = config->readBoolEntry("DelayFocus", false );
         delayFocusInterval = config->readNumEntry("DelayFocusInterval", 0 );
         }
 
-    shadeHover = config->readBoolEntry("ShadeHover", FALSE );
+    shadeHover = config->readBoolEntry("ShadeHover", false );
     shadeHoverInterval = config->readNumEntry("ShadeHoverInterval", 250 );
 
     // important: autoRaise implies ClickRaise
-    clickRaise = autoRaise || config->readBoolEntry("ClickRaise", TRUE );
+    clickRaise = autoRaise || config->readBoolEntry("ClickRaise", true );
 
     borderSnapZone = config->readNumEntry("BorderSnapZone", 10);
     windowSnapZone = config->readNumEntry("WindowSnapZone", 10);
-    snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",FALSE);
+    snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",false);
 
     // active borders: compatibility with old option names (Electric*)
     active_borders = config->readNumEntry("ActiveBorders", -1);
@@ -205,7 +205,7 @@ unsigned long Options::updateSettings()
     onlyDecoTranslucent = config->readBoolEntry("OnlyDecoTranslucent",false);
     resetKompmgr = config->readBoolEntry("ResetKompmgr", false);
     if (resetKompmgr)
-        config->writeEntry("ResetKompmgr",FALSE);
+        config->writeEntry("ResetKompmgr",false);
 
      // window drop shadows
     config->setGroup("Style");
diff --git a/twin/pics/CMakeLists.txt b/twin/pics/CMakeLists.txt
deleted file mode 100644
index e9068f5d9..000000000
--- a/twin/pics/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-install( FILES
-    close.png maximize.png maximizedown.png menu.png
-    iconify.png pindown.png pinup.png unknown.png fog.png
-    fog-grey.png bluesun.png greenie.light.png greenie.dim.png
-  DESTINATION ${DATA_INSTALL_DIR}/twin/pics )
diff --git a/twin/pics/tile_bottom.png b/twin/pics/tile_bottom.png
new file mode 100644
index 000000000..de6a89093
--- /dev/null
+++ b/twin/pics/tile_bottom.png
diff --git a/twin/pics/tile_bottomleft.png b/twin/pics/tile_bottomleft.png
new file mode 100644
index 000000000..30ae6d94d
--- /dev/null
+++ b/twin/pics/tile_bottomleft.png
diff --git a/twin/pics/tile_bottomright.png b/twin/pics/tile_bottomright.png
new file mode 100644
index 000000000..34ef23211
--- /dev/null
+++ b/twin/pics/tile_bottomright.png
diff --git a/twin/pics/tile_left.png b/twin/pics/tile_left.png
new file mode 100644
index 000000000..14a77d1a6
--- /dev/null
+++ b/twin/pics/tile_left.png
diff --git a/twin/pics/tile_right.png b/twin/pics/tile_right.png
new file mode 100644
index 000000000..c04d5fc1b
--- /dev/null
+++ b/twin/pics/tile_right.png
diff --git a/twin/pics/tile_top.png b/twin/pics/tile_top.png
new file mode 100644
index 000000000..ca1e277e8
--- /dev/null
+++ b/twin/pics/tile_top.png
diff --git a/twin/pics/tile_topleft.png b/twin/pics/tile_topleft.png
new file mode 100644
index 000000000..1e0cd5b9e
--- /dev/null
+++ b/twin/pics/tile_topleft.png
diff --git a/twin/pics/tile_topright.png b/twin/pics/tile_topright.png
new file mode 100644
index 000000000..c0316cfa2
--- /dev/null
+++ b/twin/pics/tile_topright.png
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index c347991fe..324b8a782 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -39,10 +39,10 @@ PopupInfo::PopupInfo( Workspace* ws, const char *name )
     m_shown = false;
     reset();
     reconfigure();
-    connect(&m_delayedHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hide()));
+    connect(&m_delayedHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hide()));
 
     TQFont f = font();
-    f.setBold( TRUE );
+    f.setBold( true );
     f.setPointSize( 14 );
     setFont( f );
 
diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp
index 3c915b8c8..91db4e341 100644
--- a/twin/resumer/resumer.cpp
+++ b/twin/resumer/resumer.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 #include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <unistd.h>
 #include <twin.h>
diff --git a/twin/rules.cpp b/twin/rules.cpp
index 63fc0e37b..aa4b7904a 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tdeconfig.h>
 #include <tqregexp.h>
 #include <tdetempfile.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tqfile.h>
 
 #ifndef KCMRULES
@@ -75,7 +75,7 @@ Rules::Rules( const TQString& str, bool temporary )
         f->writeBlock( s.data(), s.length());
         }
     file.close();
-    KSimpleConfig cfg( file.name());
+    TDESimpleConfig cfg( file.name());
     readFromCfg( cfg );
     if( description.isEmpty())
         description = "temporary";
@@ -1008,7 +1008,7 @@ void Workspace::gotTemporaryRulesMessage( const TQString& message )
     Rules* rule = new Rules( message, true );
     rules.prepend( rule ); // highest priority first
     if( !was_temporary )
-        TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules()));
+        TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules()));
     }
 
 void Workspace::cleanupTemporaryRules()
@@ -1028,7 +1028,7 @@ void Workspace::cleanupTemporaryRules()
             }
         }
     if( has_temporary )
-        TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules()));
+        TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules()));
     }
 
 void Workspace::discardUsedWindowRules( Client* c, bool withdrawn )
diff --git a/twin/sm.cpp b/twin/sm.cpp
index 53d2a5f29..5ef97f62d 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -42,13 +42,13 @@ bool SessionManaged::saveState( TQSessionManager& sm )
         {
         Workspace::self()->sessionSaveStarted();
         if( ksmserver ) // save stacking order etc. before "save file?" etc. dialogs change it
-            Workspace::self()->storeSession( kapp->sessionConfig(), SMSavePhase0 );
+            Workspace::self()->storeSession( tdeApp->sessionConfig(), SMSavePhase0 );
         sm.release(); // Qt doesn't automatically release in this case (bug?)
         sm.requestPhase2();
         return true;
         }
-    Workspace::self()->storeSession( kapp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full );
-    kapp->sessionConfig()->sync();
+    Workspace::self()->storeSession( tdeApp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full );
+    tdeApp->sessionConfig()->sync();
     return true;
     }
 
@@ -94,7 +94,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase )
             config->writeEntry( TQString("wmClientMachine")+n, c->wmClientMachine( true ).data() );
             config->writeEntry( TQString("resourceName")+n, c->resourceName().data() );
             config->writeEntry( TQString("resourceClass")+n, c->resourceClass().data() );
-            config->writeEntry( TQString("geometry")+n,  TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME
+            config->writeEntry( TQString("geometry")+n,  TQRect( c->calculateGravitation(true), c->clientSize() ) ); // FRAME
             config->writeEntry( TQString("restore")+n, c->geometryRestore() );
             config->writeEntry( TQString("fsrestore")+n, c->geometryFSRestore() );
             config->writeEntry( TQString("maximize")+n, (int) c->maximizeMode() );
@@ -149,7 +149,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase )
 void Workspace::loadSessionInfo()
     {
     session.clear();
-    TDEConfig* config = kapp->sessionConfig();
+    TDEConfig* config = tdeApp->sessionConfig();
     config->setGroup("Session" );
     int count =  config->readNumEntry( "count" );
     int active_client = config->readNumEntry( "active" );
@@ -170,15 +170,15 @@ void Workspace::loadSessionInfo()
         info->maximized = config->readNumEntry( TQString("maximize")+n, 0 );
         info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 );
         info->desktop = config->readNumEntry( TQString("desktop")+n, 0 );
-        info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE );
-        info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE );
-        info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE );
-        info->shadowed = config->readBoolEntry( TQString("shadowed")+n, TRUE );
-        info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE  );
-        info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE  );
-        info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE  );
-        info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE  );
-        info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE  );
+        info->minimized = config->readBoolEntry( TQString("iconified")+n, false );
+        info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false );
+        info->shaded = config->readBoolEntry( TQString("shaded")+n, false );
+        info->shadowed = config->readBoolEntry( TQString("shadowed")+n, true );
+        info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false  );
+        info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false  );
+        info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false  );
+        info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false  );
+        info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false  );
         info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1());
         info->shortcut = config->readEntry( TQString("shortcut")+n );
         info->active = ( active_client == i );
@@ -416,8 +416,8 @@ SessionSaveDoneHelper::SessionSaveDoneHelper()
     SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] };
     SmcSetProperties( conn, 5, p );
     notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )),
-        TQSocketNotifier::Read, TQT_TQOBJECT(this) );
-    connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData()));
+        TQSocketNotifier::Read, this );
+    connect( notifier, TQ_SIGNAL( activated( int )), TQ_SLOT( processData()));
     }
 
 SessionSaveDoneHelper::~SessionSaveDoneHelper()
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index bec7cce97..f638d755e 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kstringhandler.h>
 #include <stdarg.h>
 #include <kdebug.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <kkeynative.h>
 #include <tdeglobalsettings.h>
 #include <kiconeffect.h>
@@ -53,7 +53,7 @@ TabBox::TabBox( Workspace *ws, const char *name )
     m = DesktopMode; // init variables
     reconfigure();
     reset();
-    connect(&delayedShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(show()));
+    connect(&delayedShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(show()));
     
     XSetWindowAttributes attr;
     attr.override_redirect = 1;
@@ -203,7 +203,7 @@ void TabBox::reset()
         if ( clients.count() == 0 )  // height for the "not tasks" text
           {
           TQFont f = font();
-          f.setBold( TRUE );
+          f.setBold( true );
           f.setPointSize( 14 );
 
           h = TQFontMetrics(f).height()*4;
@@ -401,7 +401,7 @@ void TabBox::drawContents( TQPainter * )
         if ( !currentClient() )
             {
             TQFont f = font();
-            f.setBold( TRUE );
+            f.setBold( true );
             f.setPointSize( 14 );
 
             p.setFont(f);
@@ -993,26 +993,26 @@ bool Workspace::startKDEWalkThroughWindows()
     {
     if( !establishTabBoxGrab())
         return false;
-    tab_grab        = TRUE;
+    tab_grab        = true;
     keys->suspend( true );
     disable_shortcuts_keys->suspend( true );
     client_keys->suspend( true );
     tab_box->setMode( TabBox::WindowsMode );
     tab_box->reset();
-    return TRUE;
+    return true;
     }
 
 bool Workspace::startWalkThroughDesktops( int mode )
     {
     if( !establishTabBoxGrab())
         return false;
-    control_grab = TRUE;
+    control_grab = true;
     keys->suspend( true );
     disable_shortcuts_keys->suspend( true );
     client_keys->suspend( true );
     tab_box->setMode( (TabBox::Mode) mode );
     tab_box->reset();
-    return TRUE;
+    return true;
     }
 
 bool Workspace::startWalkThroughDesktops()
@@ -1195,8 +1195,8 @@ void Workspace::closeTabBox()
     keys->suspend( false );
     disable_shortcuts_keys->suspend( false );
     client_keys->suspend( false );
-    tab_grab = FALSE;
-    control_grab = FALSE;
+    tab_grab = false;
+    control_grab = false;
     }
 
 /*!
diff --git a/twin/tabbox.h b/twin/tabbox.h
index 3fd419ad7..0f07b019c 100644
--- a/twin/tabbox.h
+++ b/twin/tabbox.h
@@ -46,7 +46,7 @@ class TabBox : public TQFrame
         bool isAppsOnly() const;
 
         void reset();
-        void nextPrev( bool next = TRUE);
+        void nextPrev( bool next = true);
 
         void delayedShow();
         void hide();
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index c4efddace..d4930ee84 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -130,7 +130,7 @@ int main(int argc, char** argv)
 
 	DecoBenchApplication app(library, test, count);
 
-	TQTimer::singleShot(0, &app, TQT_SLOT(executeTest()));
+	TQTimer::singleShot(0, &app, TQ_SLOT(executeTest()));
 	app.exec();
 }
 #include "main.moc"
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index c706eb5df..33ee8fd3e 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -67,7 +67,7 @@ void KDecorationPreview::performRepaintTest(int n)
     positionPreviews(0);
     for (int i = 0; i < n; ++i) {
         deco->widget()->repaint();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -80,7 +80,7 @@ void KDecorationPreview::performCaptionTest(int n)
         bridge->setCaption(caption.arg(i) );
         deco->captionChange();
         deco->widget()->repaint();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -91,7 +91,7 @@ void KDecorationPreview::performResizeTest(int n)
     deco->captionChange();
     for (int i = 0; i < n; ++i) {
         positionPreviews(i % 200);
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -103,7 +103,7 @@ void KDecorationPreview::performRecreationTest(int n)
     positionPreviews(0);
     for (int i = 0; i < n; ++i) {
         recreateDecoration();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp
index 08d6bf0d1..7e918f49f 100644
--- a/twin/twinbindings.cpp
+++ b/twin/twinbindings.cpp
@@ -1,8 +1,8 @@
 #ifndef NOSLOTS
 # define DEF2( name, descr, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) )
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) )
 #else
 # define DEF2( name, descr, key3, key4, fnSlot ) \
    keys->insert( name, i18n(descr), TQString::null, key3, key4 )
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index de78a5b64..fe60c4d04 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -26,7 +26,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <tdeapplication.h>
 #include <tqregexp.h>
 
@@ -44,20 +44,47 @@ namespace KWinInternal
 // Workspace
 //****************************************
 
+TQPopupMenu* Workspace::makeTileMenu()
+{
+    TQPopupMenu *m = new TQPopupMenu;
+
+    // Tile to side (the menu id matched the ActiveBorder index used for tiling)
+    int id = m->insertItem( SmallIconSet("tile_left"), i18n("&Left"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 6 );
+    id = m->insertItem( SmallIconSet("tile_right"), i18n("&Right"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 2 );
+    id = m->insertItem( SmallIconSet("tile_top"), i18n("&Top"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 0 );
+    id = m->insertItem( SmallIconSet("tile_bottom"), i18n("&Bottom"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 4 );
+
+    // Tile to corner (the menu id matched the ActiveBorder index used for tiling)
+    id = m->insertItem( SmallIconSet("tile_topleft"), i18n("Top &Left"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 7 );
+    id = m->insertItem( SmallIconSet("tile_topright"), i18n("Top &Right"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 1 );
+    id = m->insertItem( SmallIconSet("tile_bottomleft"), i18n("Bottom L&eft"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 5 );
+    id = m->insertItem( SmallIconSet("tile_bottomright"), i18n("&Bottom R&ight"), this, TQ_SLOT( tileCurrentWindowToBorder(int) ) );
+    m->setItemParameter( id, 3 );
+
+    return m;
+}
+
 TQPopupMenu* Workspace::clientPopup()
     {
     if ( !popup )
         {
         popup = new TQPopupMenu;
-        popup->setCheckable( TRUE );
+        popup->setCheckable( true );
         popup->setFont(TDEGlobalSettings::menuFont());
-        connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) );
-        connect( popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
+        connect( popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( clientPopupAboutToShow() ) );
+        connect( popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) );
       
         advanced_popup = new TQPopupMenu( popup );
-        advanced_popup->setCheckable( TRUE );
+        advanced_popup->setCheckable( true );
         advanced_popup->setFont(TDEGlobalSettings::menuFont());
-        connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) );
+        connect( advanced_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) );
         advanced_popup->insertItem( SmallIconSet( "go-up" ),
             i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp );
         advanced_popup->insertItem( SmallIconSet( "go-down" ),
@@ -76,6 +103,7 @@ TQPopupMenu* Workspace::clientPopup()
         advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Application Settings…"), Options::ApplicationRulesOp );
 
         popup->insertItem(i18n("Ad&vanced"), advanced_popup );
+        tile_popup_index = popup->insertItem(i18n("T&ile"), makeTileMenu());
         desk_popup_index = popup->count();
         
         if (options->useTranslucency){
@@ -85,11 +113,11 @@ TQPopupMenu* Workspace::clientPopup()
             TQToolTip::add(transButton, i18n("Reset opacity to default value"));
             transSlider = new TQSlider(0, 100, 1, 100, TQt::Horizontal, transBox, "transSlider");
             TQToolTip::add(transSlider, i18n("Slide this to set the window's opacity"));
-            connect(transButton, TQT_SIGNAL(clicked()), TQT_SLOT(resetClientOpacity()));
-            connect(transButton, TQT_SIGNAL(clicked()), trans_popup, TQT_SLOT(hide()));
-            connect(transSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setTransButtonText(int)));
-            connect(transSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setPopupClientOpacity(int)));
-//             connect(transSlider, TQT_SIGNAL(sliderReleased()), trans_popup, TQT_SLOT(hide()));
+            connect(transButton, TQ_SIGNAL(clicked()), TQ_SLOT(resetClientOpacity()));
+            connect(transButton, TQ_SIGNAL(clicked()), trans_popup, TQ_SLOT(hide()));
+            connect(transSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setTransButtonText(int)));
+            connect(transSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setPopupClientOpacity(int)));
+//             connect(transSlider, TQ_SIGNAL(sliderReleased()), trans_popup, TQ_SLOT(hide()));
             trans_popup->insertItem(transBox);
             popup->insertItem(i18n("&Opacity"), trans_popup );
         }
@@ -103,9 +131,9 @@ TQPopupMenu* Workspace::clientPopup()
         popup->insertSeparator();
 
         if (!TDEGlobal::config()->isImmutable() && 
-            !kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
+            !tdeApp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
             {
-            popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQT_SLOT( configureWM() ));
+            popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQ_SLOT( configureWM() ));
             popup->insertSeparator();
             }
 
@@ -179,10 +207,11 @@ void Workspace::clientPopupAboutToShow()
     advanced_popup->setItemEnabled( Options::ResumeWindowOp, active_popup_client->isResumeable() );
     advanced_popup->setItemChecked( Options::NoBorderOp, active_popup_client->noBorder() );
     advanced_popup->setItemEnabled( Options::NoBorderOp, active_popup_client->userCanSetNoBorder() );
-    
     advanced_popup->setItemEnabled( Options::ShadowOp, (options->shadowWindowType(active_popup_client->windowType()) && options->shadowEnabled(active_popup_client->isActive())) );
     advanced_popup->setItemChecked( Options::ShadowOp, active_popup_client->isShadowed() );
     
+    popup->setItemEnabled( tile_popup_index, active_popup_client->isMovable() && active_popup_client->isResizable());
+
     popup->setItemEnabled( Options::MinimizeOp, active_popup_client->isMinimizable() );
     popup->setItemEnabled( Options::CloseOp, active_popup_client->isCloseable() );
     if (options->useTranslucency)
@@ -199,12 +228,12 @@ void Workspace::initDesktopPopup()
         return;
 
     desk_popup = new TQPopupMenu( popup );
-    desk_popup->setCheckable( TRUE );
+    desk_popup->setCheckable( true );
     desk_popup->setFont(TDEGlobalSettings::menuFont());
-    connect( desk_popup, TQT_SIGNAL( activated(int) ),
-             this, TQT_SLOT( slotSendToDesktop(int) ) );
-    connect( desk_popup, TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( desktopPopupAboutToShow() ) );
+    connect( desk_popup, TQ_SIGNAL( activated(int) ),
+             this, TQ_SLOT( slotSendToDesktop(int) ) );
+    connect( desk_popup, TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( desktopPopupAboutToShow() ) );
 
     popup->insertItem(i18n("To &Desktop"), desk_popup, -1, desk_popup_index );
     }
@@ -221,7 +250,7 @@ void Workspace::desktopPopupAboutToShow()
     desk_popup->clear();
     desk_popup->insertItem( i18n("&All Desktops"), 0 );
     if ( active_popup_client && active_popup_client->isOnAllDesktops() )
-        desk_popup->setItemChecked( 0, TRUE );
+        desk_popup->setItemChecked( 0, true );
     desk_popup->insertSeparator( -1 );
     int id;
     const int BASE = 10;
@@ -239,7 +268,7 @@ void Workspace::desktopPopupAboutToShow()
                 i );
         if ( active_popup_client &&
              !active_popup_client->isOnAllDesktops() && active_popup_client->desktop()  == i )
-            desk_popup->setItemChecked( id, TRUE );
+            desk_popup->setItemChecked( id, true );
         }
     }
 
@@ -299,7 +328,7 @@ void Workspace::setupWindowShortcut( Client* c )
     client_keys->suspend( true );
     client_keys_dialog = new ShortcutDialog( c->shortcut());
     client_keys_client = c;
-    connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool )));
+    connect( client_keys_dialog, TQ_SIGNAL( dialogDone( bool )), TQ_SLOT( setupWindowShortcutDone( bool )));
     TQRect r = clientArea( ScreenArea, c );
     TQSize size = client_keys_dialog->sizeHint();
     TQPoint pos = c->pos() + c->clientPos();
@@ -336,7 +365,7 @@ void Workspace::clientShortcutUpdated( Client* c )
         {
         client_keys->insert( key, key );
         client_keys->setShortcut( key, c->shortcut());
-        client_keys->setSlot( key, c, TQT_SLOT( shortcutActivated()));
+        client_keys->setSlot( key, c, TQ_SLOT( shortcutActivated()));
         client_keys->setActionEnabled( key, true );
         }
     client_keys->updateConnections();
@@ -472,7 +501,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
  */
 bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalPos, bool handled )
     {
-    bool replay = FALSE;
+    bool replay = false;
     switch (command) 
         {
         case Options::MouseRaise:
@@ -519,12 +548,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP
         case Options::MouseActivateRaiseAndPassClick:
             workspace()->takeActivity( this, ActivityFocus | ActivityRaise, handled );
             workspace()->setActiveScreenMouse( globalPos );
-            replay = TRUE;
+            replay = true;
             break;
         case Options::MouseActivateAndPassClick:
             workspace()->takeActivity( this, ActivityFocus, handled );
             workspace()->setActiveScreenMouse( globalPos );
-            replay = TRUE;
+            replay = true;
             break;
         case Options::MouseActivateRaiseAndMove:
         case Options::MouseActivateRaiseAndUnrestrictedMove:
@@ -542,7 +571,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP
             if( moveResizeMode )
                 finishMoveResize( false );
             mode = PositionCenter;
-            buttonDown = TRUE;
+            buttonDown = true;
             moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global
             invertedMoveOffset = rect().bottomRight() - moveOffset;
             unrestrictedMoveResize = ( command == Options::MouseActivateRaiseAndUnrestrictedMove
@@ -562,7 +591,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP
                 break;
             if( moveResizeMode )
                 finishMoveResize( false );
-            buttonDown = TRUE;
+            buttonDown = true;
             moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global
             int x = moveOffset.x(), y = moveOffset.y();
             bool left = x < width() / 3;
@@ -623,12 +652,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP
                 {
                 if (opacity_ < 0xF3333333)
                     {
-                    setOpacity(TRUE, opacity_ + 0xCCCCCCC);
+                    setOpacity(true, opacity_ + 0xCCCCCCC);
                     custom_opacity = true;
                     }
                 else
                     {
-                    setOpacity(FALSE, 0xFFFFFFFF);
+                    setOpacity(false, 0xFFFFFFFF);
                     custom_opacity = false;
                     }
                 }
@@ -636,23 +665,89 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP
         case Options::MouseOpacityLess:
             if (opacity_ > 0)
                 {
-                setOpacity(TRUE, (opacity_ > 0xCCCCCCC) ? opacity_ - 0xCCCCCCC : 0);
+                setOpacity(true, (opacity_ > 0xCCCCCCC) ? opacity_ - 0xCCCCCCC : 0);
                 custom_opacity = true;
                 }
             break;
         case Options::MouseNothing:
-            replay = TRUE;
+            replay = true;
             break;
         }
     return replay;
     }
 
-// KDE4 remove me
-void Workspace::showWindowMenuAt( unsigned long, int, int )
+void Workspace::showWindowMenuAt( unsigned long window, int x, int y )
+    {
+    Client *client;
+    if ((client = findClient(WindowMatchPredicate((WId)window))))
+        showWindowMenu( x, y, client );
+    }
+
+void Workspace::showWindowMenu( unsigned long window )
     {
-    slotWindowOperations();
+    Client *client;
+    if ((client = findClient(WindowMatchPredicate((WId)window))))
+        {
+        TQPoint pos = client->pos() + client->clientPos();
+        showWindowMenu( pos, client );
+        }
     }
 
+void Workspace::tileCurrentWindowToBorder(int position)
+{
+    Client *c = active_popup_client ? active_popup_client : active_client;
+    if (!c) return;
+
+    c->tileToBorder((ActiveBorder)position);
+}
+
+void Workspace::tileWindowToBorder(unsigned long w1, int location) {
+    if (location < ActiveTop || location >= ACTIVE_BORDER_COUNT) return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    if (!c1) return;
+
+    c1->tileToBorder((ActiveBorder)location);
+}
+
+void Workspace::tileTwoWindowsHorizontally(unsigned long w1, unsigned long w2) {
+    if (w1 == w2) return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    Client *c2 = findClient(WindowMatchPredicate((WId)w2));
+    if (!c1 || !c2) return;
+
+    c1->tileToBorder(ActiveTop);
+    c2->tileToBorder(ActiveBottom);
+}
+
+void Workspace::tileTwoWindowsVertically(unsigned long w1, unsigned long w2) {
+    if (w1 == w2) return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    Client *c2 = findClient(WindowMatchPredicate((WId)w2));
+    if (!c1 || !c2) return;
+
+    c1->tileToBorder(ActiveLeft);
+    c2->tileToBorder(ActiveRight);
+}
+
+void Workspace::tileFourWindowsInGrid(unsigned long w1, unsigned long w2, unsigned long w3, unsigned long w4) {
+    if (w1 == w2 || w1 == w3 || w1 == w4 || w2 == w3 || w2 == w4 || w3 == w4)
+        return;
+
+    Client *c1 = findClient(WindowMatchPredicate((WId)w1));
+    Client *c2 = findClient(WindowMatchPredicate((WId)w2));
+    Client *c3 = findClient(WindowMatchPredicate((WId)w3));
+    Client *c4 = findClient(WindowMatchPredicate((WId)w4));
+    if (!c1 || !c2 || !c3 || !c4) return;
+
+    c1->tileToBorder(ActiveTopLeft);
+    c2->tileToBorder(ActiveTopRight);
+    c3->tileToBorder(ActiveBottomLeft);
+    c4->tileToBorder(ActiveBottomRight);
+}
+
 void Workspace::slotActivateAttentionWindow()
     {
     if( attention_chain.count() > 0 )
@@ -1053,7 +1148,7 @@ void Workspace::slotWindowOperations()
 
 void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
     {
-    if (!kapp->authorizeTDEAction("twin_rmb"))
+    if (!tdeApp->authorizeTDEAction("twin_rmb"))
         return;
     if( !cl )
         return;
@@ -1070,17 +1165,21 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
     active_popup = p;
     int x = pos.left();
     int y = pos.bottom();
-    if (y == pos.top())
-	p->exec( TQPoint( x, y ) );
+    clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/
+
+    TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop());
+    TQSize hint = p->sizeHint();
+    if (x < 0) x = area.right() - hint.width() + x;
+    if (y < 0) y = area.bottom() - hint.height() + y;
+
+    if (pos.bottom() == pos.top())
+        p->exec( TQPoint( x, y ) );
     else
         {
-	TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop());
-        clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/
-	int popupHeight = p->sizeHint().height();
-	if (y + popupHeight < area.height())
-	    p->exec( TQPoint( x, y ) );
-	else
-	    p->exec( TQPoint( x, pos.top() - popupHeight ) );
+        if (y + hint.height() < area.height())
+            p->exec( TQPoint( x, y ) );
+        else
+            p->exec( TQPoint( x, pos.top() - hint.height() ) );
         }
     // active popup may be already changed (e.g. the window shortcut dialog)
     if( active_popup == p )
diff --git a/twin/utils.cpp b/twin/utils.cpp
index bc44eee56..d21393d2e 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -57,7 +57,7 @@ bool Shape::hasShape( WId w)
     unsigned int wws, hws, wbs, hbs;
     int boundingShaped = 0, clipShaped = 0;
     if (!available())
-        return FALSE;
+        return false;
     XShapeQueryExtents(tqt_xdisplay(), w,
                        &boundingShaped, &xws, &yws, &wws, &hws,
                        &clipShaped, &xbs, &ybs, &wbs, &hbs);
diff --git a/twin/utils.h b/twin/utils.h
index 36e9879a5..da2f9c2e3 100644
--- a/twin/utils.h
+++ b/twin/utils.h
@@ -110,19 +110,16 @@ enum ShadeMode
 
 enum ActiveBorder
     {
-    ActiveNone   = 0,
-
-    ActiveLeft   = 1,
-    ActiveRight  = 2,
-    ActiveTop    = 4,
-    ActiveBottom = 8,
-
-    ActiveTopLeft     = ActiveTop | ActiveLeft,
-    ActiveTopRight    = ActiveTop | ActiveRight,
-    ActiveBottomLeft  = ActiveBottom | ActiveLeft,
-    ActiveBottomRight = ActiveBottom | ActiveRight,
-
-    ACTIVE_BORDER_COUNT
+    ActiveTop = 0,
+    ActiveTopRight,
+    ActiveRight,
+    ActiveBottomRight,
+    ActiveBottom,
+    ActiveBottomLeft,
+    ActiveLeft,
+    ActiveTopLeft,
+    ACTIVE_BORDER_COUNT,
+    ActiveNone
     };
 
 enum ActiveMaximizingMode
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 5f75edd90..2d95e9226 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -23,8 +23,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqbitmap.h>
 #include <tqclipboard.h>
 #include <tdemenubar.h>
-#include <kprocess.h>
-#include <kglobalaccel.h>
+#include <tdeprocess.h>
+#include <tdeglobalaccel.h>
 #include <dcopclient.h>
 #include <kipc.h>
 
@@ -58,7 +58,7 @@ Workspace *Workspace::_self = 0;
 TDEProcess* kompmgr = 0;
 TDESelectionOwner* kompmgr_selection;
 
-bool allowKompmgrRestart = TRUE;
+bool allowKompmgrRestart = true;
 extern bool disable_twin_composition_manager;
 
 bool supportsCompMgr()
@@ -187,7 +187,7 @@ Workspace::Workspace( bool restore )
     root = tqt_xrootwin();
     default_colormap = DefaultColormap(tqt_xdisplay(), tqt_xscreen() );
     installed_colormap = default_colormap;
-    session.setAutoDelete( TRUE );
+    session.setAutoDelete( true );
 
     for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
     {
@@ -195,9 +195,9 @@ Workspace::Workspace( bool restore )
         active_windows[i] = None;
     }
 
-    connect( &temporaryRulesMessages, TQT_SIGNAL( gotMessage( const TQString& )),
-        this, TQT_SLOT( gotTemporaryRulesMessage( const TQString& )));
-    connect( &rulesUpdatedTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( writeWindowRules()));
+    connect( &temporaryRulesMessages, TQ_SIGNAL( gotMessage( const TQString& )),
+        this, TQ_SLOT( gotTemporaryRulesMessage( const TQString& )));
+    connect( &rulesUpdatedTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( writeWindowRules()));
 
     updateXTime(); // needed for proper initialization of user_time in Client ctor
 
@@ -220,7 +220,7 @@ Workspace::Workspace( bool restore )
         (WFlags)(TQt::WType_Desktop | TQt::WPaintUnclipped)
     );
 
-    kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later
+    tdeApp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later
     // call this before XSelectInput() on the root window
     startup = new TDEStartupInfo(
         TDEStartupInfo::DisableKWinModule | TDEStartupInfo::AnnounceSilenceChanges, this );
@@ -259,7 +259,7 @@ Workspace::Workspace( bool restore )
     init();
 
 #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
-    connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
+    connect( tdeApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 
     if (!supportsCompMgr()) {
@@ -274,7 +274,7 @@ Workspace::Workspace( bool restore )
     if (options->useTranslucency)
         {
         kompmgr = new TDEProcess;
-        connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
+        connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
         *kompmgr << TDE_COMPOSITOR_BINARY;
         if (kompmgrpid)
             {
@@ -414,12 +414,12 @@ void Workspace::init()
     // extra NETRootInfo instance in Client mode is needed to get the values of the properties
     NETRootInfo client_info( tqt_xdisplay(), NET::ActiveWindow | NET::CurrentDesktop );
     int initial_desktop;
-    if( !kapp->isSessionRestored())
+    if( !tdeApp->isSessionRestored())
         initial_desktop = client_info.currentDesktop();
     else
         {
-        TDEConfigGroupSaver saver( kapp->sessionConfig(), "Session" );
-        initial_desktop = kapp->sessionConfig()->readNumEntry( "desktop", 1 );
+        TDEConfigGroupSaver saver( tdeApp->sessionConfig(), "Session" );
+        initial_desktop = tdeApp->sessionConfig()->readNumEntry( "desktop", 1 );
         }
     if( !setCurrentDesktop( initial_desktop ))
         setCurrentDesktop( 1 );
@@ -427,20 +427,20 @@ void Workspace::init()
     // now we know how many desktops we'll, thus, we initialise the positioning object
     initPositioning = new Placement(this);
 
-    connect(&reconfigureTimer, TQT_SIGNAL(timeout()), this,
-            TQT_SLOT(slotReconfigure()));
-    connect( &updateToolWindowsTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( slotUpdateToolWindows()));
+    connect(&reconfigureTimer, TQ_SIGNAL(timeout()), this,
+            TQ_SLOT(slotReconfigure()));
+    connect( &updateToolWindowsTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( slotUpdateToolWindows()));
 
-    connect(kapp, TQT_SIGNAL(appearanceChanged()), this,
-            TQT_SLOT(slotReconfigure()));
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), this,
-            TQT_SLOT(slotSettingsChanged(int)));
-    connect(kapp, TQT_SIGNAL( kipcMessage( int, int )), this, TQT_SLOT( kipcMessage( int, int )));
+    connect(tdeApp, TQ_SIGNAL(appearanceChanged()), this,
+            TQ_SLOT(slotReconfigure()));
+    connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), this,
+            TQ_SLOT(slotSettingsChanged(int)));
+    connect(tdeApp, TQ_SIGNAL( kipcMessage( int, int )), this, TQ_SLOT( kipcMessage( int, int )));
 
     active_client = NULL;
     rootInfo->setActiveWindow( None );
     focusToNull();
-    if( !kapp->isSessionRestored())
+    if( !tdeApp->isSessionRestored())
         ++block_focus; // because it will be set below
 
     char nm[ 100 ];
@@ -503,7 +503,7 @@ void Workspace::init()
         } // end updates blocker block
 
     Client* new_active_client = NULL;
-    if( !kapp->isSessionRestored())
+    if( !tdeApp->isSessionRestored())
         {
         --block_focus;
         new_active_client = findClient( WindowMatchPredicate( client_info.activeWindow()));
@@ -1188,10 +1188,10 @@ void Workspace::slotReconfigure()
                 if (!kompmgr)
                     {
                     kompmgr = new TDEProcess;
-                    connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
+                    connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
                     *kompmgr << TDE_COMPOSITOR_BINARY;
                     }
-                TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart
+                TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart
                 }
             }
         else
@@ -1277,7 +1277,7 @@ TQStringList Workspace::configModules(bool controlCenter)
     args <<  "tde-twindecoration.desktop";
     if (controlCenter)
         args << "tde-twinoptions.desktop";
-    else if (kapp->authorizeControlModule("tde-twinoptions.desktop"))
+    else if (tdeApp->authorizeControlModule("tde-twinoptions.desktop"))
         args  << "twinactions" << "twinfocus" <<  "twinmoving" << "twinadvanced" << "twinrules" << "twintranslucency";
     return args;
     }
@@ -1306,10 +1306,10 @@ bool Workspace::isNotManaged( const TQString& title )
         if (r.search(title) != -1)
             {
             doNotManageList.remove( it );
-            return TRUE;
+            return true;
             }
         }
-    return FALSE;
+    return false;
     }
 
 /*!
@@ -1423,7 +1423,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
 
         current_desktop = new_desktop; // change the desktop (so that Client::updateVisibility() works)
 
-        bool desktopHasCompositing = kapp->isCompositionManagerAvailable();	// Technically I should call isX11CompositionAvailable(), but it isn't initialized via my kapp constructir, and in this case it doesn't really matter anyway....
+        bool desktopHasCompositing = tdeApp->isCompositionManagerAvailable();	// Technically I should call isX11CompositionAvailable(), but it isn't initialized via my tdeApp constructir, and in this case it doesn't really matter anyway....
         if (!desktopHasCompositing) {
             // If composition is not in use then we can hide the old windows before showing the new ones
             for ( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it) {
@@ -1806,7 +1806,7 @@ void Workspace::setActiveScreenMouse( TQPoint mousepos )
 
 TQRect Workspace::screenGeometry( int screen ) const
     {
-    if (( !options->xineramaEnabled ) || (kapp->desktop()->numScreens() < 2))
+    if (( !options->xineramaEnabled ) || (tdeApp->desktop()->numScreens() < 2))
         return tqApp->desktop()->geometry();
     return tqApp->desktop()->screenGeometry( screen );
     }
@@ -1875,19 +1875,19 @@ void Workspace::calcDesktopLayout(int &x, int &y) const
 bool Workspace::addSystemTrayWin( WId w )
     {
     if ( systemTrayWins.contains( w ) )
-        return TRUE;
+        return true;
 
     NETWinInfo ni( tqt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor );
     WId trayWinFor = ni.kdeSystemTrayWinFor();
     if ( !trayWinFor )
-        return FALSE;
+        return false;
     systemTrayWins.append( SystemTrayWindow( w, trayWinFor ) );
     XSelectInput( tqt_xdisplay(), w,
                   StructureNotifyMask
                   );
     XAddToSaveSet( tqt_xdisplay(), w );
     propagateSystemTrayWins();
-    return TRUE;
+    return true;
     }
 
 /*!
@@ -1897,7 +1897,7 @@ bool Workspace::addSystemTrayWin( WId w )
 bool Workspace::removeSystemTrayWin( WId w, bool check )
     {
     if ( !systemTrayWins.contains( w ) )
-        return FALSE;
+        return false;
     if( check )
         {
     // When getting UnmapNotify, it's not clear if it's the systray
@@ -1925,7 +1925,7 @@ bool Workspace::removeSystemTrayWin( WId w, bool check )
     systemTrayWins.remove( w );
     XRemoveFromSaveSet (tqt_xdisplay (), w);
     propagateSystemTrayWins();
-    return TRUE;
+    return true;
     }
 
 
@@ -2155,16 +2155,16 @@ void Workspace::slotMouseEmulation()
     if ( mouse_emulation )
         {
         XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
-        mouse_emulation = FALSE;
+        mouse_emulation = false;
         return;
         }
 
     if ( XGrabKeyboard(tqt_xdisplay(),
-                       root, FALSE,
+                       root, false,
                        GrabModeAsync, GrabModeAsync,
                        get_tqt_x_time()) == GrabSuccess )
         {
-        mouse_emulation = TRUE;
+        mouse_emulation = true;
         mouse_emulation_state = 0;
         mouse_emulation_window = 0;
         }
@@ -2284,7 +2284,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
 bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
     {
     if ( root != tqt_xrootwin() )
-        return FALSE;
+        return false;
     int kc = XkbKeycodeToKeysym(tqt_xdisplay(), ev.keycode, 0, 0);
     int km = ev.state & (ControlMask | Mod1Mask | ShiftMask);
 
@@ -2361,16 +2361,16 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
     // fall through
         case XK_Escape:
             XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
-            mouse_emulation = FALSE;
-            return TRUE;
+            mouse_emulation = false;
+            return true;
         default:
-            return FALSE;
+            return false;
         }
 
     TQCursor::setPos( pos );
     if ( mouse_emulation_state )
         mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuMove, 0,  mouse_emulation_state );
-    return TRUE;
+    return true;
 
     }
 
@@ -2396,8 +2396,8 @@ void Workspace::requestDelayFocus( Client* c )
     delayfocus_client = c;
     delete delayFocusTimer;
     delayFocusTimer = new TQTimer( this );
-    connect( delayFocusTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( delayFocus() ) );
-    delayFocusTimer->start( options->delayFocusInterval, TRUE  );
+    connect( delayFocusTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( delayFocus() ) );
+    delayFocusTimer->start( options->delayFocusInterval, true  );
     }
 
 void Workspace::cancelDelayFocus()
@@ -2506,7 +2506,7 @@ void Workspace::reserveActiveBorder( ActiveBorder border )
         return;
 
     if (active_reserved[border]++ == 0)
-        TQTimer::singleShot(0, this, TQT_SLOT(updateActiveBorders()));
+        TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders()));
 }
 
 void Workspace::unreserveActiveBorder( ActiveBorder border )
@@ -2516,7 +2516,7 @@ void Workspace::unreserveActiveBorder( ActiveBorder border )
 
     assert(active_reserved[ border ] > 0);
     if (--active_reserved[ border ] == 0)
-        TQTimer::singleShot(0, this, TQT_SLOT(updateActiveBorders()));
+        TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders()));
 }
 
 void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
@@ -2542,15 +2542,21 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
     int distance_reset = activation_distance + 10;
 
     // Leave active maximizing mode when window moved away
-    if (active_current_border != ActiveNone &&
-       (pos.x() > activeLeft   + distance_reset) &&
-       (pos.x() < activeRight  - distance_reset) &&
-       (pos.y() > activeTop    + distance_reset) &&
-       (pos.y() < activeBottom - distance_reset))
-    {
-        if (movingClient &&
-           (options->activeBorders() == Options::ActiveTileMaximize ||
-            options->activeBorders() == Options::ActiveTileOnly))
+    if (movingClient &&
+       (options->activeBorders() == Options::ActiveTileMaximize ||
+        options->activeBorders() == Options::ActiveTileOnly))
+    {
+        TQRect r = TQApplication::desktop()->screenGeometry(pos);
+        activeTop = r.top();
+        activeBottom = r.bottom();
+        activeLeft = r.left();
+        activeRight = r.right();
+
+        if (active_current_border != ActiveNone &&
+           (pos.x() > activeLeft   + distance_reset) &&
+           (pos.x() < activeRight  - distance_reset) &&
+           (pos.y() > activeTop    + distance_reset) &&
+           (pos.y() < activeBottom - distance_reset))
         {
             movingClient->cancelActiveBorderMaximizing();
             return;
@@ -2559,53 +2565,77 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
 
     // These checks take activation distance into account, creating a
     // virtual "activation band" for easier border/corner activation.
-    bool active_left   = pos.x() < activeLeft   + activation_distance,
-         active_right  = pos.x() > activeRight  - activation_distance,
-         active_top    = pos.y() < activeTop    + activation_distance,
-         active_bottom = pos.y() > activeBottom - activation_distance;
+    bool active_left   = pos.x() < activeLeft   + activation_distance;
+    bool active_right  = pos.x() > activeRight  - activation_distance;
+    bool active_top    = pos.y() < activeTop    + activation_distance;
+    bool active_bottom = pos.y() > activeBottom - activation_distance;
+
+    if (!active_left && !active_right && !active_top && !active_bottom)
+       return;
 
     // These checks are used to make corner activation easier: we assume
     // a 25% zone on the edge of each border where instead of half size
     // tiling we perform quarter size tiling. The rest 50% is left for
     // normal half size tiling.
-    uint active_width_quart = activeRight / 4,
-         active_height_quart = activeBottom / 4;
+    // These options make sense only for the tiling mode.
+    int active_width_quart  = (activeRight - activeLeft) / 4;
+    int active_height_quart = (activeBottom - activeTop) / 4;
 
-    bool active_qleft   = pos.x() < activeLeft   + active_width_quart,
-         active_qright  = pos.x() > activeRight  - active_width_quart,
-         active_qtop    = pos.y() < activeTop    + active_height_quart,
-         active_qbottom = pos.y() > activeBottom - active_height_quart;
-
-    int border = ActiveNone;
-
-    if (active_left)   border |= ActiveLeft;
-    if (active_right)  border |= ActiveRight;
-    if (active_top)    border |= ActiveTop;
-    if (active_bottom) border |= ActiveBottom;
-
-    if (border == ActiveLeft || border == ActiveRight) {
-        if (active_qtop)     border |= ActiveTop;
-        if (active_qbottom)  border |= ActiveBottom;
+    bool active_qleft   = false;
+    bool active_qright  = false;
+    bool active_qtop    = false;
+    bool active_qbottom = false;
+    if (options->activeBorders() == Options::ActiveTileMaximize ||
+        options->activeBorders() == Options::ActiveTileOnly)
+    {
+      active_qleft   = pos.x() < activeLeft   + active_width_quart;
+      active_qright  = pos.x() > activeRight  - active_width_quart;
+      active_qtop    = pos.y() < activeTop    + active_height_quart;
+      active_qbottom = pos.y() > activeBottom - active_height_quart;
     }
 
-    else if (border == ActiveTop || border == ActiveBottom) {
-        if (active_qleft)    border |= ActiveLeft;
-        if (active_qright)   border |= ActiveRight;
+    ActiveBorder border = ActiveNone;
+    if ((active_left && active_qtop) || (active_top && active_qleft))
+    {
+      border = ActiveTopLeft;
     }
-
-    bool border_valid = false;
-    for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i) {
-        if (border == (ActiveBorder)i) {
-            border_valid = true;
-        }
+    else if ((active_right && active_qtop) || (active_top && active_qright))
+    {
+      border = ActiveTopRight;
     }
-
-    if (!border_valid) {
-        abort();
+    else if ((active_left && active_qbottom) || (active_bottom && active_qleft))
+    {
+      border = ActiveBottomLeft;
+    }
+    else if ((active_right && active_qbottom) || (active_bottom && active_qright))
+    {
+      border = ActiveBottomRight;
+    }
+    else if (active_left)
+    {
+      border = ActiveLeft;
+    }
+    else if (active_right)
+    {
+      border = ActiveRight;
+    }
+    else if (active_top)
+    {
+      border = ActiveTop;
+    }
+    else if (active_bottom)
+    {
+      border = ActiveBottom;
+    }
+    else
+    {
+      // Should never happen
+      abort();
     }
 
-    if (border == ActiveNone || active_windows[border] == None) {
-        return;
+    if( active_windows[border] == None )
+    {
+      return;
     }
 
     if ((active_current_border == border) &&
@@ -2627,7 +2657,7 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
                 if (options->activeBorders() == Options::ActiveSwitchAlways ||
                     options->activeBorders() == Options::ActiveSwitchOnMove)
                 {
-                    activeBorderSwitchDesktop((ActiveBorder)border, pos);
+                    activeBorderSwitchDesktop(border, pos);
                     return; // Don't reset cursor position
                 }
 
@@ -2637,6 +2667,7 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
                 {
                     if (!movingClient->isResizable()) return;
                     movingClient->setActiveBorderMode(ActiveMaximizeMode);
+                    movingClient->setActiveBorderPos(pos);
                     movingClient->setActiveBorder(ActiveNone);
                     movingClient->setActiveBorderMaximizing(true);
                 }
@@ -2647,7 +2678,8 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
                 {
                     if (!movingClient->isResizable()) return;
                     movingClient->setActiveBorderMode(ActiveTilingMode);
-                    movingClient->setActiveBorder((ActiveBorder)border);
+                    movingClient->setActiveBorderPos(pos);
+                    movingClient->setActiveBorder(border);
                     movingClient->setActiveBorderMaximizing(true);
                 }
 
@@ -2661,7 +2693,7 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
                 // Desktop switching
                 if (options->activeBorders() == Options::ActiveSwitchAlways && isSide)
                 {
-                    activeBorderSwitchDesktop((ActiveBorder)border, pos);
+                    activeBorderSwitchDesktop(border, pos);
                     return; // Don't reset cursor position
                 }
             }
@@ -2669,7 +2701,7 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
     }
     else
     {
-        active_current_border = (ActiveBorder)border;
+        active_current_border = border;
         active_time_first = now;
         active_time_last = now;
         active_push_point = pos;
@@ -2680,9 +2712,9 @@ void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
     {
         // Reset the pointer to find out whether the user is really pushing
         // (ordered according to enum ActiveBorder minus ActiveNone)
-        const int xdiff[ACTIVE_BORDER_COUNT] = {1, -1, 0,  0, 1, -1,  1, -1};
-        const int ydiff[ACTIVE_BORDER_COUNT] = {0,  0, 1, -1, 1,  1, -1, -1};
-        TQCursor::setPos(pos.x() + xdiff[border - 1], pos.y() + ydiff[border - 1]);
+        const int xdiff[ ACTIVE_BORDER_COUNT ] = { 0, -1, -1, -1, 0, 1, 1, 1 };
+        const int ydiff[ ACTIVE_BORDER_COUNT ] = { 1, 1, 0, -1, -1, -1, 0, 1 };
+        TQCursor::setPos(pos.x() + xdiff[border], pos.y() + ydiff[border]);
     }
 }
 
@@ -2788,12 +2820,12 @@ void Workspace::lostTopMenuSelection()
     {
 //    kdDebug() << "lost TopMenu selection" << endl;
     // make sure this signal is always set when not owning the selection
-    disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
-    connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
+    disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
+    connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
     if( !managing_topmenus )
         return;
-    connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
-    disconnect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection()));
+    connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
+    disconnect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection()));
     managing_topmenus = false;
     delete topmenu_space;
     topmenu_space = NULL;
@@ -2822,8 +2854,8 @@ void Workspace::setupTopMenuHandling()
     {
     if( managing_topmenus )
         return;
-    connect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection()));
-    disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner()));
+    connect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection()));
+    disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner()));
     managing_topmenus = true;
     topmenu_space = new TQWidget;
     Window stack[ 2 ];
@@ -2934,7 +2966,7 @@ void Workspace::startKompmgr()
     }
     else {
         // Try again a bit later!
-        TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) );
+        TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) );
         return;
     }
     pid_t kompmgrpid = getCompositorPID();
@@ -2949,7 +2981,7 @@ void Workspace::startKompmgr()
     }
     if (!kompmgr->start(TDEProcess::OwnGroup, TDEProcess::Stderr))
     {
-        options->useTranslucency = FALSE;
+        options->useTranslucency = false;
         TDEProcess proc;
         proc << "kdialog" << "--error"
             << i18n("The Composite Manager could not be started.\\nMake sure you have \"" TDE_COMPOSITOR_BINARY "\" in a $PATH directory.")
@@ -2962,16 +2994,16 @@ void Workspace::startKompmgr()
         char selection_name[ 100 ];
         sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay()));
         kompmgr_selection = new TDESelectionOwner( selection_name );
-        connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr()));
+        connect( kompmgr_selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( stopKompmgr()));
         kompmgr_selection->claim( true );
-        connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*)));
-        options->useTranslucency = TRUE;
-        //allowKompmgrRestart = FALSE;
-        //TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
+        connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(restartKompmgr(TDEProcess*)));
+        options->useTranslucency = true;
+        //allowKompmgrRestart = false;
+        //TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) );
         TQByteArray ba;
         TQDataStream arg(ba, IO_WriteOnly);
         arg << "";
-        kapp->dcopClient()->emitDCOPSignal("default", "kompmgrStarted()", ba);
+        tdeApp->dcopClient()->emitDCOPSignal("default", "kompmgrStarted()", ba);
     }
     if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
 }
@@ -2983,14 +3015,14 @@ void Workspace::stopKompmgr()
     }
     delete kompmgr_selection;
     kompmgr_selection = NULL;
-    kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(TDEProcess*)));
-    options->useTranslucency = FALSE;
+    kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*)));
+    options->useTranslucency = false;
     if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
     kompmgr->kill(SIGKILL);
     TQByteArray ba;
     TQDataStream arg(ba, IO_WriteOnly);
     arg << "";
-    kapp->dcopClient()->emitDCOPSignal("default", "kompmgrStopped()", ba);
+    tdeApp->dcopClient()->emitDCOPSignal("default", "kompmgrStopped()", ba);
 }
 
 void Workspace::kompmgrReloadSettings()
@@ -3008,11 +3040,11 @@ bool Workspace::kompmgrIsRunning()
 
 void Workspace::unblockKompmgrRestart()
 {
-    allowKompmgrRestart = TRUE;
+    allowKompmgrRestart = true;
 }
 
 void Workspace::restartKompmgr( TDEProcess *proc )
-// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQT_SLOT(startKompmgr()));
+// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQ_SLOT(startKompmgr()));
 {
     bool crashed;
     if (proc->signalled()) {	// looks like kompmgr may have crashed
@@ -3027,7 +3059,7 @@ void Workspace::restartKompmgr( TDEProcess *proc )
       {
           delete kompmgr_selection;
           kompmgr_selection = NULL;
-          options->useTranslucency = FALSE;
+          options->useTranslucency = false;
           if (crashed) {
             TDEProcess proc;
             proc << "kdialog" << "--error"
@@ -3051,7 +3083,7 @@ void Workspace::restartKompmgr( TDEProcess *proc )
         {
             delete kompmgr_selection;
             kompmgr_selection = NULL;
-            options->useTranslucency = FALSE;
+            options->useTranslucency = false;
             TDEProcess proc;
             proc << "kdialog" << "--error"
                 << i18n("The Composite Manager could not be started.\\nMake sure you have \"" TDE_COMPOSITOR_BINARY "\" in a $PATH directory.")
@@ -3060,8 +3092,8 @@ void Workspace::restartKompmgr( TDEProcess *proc )
         }
         else
         {
-            allowKompmgrRestart = FALSE;
-            TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
+            allowKompmgrRestart = false;
+            TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) );
         }
     }
 }
@@ -3088,7 +3120,7 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen)
     else return; //skip others
     // kompmgr startup failed or succeeded, release connection
     kompmgr->closeStderr();
-    disconnect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
+    disconnect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int)));
     if( !message.isEmpty())
         {
         TDEProcess proc;
@@ -3099,7 +3131,6 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen)
         }
 }
 
-
 void Workspace::setOpacity(unsigned long winId, unsigned int opacityPercent)
 {
     if (opacityPercent > 100) opacityPercent = 100;
diff --git a/twin/workspace.h b/twin/workspace.h
index 47ba7bb15..17ef0c0b3 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -74,7 +74,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
     {
     TQ_OBJECT
     public:
-        Workspace( bool restore = FALSE );
+        Workspace( bool restore = false );
         virtual ~Workspace();
 
         static Workspace * self() { return _self; }
@@ -119,8 +119,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         // stealing prevention code.
         Client* mostRecentlyActivatedClient() const;
 
-        void activateClient( Client*, bool force = FALSE  );
-        void requestFocus( Client* c, bool force = FALSE );
+        void activateClient( Client*, bool force = false  );
+        void requestFocus( Client* c, bool force = false );
         void takeActivity( Client* c, int flags, bool handled ); // flags are ActivityFlags
         void handleTakeActivity( Client* c, Time timestamp, int flags ); // flags are ActivityFlags
         bool allowClientActivation( const Client* c, Time time = -1U, bool focus_in = false );
@@ -204,8 +204,13 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void windowToNextDesktop( Client* c );
         void sendClientToScreen( Client* c, int screen );
 
-    // KDE4 remove me - and it's also in the DCOP interface :(
         void showWindowMenuAt( unsigned long id, int x, int y );
+        void showWindowMenu( unsigned long id );
+
+        void tileWindowToBorder(unsigned long w1, int location);
+        void tileTwoWindowsHorizontally(unsigned long w1, unsigned long w2);
+        void tileTwoWindowsVertically(unsigned long w1, unsigned long w2);
+        void tileFourWindowsInGrid(unsigned long w1, unsigned long w2, unsigned long w3, unsigned long w4);
         void kDestopResized();
 
         /**
@@ -410,6 +415,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void writeWindowRules();
         void kipcMessage( int id, int data );
         void updateActiveBorders();
+        void tileCurrentWindowToBorder(int position);
         // kompmgr
         void setPopupClientOpacity(int v);
         void resetClientOpacity();
@@ -501,6 +507,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
 
         void calcDesktopLayout(int &x, int &y) const;
 
+        TQPopupMenu* makeTileMenu();
         TQPopupMenu* clientPopup();
         void closeActivePopup();
 
@@ -585,6 +592,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         TQPopupMenu *advanced_popup;
         TQPopupMenu *desk_popup;
         int desk_popup_index;
+        int tile_popup_index;
 
         TDEGlobalAccel *keys;
         TDEGlobalAccel *client_keys;